summaryrefslogtreecommitdiffstats
path: root/src/server/net.c
diff options
context:
space:
mode:
authorSimon Rettberg2017-10-06 12:18:19 +0200
committerSimon Rettberg2017-10-06 12:18:19 +0200
commit0c4a63c894fb20eefe72a78789931fe02b6d8d18 (patch)
tree683b929f481e51559e80dca58938b6e8dcd75352 /src/server/net.c
parent[SERVER] rpc: Fix bitmask calc for odd subnet sizes (not 8, 16, ...) (diff)
downloaddnbd3-0c4a63c894fb20eefe72a78789931fe02b6d8d18.tar.gz
dnbd3-0c4a63c894fb20eefe72a78789931fe02b6d8d18.tar.xz
dnbd3-0c4a63c894fb20eefe72a78789931fe02b6d8d18.zip
[SERVER] Return client count when requesting stats but not client list
Diffstat (limited to 'src/server/net.c')
-rw-r--r--src/server/net.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/server/net.c b/src/server/net.c
index 11b318c..8e287e7 100644
--- a/src/server/net.c
+++ b/src/server/net.c
@@ -545,6 +545,7 @@ json_t* net_clientsToJson(const bool fullList)
uint64_t bytesSent;
char host[HOSTNAMELEN];
host[HOSTNAMELEN-1] = '\0';
+ json_int_t counter = 0;
spin_lock( &_clients_lock );
for ( i = 0; i < _num_clients; ++i ) {
@@ -564,6 +565,8 @@ json_t* net_clientsToJson(const bool fullList)
if ( fullList ) {
strncpy( host, client->hostName, HOSTNAMELEN - 1 );
imgId = client->image->id;
+ } else {
+ counter++;
}
spin_lock( &client->statsLock );
spin_unlock( &client->lock );
@@ -581,7 +584,10 @@ json_t* net_clientsToJson(const bool fullList)
spin_lock( &_clients_lock );
}
spin_unlock( &_clients_lock );
- return jsonClients;
+ if ( fullList ) {
+ return jsonClients;
+ }
+ return json_integer( counter );
}
void net_disconnectAll()