Commit b4cdd00f authored by Evan Hunt's avatar Evan Hunt

Merge branch '2022-stats-netmgr' into 'main'

Resolve "use netmgr for statschannel"

Closes #2022

See merge request isc-projects/bind9!3847
parents d8e6b32a efa56399
Pipeline #46915 passed with stages
in 2 minutes and 5 seconds
5472. [func] The statistics channel has been updated to use the
new network manager. [GL #2022]
5471. [bug] The introduction of KASP support broke whether the
second field of sig-validity-interval was treated as
days or hours. (Thanks to Tony Finch.) [GL !3735]
......
This diff is collapsed.
......@@ -33,6 +33,9 @@ New Features
restoring UNIX-domain socket support or by formally declaring them
to be obsolete in the control channel. [GL #1759]
- Statistics channels have also been updated to use the new BIND network
manager API. [GL #2022]
Feature Changes
~~~~~~~~~~~~~~~
......
This diff is collapsed.
......@@ -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));
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment