From: Pierangelo Masarati Date: Fri, 11 Jan 2002 10:46:58 +0000 (+0000) Subject: need this outside for back monitor ... X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~191 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5dfbf93687fa1ffdfa9c3d4104d1b9285ce5f33a;p=openldap need this outside for back monitor ... --- diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 55c8347967..ce74a7bd08 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -36,20 +36,6 @@ int deny_severity = LOG_NOTICE; time_t starttime; ber_socket_t dtblsize; -typedef struct slap_listener { - char* sl_url; - char* sl_name; -#ifdef HAVE_TLS - int sl_is_tls; -#endif -#ifdef LDAP_CONNECTIONLESS - int sl_is_udp; /* UDP listener is also data port */ -#endif - ber_socket_t sl_sd; - Sockaddr sl_sa; -#define sl_addr sl_sa.sa_in_addr -} Listener; - Listener **slap_listeners = NULL; #define SLAPD_LISTEN 10 diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 24111b7a69..303f950b30 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -1063,7 +1063,8 @@ LDAP_SLAPD_F (int) do_unbind LDAP_P((Connection *conn, Operation *op)); LDAP_SLAPD_F (int) do_extended LDAP_P((Connection *conn, Operation *op)); -LDAP_SLAPD_V (ber_socket_t) dtblsize; +LDAP_SLAPD_V (ber_socket_t) dtblsize; +LDAP_SLAPD_V (Listener **) slap_listeners; LDAP_END_DECL diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 3bfcc738e2..6f42c54e24 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -1491,6 +1491,23 @@ typedef struct sasl_regexp { #define FLAG_GETDN_AUTHCID 2 #define FLAG_GETDN_AUTHZID 4 +/* + * listener; need to access it from monitor backend + */ +typedef struct slap_listener { + char* sl_url; + char* sl_name; +#ifdef HAVE_TLS + int sl_is_tls; +#endif +#ifdef LDAP_CONNECTIONLESS + int sl_is_udp; /* UDP listener is also data port */ +#endif + ber_socket_t sl_sd; + Sockaddr sl_sa; +#define sl_addr sl_sa.sa_in_addr +} Listener; + LDAP_END_DECL #include "proto-slap.h"