rpc: Add connections_onion_only to getnetworkinfo output

hebasto · hebasto · commit 174848ffb887 · 2020-10-16T23:37:17.000+03:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -2733,13 +2733,16 @@ ConnCounts CConnman::ConnectionCounts()
 {
     int num_in{0};
     int num_out{0};
+    bool onion_only{false};
     {
         LOCK(cs_vNodes);
+        if (!vNodes.empty()) onion_only = true;
         for (const auto& pnode : vNodes) {
             pnode->IsInboundConn() ? ++num_in : ++num_out;
+            if (pnode->ConnectedThroughNetwork() != NET_ONION) onion_only = false;
         }
     }
-    return {num_in, num_out};
+    return {num_in, num_out, onion_only};
 }
 
 void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)
diff --git a/src/net.h b/src/net.h
@@ -188,13 +188,14 @@ struct ConnCounts
     const int all{0};
     const int in{0};
     const int out{0};
+    const bool onion_only{false};
 
     ConnCounts()
     {
     }
 
-    ConnCounts(int num_in, int num_out)
-        : all(num_in + num_out), in(num_in), out(num_out)
+    ConnCounts(int num_in, int num_out, bool is_onion_only)
+        : all(num_in + num_out), in(num_in), out(num_out), onion_only(is_onion_only)
     {
     }
 };
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -533,10 +533,11 @@ static RPCHelpMan getnetworkinfo()
                         }},
                         {RPCResult::Type::BOOL, "localrelay", "true if transaction relay is requested from peers"},
                         {RPCResult::Type::NUM, "timeoffset", "the time offset"},
+                        {RPCResult::Type::BOOL, "networkactive", "whether p2p networking is enabled"},
                         {RPCResult::Type::NUM, "connections", "the total number of connections"},
                         {RPCResult::Type::NUM, "connections_in", "the number of inbound connections"},
                         {RPCResult::Type::NUM, "connections_out", "the number of outbound connections"},
-                        {RPCResult::Type::BOOL, "networkactive", "whether p2p networking is enabled"},
+                        {RPCResult::Type::BOOL, "connections_onion_only", "whether all connection are through the onion network"},
                         {RPCResult::Type::ARR, "networks", "information per network",
                         {
                             {RPCResult::Type::OBJ, "", "",
@@ -587,6 +588,7 @@ static RPCHelpMan getnetworkinfo()
         obj.pushKV("connections", conn_counts.all);
         obj.pushKV("connections_in", conn_counts.in);
         obj.pushKV("connections_out", conn_counts.out);
+        obj.pushKV("connections_onion_only", conn_counts.onion_only);
     }
     obj.pushKV("networks",      GetNetworksInfo());
     obj.pushKV("relayfee",      ValueFromAmount(::minRelayTxFee.GetFeePerK()));

Original file line number	Diff line number	Diff line change
`@@ -2733,13 +2733,16 @@ ConnCounts CConnman::ConnectionCounts()`
`2733`	`2733`	`{`
`2734`	`2734`	`int num_in{0};`
`2735`	`2735`	`int num_out{0};`
	`2736`	`+ bool onion_only{false};`
`2736`	`2737`	`{`
`2737`	`2738`	`LOCK(cs_vNodes);`
	`2739`	`+ if (!vNodes.empty()) onion_only = true;`
`2738`	`2740`	`for (const auto& pnode : vNodes) {`
`2739`	`2741`	`pnode->IsInboundConn() ? ++num_in : ++num_out;`
	`2742`	`+ if (pnode->ConnectedThroughNetwork() != NET_ONION) onion_only = false;`
`2740`	`2743`	`}`
`2741`	`2744`	`}`
`2742`		`- return {num_in, num_out};`
	`2745`	`+ return {num_in, num_out, onion_only};`
`2743`	`2746`	`}`
`2744`	`2747`
`2745`	`2748`	`void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)`
Original file line number	Diff line number	Diff line change
`@@ -188,13 +188,14 @@ struct ConnCounts`
`188`	`188`	`const int all{0};`
`189`	`189`	`const int in{0};`
`190`	`190`	`const int out{0};`
	`191`	`+ const bool onion_only{false};`
`191`	`192`
`192`	`193`	`ConnCounts()`
`193`	`194`	`{`
`194`	`195`	`}`
`195`	`196`
`196`		`- ConnCounts(int num_in, int num_out)`
`197`		`- : all(num_in + num_out), in(num_in), out(num_out)`
	`197`	`+ ConnCounts(int num_in, int num_out, bool is_onion_only)`
	`198`	`+ : all(num_in + num_out), in(num_in), out(num_out), onion_only(is_onion_only)`
`198`	`199`	`{`
`199`	`200`	`}`
`200`	`201`	`};`