From 130099f43e44bdfcbd615d7e23bad2a0c6a8d6e8 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 18 Aug 2017 16:27:30 +0900 Subject: [PATCH] add new keys for WebUI api peers handling, distinguishable hidden node and clear node when examining certificate --- libresapi/src/api/PeersHandler.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/libresapi/src/api/PeersHandler.cpp b/libresapi/src/api/PeersHandler.cpp index be6969210..761f207b9 100644 --- a/libresapi/src/api/PeersHandler.cpp +++ b/libresapi/src/api/PeersHandler.cpp @@ -45,12 +45,37 @@ namespace resource_api void peerDetailsToStream(StreamBase& stream, RsPeerDetails& details) { + std::string nodeType_string; + if(details.isHiddenNode) + { + switch (details.hiddenType) + { + case RS_HIDDEN_TYPE_I2P: + nodeType_string = "I2P"; + break; + case RS_HIDDEN_TYPE_TOR: + nodeType_string = "TOR"; + break; + case RS_HIDDEN_TYPE_NONE: + nodeType_string = "None"; + break; + case RS_HIDDEN_TYPE_UNKNOWN: + nodeType_string = "Unknown"; + break; + default: + nodeType_string = "Undefined"; + } + }else{ + nodeType_string = "Normal"; + } + stream << makeKeyValueReference("peer_id", details.id) << makeKeyValueReference("name", details.name) << makeKeyValueReference("location", details.location) << makeKeyValueReference("pgp_id", details.gpg_id) - << makeKeyValueReference("pgp_id", details.gpg_id); + << makeKeyValueReference("isHiddenNode", details.isHiddenNode) + << makeKeyValueReference("nodeType", nodeType_string ); if(details.state & RS_PEER_STATE_CONNECTED) {