keep track of client entries in sec-mod and report them in status msg

src/ctl.proto

@@ -8,6 +8,7 @@ message status_rep
 	required uint32 start_time = 5;
 	required uint32 stored_tls_sessions = 7;
 	required uint32 banned_ips = 8;
+	required uint32 secmod_client_entries = 9;
 }
 
 message bool_msg

src/ipc.proto

@@ -121,6 +121,7 @@ message cli_stats_msg
 	optional string ipv4 = 6;
 	optional string ipv6 = 7;
 	optional bool invalidate_cookie = 8;
+	optional uint32 secmod_client_entries = 9; /* from sec-mod to main only */
 }
 
 /* UDP_FD */

src/main-ctl-dbus.c

@@ -157,6 +157,7 @@ typedef struct {
 		"      <arg name=\"pid\" direction=\"out\" type=\"u\"/>\n" \
 		"      <arg name=\"sec-mod-pid\" direction=\"out\" type=\"u\"/>\n" \
 		"      <arg name=\"clients\" direction=\"out\" type=\"u\"/>\n" \
+		"      <arg name=\"secmod-client-entries\" direction=\"out\" type=\"u\"/>\n" \
 		"      <arg name=\"tls-sessions\" direction=\"out\" type=\"u\"/>\n" \
 		"      <arg name=\"banned-ips\" direction=\"out\" type=\"u\"/>\n" \
 		"    </method>\n"
@@ -306,6 +307,12 @@ static void method_status(main_server_st * s, struct dbus_ctx *ctx,
 		goto error;
 	}
 
+	tmp = s->secmod_client_entries;
+	if (dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT32, &tmp) == 0) {
+		mslog(s, NULL, LOG_ERR, "error appending to dbus reply");
+		goto error;
+	}
+
 	tmp = s->tls_db.entries;
 	if (dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT32, &tmp) == 0) {
 		mslog(s, NULL, LOG_ERR, "error appending to dbus reply");

src/main-ctl-unix.c

@@ -168,6 +168,7 @@ static void method_status(method_ctx *ctx, int cfd, uint8_t * msg,
 	rep.start_time = ctx->s->start_time;
 	rep.sec_mod_pid = ctx->s->sec_mod_pid;
 	rep.active_clients = ctx->s->active_clients;
+	rep.secmod_client_entries = ctx->s->secmod_client_entries;
 	rep.stored_tls_sessions = ctx->s->tls_db.entries;
 	rep.banned_ips = main_ban_db_elems(ctx->s);
 

src/main-sec-mod-cmd.c

@@ -338,6 +338,8 @@ int session_close(main_server_st * s, struct proc_st *proc)
 
 	proc->bytes_in = msg->bytes_in;
 	proc->bytes_out = msg->bytes_out;
+	if (msg->has_secmod_client_entries)
+		s->secmod_client_entries = msg->secmod_client_entries;
 
 	cli_stats_msg__free_unpacked(msg, &pa);
 

src/main.h

@@ -191,6 +191,9 @@ typedef struct main_server_st {
 	unsigned secmod_addr_len;
 	
 	unsigned active_clients;
+	/* updated on the cli_stats_msg from sec-mod. 
+	 * Holds the number of entries in secmod list of users */
+	unsigned secmod_client_entries;
 	time_t start_time;
 
 	void * auth_extra;

src/occtl-unix.c

@@ -241,12 +241,13 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg)
 	print_time_ival7(time(0), t, stdout);
 	fputs(")\n", stdout);
 
-	printf("          Clients: %u\n", (unsigned)rep->active_clients);
+	printf("               Clients: %u\n", (unsigned)rep->active_clients);
-	printf("  IPs in ban list: %u\n", (unsigned)rep->banned_ips);
+	printf("Sec-mod client entries: %u\n", (unsigned)rep->secmod_client_entries);
-	printf("   TLS DB entries: %u\n", (unsigned)rep->stored_tls_sessions);
+	printf("       IPs in ban list: %u\n", (unsigned)rep->banned_ips);
+	printf("        TLS DB entries: %u\n", (unsigned)rep->stored_tls_sessions);
 	printf("\n");
-	printf("       Server PID: %u\n", (unsigned)rep->pid);
+	printf("            Server PID: %u\n", (unsigned)rep->pid);
-	printf("      Sec-mod PID: %u\n", (unsigned)rep->sec_mod_pid);
+	printf("           Sec-mod PID: %u\n", (unsigned)rep->sec_mod_pid);
 
 	status_rep__free_unpacked(rep, &pa);
 
@@ -255,7 +256,7 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg)
 
  error_status:
 	printf("OpenConnect SSL VPN server\n");
-	printf("         Status: offline\n");
+	printf("                Status: offline\n");
 	ret = 1;
 
  cleanup:

src/sec-mod-auth.c

@@ -522,6 +522,8 @@ int handle_sec_auth_session_close(int cfd, sec_mod_st *sec, const SecAuthSession
 	/* send reply */
 	rep.bytes_in = e->stats.bytes_in;
 	rep.bytes_out = e->stats.bytes_out;
+	rep.has_secmod_client_entries = 1;
+	rep.secmod_client_entries = sec_mod_client_db_elems(sec);
 
 	ret = send_msg(e, cfd, SM_CMD_AUTH_CLI_STATS, &rep,
 			(pack_size_func) cli_stats_msg__get_packed_size,