X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=blobdiff_plain;f=trp%2Ftrp_peer_encoders.c;h=6c8a4bf2696b36fa2d1a06983d1d859b791ecb69;hp=f4edbebe7504917e4d2b0a6f77022db78e212c40;hb=dd90d231263fc3dde5f538a5a83d88dd701ed178;hpb=81c77ab872340d96b75232dbeeba6e23a58d8088 diff --git a/trp/trp_peer_encoders.c b/trp/trp_peer_encoders.c index f4edbeb..6c8a4bf 100644 --- a/trp/trp_peer_encoders.c +++ b/trp/trp_peer_encoders.c @@ -100,18 +100,18 @@ json_t *trp_peer_to_json(TRP_PEER *peer) OBJECT_SET_OR_FAIL(peer_json, "server", server_to_json_string(trp_peer_get_server(peer), trp_peer_get_port(peer))); + OBJECT_SET_OR_FAIL(peer_json, "servicename", + tr_name_to_json_string(trp_peer_get_servicename(peer))); OBJECT_SET_OR_FAIL(peer_json, "linkcost", json_integer(trp_peer_get_linkcost(peer))); OBJECT_SET_OR_FAIL(peer_json, "connected_to", json_boolean(trp_peer_get_outgoing_status(peer) == PEER_CONNECTED)); OBJECT_SET_OR_FAIL(peer_json, "connected_from", json_boolean(trp_peer_get_incoming_status(peer) == PEER_CONNECTED)); - OBJECT_SET_OR_FAIL(peer_json, "servicename", - tr_name_to_json_string(trp_peer_get_servicename(peer))); - OBJECT_SET_OR_FAIL(peer_json, "allowed_credentials", - gss_names_to_json_array(trp_peer_get_gss_names(peer))); OBJECT_SET_OR_FAIL(peer_json, "last_connection_attempt", last_attempt_to_json_string(peer)); + OBJECT_SET_OR_FAIL(peer_json, "allowed_credentials", + gss_names_to_json_array(trp_peer_get_gss_names(peer))); /* succeeded - set the return value and increment the reference count */ retval = peer_json;