ADDRFAMILY to FAMILIY to port to FreeBSD.

git-svn-id: file:///svn/nsd/trunk@2512 a26ef69c-88ff-0310-839f-98b793d9c207

Author: wcawijngaards

doc/ChangeLog

@@ -1,6 +1,9 @@
 29 November 2006: Wouter
 	- Fixed getaddrinfo error message to be more descriptive.
 	- Fallback to ip4 also if getaddrinfo fails for ip6.
+	- instead of EAI_ADDRFAMILY uses EAI_FAMILY which is portable
+	  to FreeBSD.
+	- signed/unsigned warning fix for FD_SETSIZE comparison.
 
 28 November 2006: Wouter
 	- Debugging 10k zones transfer, set so that zones waiting for a

doc/RELNOTES

@@ -10,6 +10,7 @@ BUG FIXES:
 	- Bug #153: Using thousands of zones, xfrd could run out of file
 	  descriptors. Fixed.
 	- Fixed getaddrinfo error message to be more descriptive.
+	- Fallback to ip4 if getaddrinfo fails for ip6.
 
 3.0.2
 =============

netio.c

@@ -153,7 +153,7 @@ netio_dispatch(netio_type *netio, const struct timespec *timeout, const sigset_t
 
 	for (elt = netio->handlers; elt; elt = elt->next) {
 		netio_handler_type *handler = elt->handler;
-		if (handler->fd >= 0 && handler->fd < FD_SETSIZE) {
+		if (handler->fd >= 0 && handler->fd < (int)FD_SETSIZE) {
 			if (handler->fd > max_fd) {
 				max_fd = handler->fd;
 			}
@@ -235,7 +235,7 @@ netio_dispatch(netio_type *netio, const struct timespec *timeout, const sigset_t
 		for (elt = netio->handlers; elt; ) {
 			netio_handler_type *handler = elt->handler;
 			netio->dispatch_next = elt->next;
-			if (handler->fd >= 0 && handler->fd < FD_SETSIZE) {
+			if (handler->fd >= 0 && handler->fd < (int)FD_SETSIZE) {
 				netio_event_types_type event_types
 					= NETIO_EVENT_NONE;
 				if (FD_ISSET(handler->fd, &readfds)) {

nsd.c

@@ -641,7 +641,7 @@ main (int argc, char *argv[])
 		if ((r=getaddrinfo(nodes[i], udp_port, &hints[i], &nsd.udp[i].addr)) != 0) {
 #ifdef INET6
 			if(nsd.grab_ip6_optional && hints[0].ai_family == AF_INET6
-				&& r == EAI_ADDRFAMILY)
+				&& r == EAI_FAMILY)
 				continue;
 #endif
 			error("cannot parse address '%s': getaddrinfo: %s %s",