From 9c102bec63ac8353a8ed28172d03b4264cd49572 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 8 May 2015 11:16:03 +0200
Subject: [SERVER] Rename some more RPC fields

---
 src/server/image.c | 2 +-
 src/server/rpc.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/image.c b/src/server/image.c
index 1b2ce07..9259874 100644
--- a/src/server/image.c
+++ b/src/server/image.c
@@ -1147,7 +1147,7 @@ json_t* image_fillJson()
 	for (i = 0; i < _num_images; ++i) {
 		if ( _images[i] == NULL ) continue;
 		spin_lock( &_images[i]->lock );
-		image = json_pack( "{sisssisIsi}", "id", _images[i]->id, "image", _images[i]->lower_name, "rid", (int) _images[i]->rid, "users", (json_int_t) _images[i]->users,
+		image = json_pack( "{sisssisIsi}", "id", _images[i]->id, "name", _images[i]->lower_name, "rid", (int) _images[i]->rid, "users", (json_int_t) _images[i]->users,
 				"complete",  image_getCompletenessEstimate( _images[i] ) );
 		if ( _images[i]->uplink != NULL ) {
 			host_to_string( &_images[i]->uplink->currentServer, buffer, sizeof(buffer) );
diff --git a/src/server/rpc.c b/src/server/rpc.c
index ea1eccf..f010e73 100644
--- a/src/server/rpc.c
+++ b/src/server/rpc.c
@@ -55,7 +55,7 @@ static void clientsToJson(json_t *jsonClients)
 			if ( !host_to_string( &_clients[i]->host, clientName, sizeof(clientName) ) ) {
 				strcpy( clientName, "???" );
 			}
-			clientStats = json_pack( "{sssisI}", "client", clientName, "image", _clients[i]->image->id, "bytesSent", (json_int_t)_clients[i]->bytesSent );
+			clientStats = json_pack( "{sssisI}", "address", clientName, "imageId", _clients[i]->image->id, "bytesSent", (json_int_t)_clients[i]->bytesSent );
 			json_array_append_new( jsonClients, clientStats );
 		}
 		spin_unlock( &_clients[i]->lock );
-- 
cgit v1.2.3-55-g7522