X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Flistener.c;h=94737fd0149d677bfc89697df4177c8db39858ae;hb=42e3bedbf200da4e216b980fd5c67f18d1ea0c99;hp=c66e1c5f2fb01fb6286d9486f3caea623829355e;hpb=2a8dec95ba9a91e2c4f3e5b48f789eb803363650;p=openldap diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c index c66e1c5f2f..94737fd014 100644 --- a/servers/slapd/back-monitor/listener.c +++ b/servers/slapd/back-monitor/listener.c @@ -1,175 +1,136 @@ /* listener.c - deals with listener subsystem */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 2001-2012 The OpenLDAP Foundation. + * Portions Copyright 2001-2003 Pierangelo Masarati. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . */ -/* - * Copyright 2001, Pierangelo Masarati, All rights reserved. - * - * This work has beed deveolped for the OpenLDAP Foundation - * in the hope that it may be useful to the Open Source community, - * but WITHOUT ANY WARRANTY. - * - * Permission is granted to anyone to use this software for any purpose - * on any computer system, and to alter it and redistribute it, subject - * to the following restrictions: - * - * 1. The author and SysNet s.n.c. are not responsible for the consequences - * of use of this software, no matter how awful, even if they arise from - * flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, - * credits should appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users - * ever read sources, credits should appear in the documentation. - * SysNet s.n.c. cannot be responsible for the consequences of the - * alterations. - * - * 4. This notice may not be removed or altered. +/* ACKNOWLEDGEMENTS: + * This work was initially developed by Pierangelo Masarati for inclusion + * in OpenLDAP Software. */ #include "portable.h" #include +#include #include "slap.h" #include "back-monitor.h" int monitor_subsys_listener_init( - BackendDB *be + BackendDB *be, + monitor_subsys_t *ms ) { - struct monitorinfo *mi; - Entry *e, *e_listener, *e_tmp; - int i; - struct monitorentrypriv *mp; - Listener **l; + monitor_info_t *mi; + Entry *e_listener, **ep; + int i; + monitor_entry_t *mp; + Listener **l; assert( be != NULL ); - assert( monitor_ad_desc != NULL ); - mi = ( struct monitorinfo * )be->be_private; + if ( ( l = slapd_get_listeners() ) == NULL ) { + if ( slapMode & SLAP_TOOL_MODE ) { + return 0; + } - if ( monitor_cache_get( mi, - &monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn, - &e_listener ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, CRIT, - "monitor_subsys_listener_init: " - "unable to get entry '%s'\n", - monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "monitor_subsys_listener_init: " - "unable to get entry '%s'\n%s%s", - monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, - "", "" ); -#endif + "unable to get listeners\n", 0, 0, 0 ); return( -1 ); } - if ( ( l = slapd_get_listeners() ) == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, CRIT, - "monitor_subsys_listener_init: " - "unable to get listeners\n", 0, 0, 0 ); -#else + mi = ( monitor_info_t * )be->be_private; + + if ( monitor_cache_get( mi, &ms->mss_ndn, &e_listener ) ) { Debug( LDAP_DEBUG_ANY, "monitor_subsys_listener_init: " - "unable to get listeners\n", 0, 0, 0 ); -#endif + "unable to get entry \"%s\"\n", + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } - e_tmp = NULL; - for ( i = 0; l[i]; i++ ); - for ( ; i--; ) { - char buf[1024]; - - snprintf( buf, sizeof( buf ), - "dn: cn=Listener %d,%s\n" - SLAPD_MONITOR_OBJECTCLASSES - "cn: Listener %d\n" - "description: %s\n" - "labeledURI: %s", - i, - monitor_subsys[SLAPD_MONITOR_LISTENER].mss_dn.bv_val, - i, - l[i]->sl_name.bv_val, - l[i]->sl_url.bv_val ); - - e = str2entry( buf ); + mp = ( monitor_entry_t * )e_listener->e_private; + mp->mp_children = NULL; + ep = &mp->mp_children; + + for ( i = 0; l[ i ]; i++ ) { + char buf[ BACKMONITOR_BUFSIZE ]; + Entry *e; + struct berval bv; + + bv.bv_len = snprintf( buf, sizeof( buf ), + "cn=Listener %d", i ); + bv.bv_val = buf; + e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv, + mi->mi_oc_monitoredObject, NULL, NULL ); + if ( e == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, CRIT, - "monitor_subsys_listener_init: " - "unable to create entry 'cn=Listener, %d,%s'\n", - i, monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0 ); -#else Debug( LDAP_DEBUG_ANY, "monitor_subsys_listener_init: " - "unable to create entry 'cn=Listener %d,%s'\n%s", - i, - monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, - "" ); -#endif + "unable to create entry \"cn=Listener %d,%s\"\n", + i, ms->mss_ndn.bv_val, 0 ); return( -1 ); } + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionLocalAddress, + &l[ i ]->sl_name, NULL ); + + attr_merge_normalize_one( e, slap_schema.si_ad_labeledURI, + &l[ i ]->sl_url, NULL ); + #ifdef HAVE_TLS - if ( l[i]->sl_is_tls ) { - struct berval bv[2]; - bv[1].bv_val = NULL; - bv[0].bv_val = "TLS"; - bv[0].bv_len = sizeof("TLS")-1; - attr_mergeit( e, monitor_ad_desc, bv ); + if ( l[ i ]->sl_is_tls ) { + struct berval bv; + + BER_BVSTR( &bv, "TLS" ); + attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, + &bv, NULL ); } #endif /* HAVE_TLS */ #ifdef LDAP_CONNECTIONLESS - if ( l[i]->sl_is_udp ) { - struct berval bv[2]; - bv[1].bv_val = NULL; - bv[0].bv_val = "UDP"; - bv[0].bv_len = sizeof("UDP")-1; - attr_mergeit( e, monitor_ad_desc, bv ); + if ( l[ i ]->sl_is_udp ) { + struct berval bv; + + BER_BVSTR( &bv, "UDP" ); + attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, + &bv, NULL ); } #endif /* HAVE_TLS */ - mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + mp = monitor_entrypriv_create(); + if ( mp == NULL ) { + return -1; + } e->e_private = ( void * )mp; - mp->mp_next = e_tmp; - mp->mp_children = NULL; - mp->mp_info = &monitor_subsys[SLAPD_MONITOR_LISTENER]; - mp->mp_flags = monitor_subsys[SLAPD_MONITOR_LISTENER].mss_flags + mp->mp_info = ms; + mp->mp_flags = ms->mss_flags | MONITOR_F_SUB; if ( monitor_cache_add( mi, e ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, CRIT, - "monitor_subsys_listener_init: " - "unable to add entry 'cn=Listener %d,%s'\n", - i, monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, 0 ); -#else Debug( LDAP_DEBUG_ANY, "monitor_subsys_listener_init: " - "unable to add entry 'cn=Listener %d,%s'\n", - i, - monitor_subsys[SLAPD_MONITOR_LISTENER].mss_ndn.bv_val, - 0 ); -#endif + "unable to add entry \"cn=Listener %d,%s\"\n", + i, ms->mss_ndn.bv_val, 0 ); return( -1 ); } - e_tmp = e; + *ep = e; + ep = &mp->mp_next; } - mp = ( struct monitorentrypriv * )e_listener->e_private; - mp->mp_children = e_tmp; - monitor_cache_release( mi, e_listener ); return( 0 );