X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/30874d6682a37bc1d8f3d76fd90afde6a0f3fce7..0b401fb654b69fd9649954a9bdd5ff041971e62d:/src/ioset.c?ds=sidebyside diff --git a/src/ioset.c b/src/ioset.c index 55fd2cc..1ae3aef 100644 --- a/src/ioset.c +++ b/src/ioset.c @@ -220,18 +220,17 @@ struct io_fd *ioset_listen(struct sockaddr *local, unsigned int sa_size, void *d } 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); @@ -439,7 +438,7 @@ ioset_find_line_length(struct io_fd *fd) { 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); @@ -474,7 +473,6 @@ ioset_buffered_read(struct io_fd *fd) { 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;