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 e47f22a7d65c95fa4652133cf98c5ee70e450ea1..2ae64cc63c7e10a339f97959992101b2c34b48a8 100644 (file)
--- 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 7002e65c2c1a38feaf02f857fbec4fb4a5d98862..39d702f4268465eecfd2b57788dd925e5b4d9573 100644 (file)
--- 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;