update

bin/named/Makefile.in

@@ -17,19 +17,21 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
+@BIND9_VERSION@
+
 CINCLUDES =	-I../../lib/isc/unix/include \
 		-I${srcdir}/../../lib/isc/unix/include \
 		-I${srcdir}/../../lib/isc/pthreads/include \
 		-I${srcdir}/../../lib/isc/include \
 		-I../../lib/dns/include \
 		-I${srcdir}/../../lib/dns/include \
-		-I${srcdir}/../.. \
-		-I${srcdir}
+		-I${srcdir}/../../lib/dns/sec/dst/include \
+		-I${srcdir}/include \
+		-I${srcdir}/../..
 
 CDEFINES =	
 CWARNINGS =
 
-
 DEPLIBS =	../../lib/dns/libdns.@A@ \
 		../../lib/isc/libisc.@A@
 
@@ -38,14 +40,15 @@ LIBS =		${DEPLIBS} \
 
 TARGETS =	named
 
-OBJS =		server.o udpclient.o tcpclient.o printmsg.o \
-		interfacemgr.o
+OBJS =		client.o interfacemgr.o main.o server.o
 
-SRCS =		server.c udpclient.c tcpclient.c \
-		interfacemgr.c
+SRCS =		client.c interfacemgr.c main.c server.c
 
 @BIND9_MAKE_RULES@
 
+main.o: main.c
+	${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" -c $<
+
 printmsg.o: ${srcdir}/../tests/printmsg.c
 	${CC} -c -o printmsg.o ${ALL_CFLAGS} -I${srcdir}/../tests \
 		${srcdir}/../tests/printmsg.c

bin/named/include/named/interfacemgr.h

@@ -47,8 +47,10 @@
  *** Imports
  ***/
 
+#include <isc/types.h>
 #include <isc/result.h>
 #include <isc/mem.h>
+#include <isc/socket.h>
 
 #include <dns/result.h>
 
@@ -56,23 +58,18 @@
  *** Types
  ***/
 
-/* XXX this declaration should be somewhere else, where? */
-typedef dns_result_t
-ns_dispatch_func(isc_mem_t *, isc_region_t *, unsigned int);
-
 typedef struct ns_interfacemgr ns_interfacemgr_t;
 
 /***
  *** Functions
  ***/
 
-dns_result_t
+isc_result_t
 ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
-		       isc_socketmgr_t *socketmgr,
-		       ns_dispatch_func *dispatch,
+		       isc_socketmgr_t *socketmgr, ns_clientmgr_t *clientmgr,
 		       ns_interfacemgr_t **mgrp);
 
-dns_result_t
+void
 ns_interfacemgr_scan(ns_interfacemgr_t *mgr);
 /*
  * Scan the operatings system's list of network interfaces