X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmonitor.c;h=659be6e99b5ecf12d36d8779e4379e233f426b23;hb=8743c05359d008eab5d65d5aacf1836bd583dafb;hp=a9aef36cf794c7eaeee8fffb82bdc368f39c40ee;hpb=97bc10753776fb384d94d49608961043cb7f8b4b;p=openldap

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index a9aef36cf7..659be6e99b 100644
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -21,18 +21,14 @@
 #include "ldap_defaults.h"
 #include "slap.h"
 
-char *supportedControls[] = {
-	NULL
-};
-
-char *supportedExtensions[] = {
-	NULL
-};
-
 #if defined( SLAPD_MONITOR_DN )
 
 void
-monitor_info( Connection *conn, Operation *op )
+monitor_info(
+	Connection *conn,
+	Operation *op,
+	char ** attrs,
+	int attrsonly )
 {
 	Entry		*e;
 	char		buf[BUFSIZ];
@@ -54,9 +50,24 @@ monitor_info( Connection *conn, Operation *op )
 	/* initialize reader/writer lock */
 	e->e_attrs = NULL;
 	e->e_dn = ch_strdup( SLAPD_MONITOR_DN );
-	e->e_ndn = dn_normalize_case( ch_strdup(SLAPD_MONITOR_DN) );
+	e->e_ndn = ch_strdup(SLAPD_MONITOR_DN);
+	(void) dn_normalize_case( e->e_ndn );
 	e->e_private = NULL;
 
+	{
+		char *rdn = ch_strdup( SLAPD_MONITOR_DN );
+		val.bv_val = strchr( rdn, '=' );
+
+		if( val.bv_val != NULL ) {
+			*val.bv_val = '\0';
+			val.bv_len = strlen( ++val.bv_val );
+
+			attr_merge( e, rdn, vals );
+		}
+
+		free( rdn );
+	}
+
 	val.bv_val = (char *) Versionstr;
 	if (( p = strchr( Versionstr, '\n' )) == NULL ) {
 		val.bv_len = strlen( Versionstr );
@@ -110,9 +121,9 @@ monitor_info( Connection *conn, Operation *op )
 			"%ld : %ld "
 			": %ld/%ld/%ld/%ld "
 			": %ld/%ld/%ld "
-			": %s%s%s%s "
+			": %s%s%s%s%s%s "
 			": %s : %s : %s "
-			": %s : %s",
+			": %s : %s : %s : %s ",
 
 			c->c_connid,
 			(long) c->c_protocol,
@@ -127,10 +138,15 @@ monitor_info( Connection *conn, Operation *op )
 		    c->c_writewaiter ? "w" : "",
 		    c->c_ops != NULL ? "x" : "",
 		    c->c_pending_ops != NULL ? "p" : "",
+			connection_state2str( c->c_conn_state ),
+			c->c_bind_in_progress ? "S" : "",
 
 		    c->c_cdn ? c->c_cdn : "<anonymous>",
-		    c->c_client_addr ? c->c_client_addr : "unknown",
-		    c->c_client_name ? c->c_client_name : "unknown",
+
+			c->c_listener_url,
+		    c->c_peer_domain,
+		    c->c_peer_name,
+		    c->c_sock_name,
 
 		    buf2,
 			buf3
@@ -145,55 +161,69 @@ monitor_info( Connection *conn, Operation *op )
 	sprintf( buf, "%d", nconns );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "currentconnections", vals );
+	attr_merge( e, "currentConnections", vals );
 
 	sprintf( buf, "%ld", connections_nextid() );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "totalconnections", vals );
+	attr_merge( e, "totalConnections", vals );
 
 	sprintf( buf, "%ld", (long) dtblsize );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "dtablesize", vals );
+	attr_merge( e, "dTableSize", vals );
 
 	sprintf( buf, "%d", nwritewaiters );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "writewaiters", vals );
+	attr_merge( e, "writeWaiters", vals );
 
 	sprintf( buf, "%d", nreadwaiters );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "readwaiters", vals );
+	attr_merge( e, "readWaiters", vals );
 
 	ldap_pvt_thread_mutex_lock(&num_ops_mutex);
 	sprintf( buf, "%ld", num_ops_initiated );
 	ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "opsinitiated", vals );
+	attr_merge( e, "opsInitiated", vals );
 
 	ldap_pvt_thread_mutex_lock(&num_ops_mutex);
 	sprintf( buf, "%ld", num_ops_completed );
 	ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "opscompleted", vals );
+	attr_merge( e, "opsCompleted", vals );
 
 	ldap_pvt_thread_mutex_lock(&num_sent_mutex);
 	sprintf( buf, "%ld", num_entries_sent );
 	ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "entriessent", vals );
+	attr_merge( e, "entriesSent", vals );
+
+	ldap_pvt_thread_mutex_lock(&num_sent_mutex);
+	sprintf( buf, "%ld", num_refs_sent );
+	ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
+	val.bv_val = buf;
+	val.bv_len = strlen( buf );
+	attr_merge( e, "referencesSent", vals );
+
+	ldap_pvt_thread_mutex_lock(&num_sent_mutex);
+	sprintf( buf, "%ld", num_pdu_sent );
+	ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
+	val.bv_val = buf;
+	val.bv_len = strlen( buf );
+	attr_merge( e, "pduSent", vals );
 
 	ldap_pvt_thread_mutex_lock(&num_sent_mutex);
 	sprintf( buf, "%ld", num_bytes_sent );
 	ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
-	attr_merge( e, "bytessent", vals );
+	attr_merge( e, "bytesSent", vals );
 
 	currenttime = slap_get_time();
 
@@ -234,8 +264,18 @@ monitor_info( Connection *conn, Operation *op )
 	attr_merge( e, "concurrency", vals );
 #endif
 
-	send_search_entry( &backends[0], conn, op, e, NULL, 0 );
-	send_ldap_search_result( conn, op, LDAP_SUCCESS, NULL, NULL, 1 );
+	val.bv_val = "top";
+	val.bv_len = sizeof("top")-1;
+	attr_merge( e, "objectClass", vals );
+
+	val.bv_val = "extensibleObject";
+	val.bv_len = sizeof("extensibleObject")-1;
+	attr_merge( e, "objectClass", vals );
+
+	send_search_entry( &backends[0], conn, op, e,
+		attrs, attrsonly, NULL );
+	send_search_result( conn, op, LDAP_SUCCESS,
+		NULL, NULL, NULL, NULL, 1 );
 
 	entry_free( e );
 }