X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fconn.c;h=e549918016b011d8e0da0fbb08ff8310b4b7a582;hb=89812424f4f844053cc2607e3e5e9382b0825bb8;hp=2e4f518ff1284c27ebe7fd9ebb36e43e201a06c1;hpb=44a99d694ee13542a399ad975fe7c81854618b13;p=openldap
diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 2e4f518ff1..e549918016 100644
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -1,34 +1,22 @@
/* conn.c - deal with connection 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-2004 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"
@@ -84,10 +72,14 @@ monitor_subsys_conn_init(
"dn: cn=Total,%s\n"
"objectClass: %s\n"
"structuralObjectClass: %s\n"
- "cn: Total\n",
+ "cn: Total\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
- mi->oc_monitorCounterObject->soc_cname.bv_val,
- mi->oc_monitorCounterObject->soc_cname.bv_val );
+ mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
+ mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
@@ -108,7 +100,7 @@ monitor_subsys_conn_init(
bv.bv_val = "0";
bv.bv_len = 1;
- attr_merge_one( e, mi->ad_monitorCounter, &bv, NULL );
+ attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
@@ -144,10 +136,14 @@ monitor_subsys_conn_init(
"dn: cn=Current,%s\n"
"objectClass: %s\n"
"structuralObjectClass: %s\n"
- "cn: Current\n",
+ "cn: Current\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
- mi->oc_monitorCounterObject->soc_cname.bv_val,
- mi->oc_monitorCounterObject->soc_cname.bv_val );
+ mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
+ mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
@@ -168,7 +164,7 @@ monitor_subsys_conn_init(
bv.bv_val = "0";
bv.bv_len = 1;
- attr_merge_one( e, mi->ad_monitorCounter, &bv, NULL );
+ attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
@@ -238,7 +234,7 @@ monitor_subsys_conn_update(
Attribute *a;
char buf[] = "+9223372036854775807L";
- a = attr_find( e->e_attrs, mi->ad_monitorCounter );
+ a = attr_find( e->e_attrs, mi->mi_ad_monitorCounter );
if ( a == NULL ) {
return( -1 );
}
@@ -268,18 +264,62 @@ conn_create(
Entry *e;
+ struct tm *ctm;
+ char ctmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+ struct tm *mtm;
+ char mtmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+#ifdef HAVE_GMTIME_R
+ struct tm tm_buf;
+#endif /* HAVE_GMTIME_R */
+
assert( c != NULL );
assert( ep != NULL );
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+#endif
+#ifdef HACK_LOCAL_TIME
+# ifdef HAVE_LOCALTIME_R
+ ctm = localtime_r( &c->c_starttime, &tm_buf );
+ lutil_localtime( ctmbuf, sizeof( ctmbuf ), ctm, -timezone );
+ mtm = localtime_r( &c->c_activitytime, &tm_buf );
+ lutil_localtime( mtmbuf, sizeof( mtmbuf ), mtm, -timezone );
+# else
+ ctm = localtime( &c->c_starttime );
+ lutil_localtime( ctmbuf, sizeof( ctmbuf ), ctm, -timezone );
+ mtm = localtime( &c->c_activitytime );
+ lutil_localtime( mtmbuf, sizeof( mtmbuf ), mtm, -timezone );
+# endif /* HAVE_LOCALTIME_R */
+#else /* !HACK_LOCAL_TIME */
+# ifdef HAVE_GMTIME_R
+ ctm = gmtime_r( &c->c_starttime, &tm_buf );
+ lutil_gentime( ctmbuf, sizeof( ctmbuf ), ctm );
+ mtm = gmtime_r( &c->c_activitytime, &tm_buf );
+ lutil_gentime( mtmbuf, sizeof( mtmbuf ), mtm );
+# else
+ ctm = gmtime( &c->c_starttime );
+ lutil_gentime( ctmbuf, sizeof( ctmbuf ), ctm );
+ mtm = gmtime( &c->c_activitytime );
+ lutil_gentime( mtmbuf, sizeof( mtmbuf ), mtm );
+# endif /* HAVE_GMTIME_R */
+#endif /* !HACK_LOCAL_TIME */
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
+
snprintf( buf, sizeof( buf ),
"dn: cn=" CONN_CN_PREFIX " %ld,%s\n"
"objectClass: %s\n"
"structuralObjectClass: %s\n"
- "cn: " CONN_CN_PREFIX " %ld\n",
+ "cn: " CONN_CN_PREFIX " %ld\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
- mi->oc_monitorConnection->soc_cname.bv_val,
- mi->oc_monitorConnection->soc_cname.bv_val,
- c->c_connid );
+ mi->mi_oc_monitorConnection->soc_cname.bv_val,
+ mi->mi_oc_monitorConnection->soc_cname.bv_val,
+ c->c_connid,
+ ctmbuf, mtmbuf );
+
e = str2entry( buf );
if ( e == NULL) {
@@ -300,15 +340,27 @@ conn_create(
return( -1 );
}
+#ifndef HAVE_GMTIME_R
ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-
+#endif
+
+#ifdef HAVE_GMTIME_R
+ ltm = gmtime_r( &c->c_starttime, &tm_buf );
+#else
ltm = gmtime( &c->c_starttime );
+#endif
lutil_gentime( buf2, sizeof( buf2 ), ltm );
-
+
+#ifdef HAVE_GMTIME_R
+ ltm = gmtime_r( &c->c_activitytime, &tm_buf );
+#else
ltm = gmtime( &c->c_activitytime );
+#endif
lutil_gentime( buf3, sizeof( buf3 ), ltm );
-
+
+#ifndef HAVE_GMTIME_R
ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif /* HAVE_GMTIME_R */
/* monitored info */
sprintf( buf,
@@ -346,24 +398,24 @@ conn_create(
bv.bv_val = buf;
bv.bv_len = strlen( buf );
- attr_merge_one( e, mi->ad_monitoredInfo, &bv, NULL );
+ attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
/* connection number */
snprintf( buf, sizeof( buf ), "%ld", c->c_connid );
bv.bv_val = buf;
bv.bv_len = strlen( buf );
- attr_merge_one( e, mi->ad_monitorConnectionNumber, &bv, NULL );
+ attr_merge_one( e, mi->mi_ad_monitorConnectionNumber, &bv, NULL );
/* authz DN */
- attr_merge_one( e, mi->ad_monitorConnectionAuthzDN,
+ attr_merge_one( e, mi->mi_ad_monitorConnectionAuthzDN,
&c->c_dn, &c->c_ndn );
/* local address */
- attr_merge_one( e, mi->ad_monitorConnectionLocalAddress,
+ attr_merge_one( e, mi->mi_ad_monitorConnectionLocalAddress,
&c->c_sock_name, NULL );
/* peer address */
- attr_merge_one( e, mi->ad_monitorConnectionPeerAddress,
+ attr_merge_one( e, mi->mi_ad_monitorConnectionPeerAddress,
&c->c_peer_name, NULL );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );