mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-01 15:05:23 +00:00
eliminated global variable ns_g_interfacemgr
This commit is contained in:
@@ -25,7 +25,6 @@
|
|||||||
#include <dns/types.h>
|
#include <dns/types.h>
|
||||||
#include <dns/confctx.h>
|
#include <dns/confctx.h>
|
||||||
|
|
||||||
#include <named/interfacemgr.h>
|
|
||||||
#include <named/types.h>
|
#include <named/types.h>
|
||||||
|
|
||||||
#undef EXTERN
|
#undef EXTERN
|
||||||
@@ -48,7 +47,6 @@ EXTERN isc_taskmgr_t * ns_g_taskmgr INIT(NULL);
|
|||||||
*/
|
*/
|
||||||
EXTERN isc_timermgr_t * ns_g_timermgr INIT(NULL);
|
EXTERN isc_timermgr_t * ns_g_timermgr INIT(NULL);
|
||||||
EXTERN isc_socketmgr_t * ns_g_socketmgr INIT(NULL);
|
EXTERN isc_socketmgr_t * ns_g_socketmgr INIT(NULL);
|
||||||
EXTERN ns_interfacemgr_t * ns_g_interfacemgr INIT(NULL);
|
|
||||||
EXTERN ns_clientmgr_t * ns_g_clientmgr INIT(NULL);
|
EXTERN ns_clientmgr_t * ns_g_clientmgr INIT(NULL);
|
||||||
EXTERN char * ns_g_version INIT(VERSION);
|
EXTERN char * ns_g_version INIT(VERSION);
|
||||||
EXTERN in_port_t ns_g_port INIT(53);
|
EXTERN in_port_t ns_g_port INIT(53);
|
||||||
|
@@ -56,12 +56,6 @@
|
|||||||
|
|
||||||
#include <named/types.h>
|
#include <named/types.h>
|
||||||
|
|
||||||
/***
|
|
||||||
*** Types
|
|
||||||
***/
|
|
||||||
|
|
||||||
typedef struct ns_interfacemgr ns_interfacemgr_t;
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
*** Functions
|
*** Functions
|
||||||
***/
|
***/
|
||||||
|
@@ -41,6 +41,7 @@ struct ns_server {
|
|||||||
/* Server data structures. */
|
/* Server data structures. */
|
||||||
dns_viewlist_t viewlist;
|
dns_viewlist_t viewlist;
|
||||||
isc_rwlock_t viewlock;
|
isc_rwlock_t viewlock;
|
||||||
|
ns_interfacemgr_t * interfacemgr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define NS_SERVER_MAGIC 0x53564552 /* SVER */
|
#define NS_SERVER_MAGIC 0x53564552 /* SVER */
|
||||||
|
@@ -26,5 +26,6 @@ typedef struct ns_client ns_client_t;
|
|||||||
typedef struct ns_clientmgr ns_clientmgr_t;
|
typedef struct ns_clientmgr ns_clientmgr_t;
|
||||||
typedef struct ns_query ns_query_t;
|
typedef struct ns_query ns_query_t;
|
||||||
typedef struct ns_server ns_server_t;
|
typedef struct ns_server ns_server_t;
|
||||||
|
typedef struct ns_interfacemgr ns_interfacemgr_t;
|
||||||
|
|
||||||
#endif /* NS_TYPES_H */
|
#endif /* NS_TYPES_H */
|
||||||
|
Reference in New Issue
Block a user