9ba65d2ea8
model to an instance-based model. Each ethernet driver instance is now responsible for exactly one network interface card. The port field in /etc/inet.conf now acts as an instance field instead. This patch also updates the data link protocol. This update: - eliminates the concept of ports entirely; - eliminates DL_GETNAME entirely; - standardizes on using m_source for IPC and DL_ENDPT for safecopies; - removes error codes from TASK/STAT replies, as they were unused; - removes a number of other old or unused fields; - names and renames a few other fields. All ethernet drivers have been changed to: - conform to the new protocol, and exactly that; - take on an instance number based on a given "instance" argument; - skip that number of PCI devices in probe iterations; - use config tables and environment variables based on that number; - no longer be limited to a predefined maximum of cards in any way; - get rid of any leftover non-safecopy support and other ancient junk; - have a correct banner protocol figure, or none at all. Other changes: * Inet.conf is now taken to be line-based, and supports #-comments. No existing installations are expected to be affected by this. * A new, select-based asynchio library replaces the old one. Kindly contributed by Kees J. Bot. * Inet now supports use of select() on IP devices. Combined, the last two changes together speed up dhcpd considerably in the presence of multiple interfaces. * A small bug has been fixed in nonamed.
62 lines
1.5 KiB
C
62 lines
1.5 KiB
C
/* asyn_read() Author: Kees J. Bot
|
|
* 7 Jul 1997
|
|
*/
|
|
#include "asyn.h"
|
|
#include <signal.h>
|
|
|
|
ssize_t asyn_read(asynchio_t *asyn, int fd, void *buf, size_t len)
|
|
/* Asynchronous read(). Try if a read can be done, if not then set a flag
|
|
* indicating that select(2) should look out for it. Returns like a normal
|
|
* read or returns -1 with errno set to EAGAIN.
|
|
*/
|
|
{
|
|
asynfd_t *afd;
|
|
|
|
/* Asyn_wait() may block if this counter equals zero indicating that
|
|
* all of the asyn_* functions are "in progress".
|
|
*/
|
|
asyn->asyn_more++;
|
|
|
|
if ((unsigned) fd >= FD_SETSIZE) { errno= EBADF; return -1; }
|
|
afd= &asyn->asyn_afd[fd];
|
|
|
|
/* If this is the first async call on this filedescriptor then
|
|
* remember its file flags.
|
|
*/
|
|
if (!afd->afd_seen) {
|
|
if ((afd->afd_flags= fcntl(fd, F_GETFL)) < 0) return -1;
|
|
afd->afd_seen= 1;
|
|
}
|
|
|
|
/* Try to read if I/O is pending. */
|
|
if (afd->afd_state[SEL_READ] == PENDING) {
|
|
sigset_t mask;
|
|
ssize_t result;
|
|
int err;
|
|
|
|
sigemptyset(&mask);
|
|
if (sigprocmask(SIG_SETMASK, &mask, &mask) < 0) return -1;
|
|
(void) fcntl(fd, F_SETFL, afd->afd_flags | O_NONBLOCK);
|
|
|
|
/* Try the actual read. */
|
|
result= read(fd, buf, len);
|
|
err= errno;
|
|
|
|
(void) fcntl(fd, F_SETFL, afd->afd_flags);
|
|
(void) sigprocmask(SIG_SETMASK, &mask, nil);
|
|
|
|
errno= err;
|
|
if (result != -1 || errno != EAGAIN) {
|
|
afd->afd_state[SEL_READ]= IDLE;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
/* Record this read as "waiting". */
|
|
afd->afd_state[SEL_READ]= WAITING;
|
|
FD_SET(fd, &asyn->asyn_fdset[SEL_READ]);
|
|
errno= EAGAIN;
|
|
asyn->asyn_more--;
|
|
return -1;
|
|
}
|