From e8e73ca025c558c0b62026bca758c3621c45598a Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Tue, 4 Jan 2000 22:01:54 +0000 Subject: [PATCH] eliminated global variable ns_g_interfacemgr --- bin/named/include/named/globals.h | 2 -- bin/named/include/named/interfacemgr.h | 6 ------ bin/named/include/named/server.h | 1 + bin/named/include/named/types.h | 1 + 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h index 8e35518a1f..c825519aa2 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h @@ -25,7 +25,6 @@ #include #include -#include #include #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_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 char * ns_g_version INIT(VERSION); EXTERN in_port_t ns_g_port INIT(53); diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h index fb01bebb5c..2f016dbc06 100644 --- a/bin/named/include/named/interfacemgr.h +++ b/bin/named/include/named/interfacemgr.h @@ -56,12 +56,6 @@ #include -/*** - *** Types - ***/ - -typedef struct ns_interfacemgr ns_interfacemgr_t; - /*** *** Functions ***/ diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index a92a94d58b..dede51dc5b 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -41,6 +41,7 @@ struct ns_server { /* Server data structures. */ dns_viewlist_t viewlist; isc_rwlock_t viewlock; + ns_interfacemgr_t * interfacemgr; }; #define NS_SERVER_MAGIC 0x53564552 /* SVER */ diff --git a/bin/named/include/named/types.h b/bin/named/include/named/types.h index a3ae8695df..9882834023 100644 --- a/bin/named/include/named/types.h +++ b/bin/named/include/named/types.h @@ -26,5 +26,6 @@ typedef struct ns_client ns_client_t; typedef struct ns_clientmgr ns_clientmgr_t; typedef struct ns_query ns_query_t; typedef struct ns_server ns_server_t; +typedef struct ns_interfacemgr ns_interfacemgr_t; #endif /* NS_TYPES_H */