convert to isc/net.h

lib/isc/include/isc/Makefile.in

@@ -24,9 +24,9 @@ top_srcdir =	@top_srcdir@
 #
 HEADERS =	assertions.h base64.h boolean.h buffer.h error.h event.h \
 		eventclass.h heap.h int.h interfaceiter.h lang.h lex.h lib.h \
-		list.h mem.h msgcat.h rbtgen.h region.h result.h \
-		resultclass.h rwlock.h socket.h str.h symtab.h task.h \
-		timer.h types.h
+		list.h mem.h msgcat.h netaddr.h rbtgen.h region.h result.h \
+		resultclass.h rwlock.h sockaddr.h socket.h str.h symtab.h \
+		task.h timer.h types.h
 
 SUBDIRS =
 TARGETS =

lib/isc/include/isc/netaddr.h

@@ -18,8 +18,7 @@
 #ifndef ISC_NETADDR_H
 #define ISC_NETADDR_H 1
 
-#include <netinet/in.h>
-
+#include <isc/net.h>
 #include <isc/lang.h>
 
 ISC_LANG_BEGINDECLS

lib/isc/include/isc/sockaddr.h

@@ -18,16 +18,13 @@
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1
 
-#include <netinet/in.h>
-
+#include <isc/net.h>
 #include <isc/lang.h>
 
 ISC_LANG_BEGINDECLS
 
 typedef struct isc_sockaddr {
-	/*
-	 * XXX  Must be big enough for all sockaddr types we care about.
-	 */
+	unsigned int length;
 	union {
 		struct sockaddr_in sin;
 #ifdef notyet