ioq->get = 0;
ioq->buf = new_buf;
ioq->size = new_size;
- return new_size - ioq->put;
+ return new_size - ioq->put - 1;
}
-extern struct io_engine io_engine_kqueue;
+extern struct io_engine io_engine_kevent;
extern struct io_engine io_engine_epoll;
extern struct io_engine io_engine_win32;
extern struct io_engine io_engine_select;
if (engine) /* someone beat us to it */
return;
-#if WITH_IOSET_KQUEUE
- if (!engine && io_engine_kqueue.init())
- engine = &io_engine_kqueue;
+#if WITH_IOSET_KEVENT
+ if (!engine && io_engine_kevent.init())
+ engine = &io_engine_kevent;
#endif
#if WITH_IOSET_EPOLL
}
if (local && sa_size) {
+ opt = 1;
+ res = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
+ if (res < 0) {
+ log_module(MAIN_LOG, LOG_WARNING, "Unable to mark listener address as re-usable: %s", strerror(errno));
+ }
+
res = bind(fd, local, sa_size);
if (res < 0) {
log_module(MAIN_LOG, LOG_ERROR, "Unable to bind listening socket %d: %s", fd, strerror(errno));
close(fd);
return NULL;
}
-
- opt = 1;
- res = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
- if (res < 0) {
- log_module(MAIN_LOG, LOG_WARNING, "Unable to mark listener address as re-usable: %s", strerror(errno));
- }
}
res = listen(fd, 1);
hints.ai_family = local ? local->sa_family : 0;
hints.ai_socktype = SOCK_STREAM;
snprintf(portnum, sizeof(portnum), "%u", port);
- if (getaddrinfo(peer, portnum, &hints, &ai)) {
- log_module(MAIN_LOG, LOG_ERROR, "getaddrinfo(%s, %s) failed.", peer, portnum);
+ res = getaddrinfo(peer, portnum, &hints, &ai);
+ if (res != 0) {
+ log_module(MAIN_LOG, LOG_ERROR, "getaddrinfo(%s, %s) failed: %s.", peer, portnum, gai_strerror(res));
return NULL;
}
static void
ioset_buffered_read(struct io_fd *fd) {
- int put_avail, nbr, fdnum;
+ int put_avail, nbr;
if (!(put_avail = ioq_put_avail(&fd->recv)))
put_avail = ioq_grow(&fd->recv);
fd->recv.put += nbr;
if (fd->recv.put == fd->recv.size)
fd->recv.put = 0;
- fdnum = fd->fd;
while (fd->line_len > 0) {
struct io_fd *old_active;
int died = 0;