rewrite statschannel to use netmgr

modify isc_httpd to use the network manager instead of the
isc_socket API.

also cleaned up bin/named/statschannel.c to use CHECK.

lib/isc/include/isc/httpd.h

@@ -42,41 +42,21 @@ struct isc_httpdurl {
 #define HTTPD_EVENTCLASS ISC_EVENTCLASS(4300)
 #define HTTPD_SHUTDOWN	 (HTTPD_EVENTCLASS + 0x0001)
 
-#define ISC_HTTPDMGR_FLAGSHUTTINGDOWN 0x00000001
+#define ISC_HTTPDMGR_SHUTTINGDOWN 0x00000001
 
-/*
- * Create a new http daemon which will send, once every time period,
- * a http-like header followed by HTTP data.
- */
 isc_result_t
-isc_httpdmgr_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task,
+isc_httpdmgr_create(isc_nm_t *nm, isc_mem_t *mctx, isc_sockaddr_t *addr,
 		    isc_httpdclientok_t * client_ok,
-		    isc_httpdondestroy_t *ondestory, void *cb_arg,
-		    isc_timermgr_t *tmgr, isc_httpdmgr_t **httpdp);
+		    isc_httpdondestroy_t *ondestroy, void *cb_arg,
+		    isc_httpdmgr_t **httpdmgrp);
 
 void
 isc_httpdmgr_shutdown(isc_httpdmgr_t **httpdp);
 
 isc_result_t
-isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url,
+isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, bool isstatic,
 		    isc_httpdaction_t *func, void *arg);
 
-isc_result_t
-isc_httpdmgr_addurl2(isc_httpdmgr_t *httpdmgr, const char *url, bool isstatic,
-		     isc_httpdaction_t *func, void *arg);
-
-isc_result_t
-isc_httpd_response(isc_httpd_t *httpd);
-
-isc_result_t
-isc_httpd_addheader(isc_httpd_t *httpd, const char *name, const char *val);
-
-isc_result_t
-isc_httpd_addheaderuint(isc_httpd_t *httpd, const char *name, int val);
-
-isc_result_t
-isc_httpd_endheaders(isc_httpd_t *httpd);
-
 void
 isc_httpd_setfinishhook(void (*fn)(void));
 

lib/isc/win32/libisc.def.in

@@ -291,13 +291,8 @@ isc_ht_iter_delcurrent_next
 isc_ht_iter_destroy
 isc_ht_iter_first
 isc_ht_iter_next
-isc_httpd_addheader
-isc_httpd_addheaderuint
-isc_httpd_endheaders
-isc_httpd_response
 isc_httpd_setfinishhook
 isc_httpdmgr_addurl
-isc_httpdmgr_addurl2
 isc_httpdmgr_create
 isc_httpdmgr_shutdown
 isc_interfaceiter_create