From: Wouter Wijngaards Date: Thu, 15 Feb 2007 10:48:43 +0000 (+0000) Subject: Compile fixes ds10. X-Git-Tag: release-0.0~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a45ca399fed1e50eb33dbc1f784849525226c31a;p=thirdparty%2Funbound.git Compile fixes ds10. git-svn-id: file:///svn/unbound/trunk@101 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index e47f22a7d..2ae64cc63 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +15 February 2007: Wouter + - port to FreeBSD 4.11 Dec Alpha. Also works on Solaris 10 sparc64, + Solaris 9, FreeBSD 6, Linux i386 and OSX powerpc. + 14 February 2007: Wouter - Included configure.ac changes from ldns. - detect (some) headers before the standards check. diff --git a/util/netevent.c b/util/netevent.c index 7002e65c2..39d702f42 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -264,7 +264,6 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) struct comm_point* c = (struct comm_point*)arg, *c_hdl; struct comm_reply rep; int new_fd; - log_info("callback tcpaccept for %x", (int)c); log_assert(c->type == comm_tcp_accept); if(!(event & EV_READ)) { log_info("ignoring tcp accept event %d", (int)event); @@ -276,8 +275,13 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) new_fd = accept(fd, (struct sockaddr*)&rep.addr, &rep.addrlen); if(new_fd == -1) { /* EINTR is signal interrupt. others are closed connection. */ - if(errno != EINTR && errno != EWOULDBLOCK && - errno != ECONNABORTED && errno != EPROTO) + if( errno != EINTR + && errno != EWOULDBLOCK + && errno != ECONNABORTED +#ifdef EPROTO + && errno != EPROTO +#endif /* EPROTO */ + ) log_err("accept failed: %s", strerror(errno)); return; } @@ -708,7 +712,7 @@ comm_point_drop_reply(struct comm_reply* repinfo) void comm_point_stop_listening(struct comm_point* c) { - log_info("comm point stop listening %x", (int)c); + log_info("comm point stop listening %d", c->fd); if(event_del(&c->ev->ev) != 0) { log_err("event_del error to stoplisten"); } @@ -717,7 +721,7 @@ comm_point_stop_listening(struct comm_point* c) void comm_point_start_listening(struct comm_point* c, int newfd, int sec) { - log_info("comm point start listening %x", (int)c); + log_info("comm point start listening %d", c->fd); if(c->type == comm_tcp_accept && !c->tcp_free) { /* no use to start listening no free slots. */ return;