aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/net.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/rpc/net.cpp')
-rw-r--r--src/rpc/net.cpp144
1 files changed, 72 insertions, 72 deletions
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 9de249855c..fee2b765ba 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2009-2017 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -89,7 +89,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
" \"pingtime\": n, (numeric) ping time (if available)\n"
" \"minping\": n, (numeric) minimum observed ping time (if any at all)\n"
" \"pingwait\": n, (numeric) ping wait (if non-zero)\n"
- " \"version\": v, (numeric) The peer version, such as 7001\n"
+ " \"version\": v, (numeric) The peer version, such as 70001\n"
" \"subver\": \"/Satoshi:0.8.5/\", (string) The string version\n"
" \"inbound\": true|false, (boolean) Inbound (true) or Outbound (false)\n"
" \"addnode\": true|false, (boolean) Whether connection was due to addnode/-connect or if it was an automatic/inbound connection\n"
@@ -130,59 +130,59 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
UniValue obj(UniValue::VOBJ);
CNodeStateStats statestats;
bool fStateStats = GetNodeStateStats(stats.nodeid, statestats);
- obj.push_back(Pair("id", stats.nodeid));
- obj.push_back(Pair("addr", stats.addrName));
+ obj.pushKV("id", stats.nodeid);
+ obj.pushKV("addr", stats.addrName);
if (!(stats.addrLocal.empty()))
- obj.push_back(Pair("addrlocal", stats.addrLocal));
+ obj.pushKV("addrlocal", stats.addrLocal);
if (stats.addrBind.IsValid())
- obj.push_back(Pair("addrbind", stats.addrBind.ToString()));
- obj.push_back(Pair("services", strprintf("%016x", stats.nServices)));
- obj.push_back(Pair("relaytxes", stats.fRelayTxes));
- obj.push_back(Pair("lastsend", stats.nLastSend));
- obj.push_back(Pair("lastrecv", stats.nLastRecv));
- obj.push_back(Pair("bytessent", stats.nSendBytes));
- obj.push_back(Pair("bytesrecv", stats.nRecvBytes));
- obj.push_back(Pair("conntime", stats.nTimeConnected));
- obj.push_back(Pair("timeoffset", stats.nTimeOffset));
+ obj.pushKV("addrbind", stats.addrBind.ToString());
+ obj.pushKV("services", strprintf("%016x", stats.nServices));
+ obj.pushKV("relaytxes", stats.fRelayTxes);
+ obj.pushKV("lastsend", stats.nLastSend);
+ obj.pushKV("lastrecv", stats.nLastRecv);
+ obj.pushKV("bytessent", stats.nSendBytes);
+ obj.pushKV("bytesrecv", stats.nRecvBytes);
+ obj.pushKV("conntime", stats.nTimeConnected);
+ obj.pushKV("timeoffset", stats.nTimeOffset);
if (stats.dPingTime > 0.0)
- obj.push_back(Pair("pingtime", stats.dPingTime));
+ obj.pushKV("pingtime", stats.dPingTime);
if (stats.dMinPing < static_cast<double>(std::numeric_limits<int64_t>::max())/1e6)
- obj.push_back(Pair("minping", stats.dMinPing));
+ obj.pushKV("minping", stats.dMinPing);
if (stats.dPingWait > 0.0)
- obj.push_back(Pair("pingwait", stats.dPingWait));
- obj.push_back(Pair("version", stats.nVersion));
+ obj.pushKV("pingwait", stats.dPingWait);
+ obj.pushKV("version", stats.nVersion);
// Use the sanitized form of subver here, to avoid tricksy remote peers from
// corrupting or modifying the JSON output by putting special characters in
// their ver message.
- obj.push_back(Pair("subver", stats.cleanSubVer));
- obj.push_back(Pair("inbound", stats.fInbound));
- obj.push_back(Pair("addnode", stats.m_manual_connection));
- obj.push_back(Pair("startingheight", stats.nStartingHeight));
+ obj.pushKV("subver", stats.cleanSubVer);
+ obj.pushKV("inbound", stats.fInbound);
+ obj.pushKV("addnode", stats.m_manual_connection);
+ obj.pushKV("startingheight", stats.nStartingHeight);
if (fStateStats) {
- obj.push_back(Pair("banscore", statestats.nMisbehavior));
- obj.push_back(Pair("synced_headers", statestats.nSyncHeight));
- obj.push_back(Pair("synced_blocks", statestats.nCommonHeight));
+ obj.pushKV("banscore", statestats.nMisbehavior);
+ obj.pushKV("synced_headers", statestats.nSyncHeight);
+ obj.pushKV("synced_blocks", statestats.nCommonHeight);
UniValue heights(UniValue::VARR);
for (int height : statestats.vHeightInFlight) {
heights.push_back(height);
}
- obj.push_back(Pair("inflight", heights));
+ obj.pushKV("inflight", heights);
}
- obj.push_back(Pair("whitelisted", stats.fWhitelisted));
+ obj.pushKV("whitelisted", stats.fWhitelisted);
UniValue sendPerMsgCmd(UniValue::VOBJ);
for (const mapMsgCmdSize::value_type &i : stats.mapSendBytesPerMsgCmd) {
if (i.second > 0)
- sendPerMsgCmd.push_back(Pair(i.first, i.second));
+ sendPerMsgCmd.pushKV(i.first, i.second);
}
- obj.push_back(Pair("bytessent_per_msg", sendPerMsgCmd));
+ obj.pushKV("bytessent_per_msg", sendPerMsgCmd);
UniValue recvPerMsgCmd(UniValue::VOBJ);
for (const mapMsgCmdSize::value_type &i : stats.mapRecvBytesPerMsgCmd) {
if (i.second > 0)
- recvPerMsgCmd.push_back(Pair(i.first, i.second));
+ recvPerMsgCmd.pushKV(i.first, i.second);
}
- obj.push_back(Pair("bytesrecv_per_msg", recvPerMsgCmd));
+ obj.pushKV("bytesrecv_per_msg", recvPerMsgCmd);
ret.push_back(obj);
}
@@ -331,16 +331,16 @@ UniValue getaddednodeinfo(const JSONRPCRequest& request)
for (const AddedNodeInfo& info : vInfo) {
UniValue obj(UniValue::VOBJ);
- obj.push_back(Pair("addednode", info.strAddedNode));
- obj.push_back(Pair("connected", info.fConnected));
+ obj.pushKV("addednode", info.strAddedNode);
+ obj.pushKV("connected", info.fConnected);
UniValue addresses(UniValue::VARR);
if (info.fConnected) {
UniValue address(UniValue::VOBJ);
- address.push_back(Pair("address", info.resolvedAddress.ToString()));
- address.push_back(Pair("connected", info.fInbound ? "inbound" : "outbound"));
+ address.pushKV("address", info.resolvedAddress.ToString());
+ address.pushKV("connected", info.fInbound ? "inbound" : "outbound");
addresses.push_back(address);
}
- obj.push_back(Pair("addresses", addresses));
+ obj.pushKV("addresses", addresses);
ret.push_back(obj);
}
@@ -377,18 +377,18 @@ UniValue getnettotals(const JSONRPCRequest& request)
throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
UniValue obj(UniValue::VOBJ);
- obj.push_back(Pair("totalbytesrecv", g_connman->GetTotalBytesRecv()));
- obj.push_back(Pair("totalbytessent", g_connman->GetTotalBytesSent()));
- obj.push_back(Pair("timemillis", GetTimeMillis()));
+ obj.pushKV("totalbytesrecv", g_connman->GetTotalBytesRecv());
+ obj.pushKV("totalbytessent", g_connman->GetTotalBytesSent());
+ obj.pushKV("timemillis", GetTimeMillis());
UniValue outboundLimit(UniValue::VOBJ);
- outboundLimit.push_back(Pair("timeframe", g_connman->GetMaxOutboundTimeframe()));
- outboundLimit.push_back(Pair("target", g_connman->GetMaxOutboundTarget()));
- outboundLimit.push_back(Pair("target_reached", g_connman->OutboundTargetReached(false)));
- outboundLimit.push_back(Pair("serve_historical_blocks", !g_connman->OutboundTargetReached(true)));
- outboundLimit.push_back(Pair("bytes_left_in_cycle", g_connman->GetOutboundTargetBytesLeft()));
- outboundLimit.push_back(Pair("time_left_in_cycle", g_connman->GetMaxOutboundTimeLeftInCycle()));
- obj.push_back(Pair("uploadtarget", outboundLimit));
+ outboundLimit.pushKV("timeframe", g_connman->GetMaxOutboundTimeframe());
+ outboundLimit.pushKV("target", g_connman->GetMaxOutboundTarget());
+ outboundLimit.pushKV("target_reached", g_connman->OutboundTargetReached(false));
+ outboundLimit.pushKV("serve_historical_blocks", !g_connman->OutboundTargetReached(true));
+ outboundLimit.pushKV("bytes_left_in_cycle", g_connman->GetOutboundTargetBytesLeft());
+ outboundLimit.pushKV("time_left_in_cycle", g_connman->GetMaxOutboundTimeLeftInCycle());
+ obj.pushKV("uploadtarget", outboundLimit);
return obj;
}
@@ -403,11 +403,11 @@ static UniValue GetNetworksInfo()
proxyType proxy;
UniValue obj(UniValue::VOBJ);
GetProxy(network, proxy);
- obj.push_back(Pair("name", GetNetworkName(network)));
- obj.push_back(Pair("limited", IsLimited(network)));
- obj.push_back(Pair("reachable", IsReachable(network)));
- obj.push_back(Pair("proxy", proxy.IsValid() ? proxy.proxy.ToStringIPPort() : std::string()));
- obj.push_back(Pair("proxy_randomize_credentials", proxy.randomize_credentials));
+ obj.pushKV("name", GetNetworkName(network));
+ obj.pushKV("limited", IsLimited(network));
+ obj.pushKV("reachable", IsReachable(network));
+ obj.pushKV("proxy", proxy.IsValid() ? proxy.proxy.ToStringIPPort() : std::string());
+ obj.pushKV("proxy_randomize_credentials", proxy.randomize_credentials);
networks.push_back(obj);
}
return networks;
@@ -458,34 +458,34 @@ UniValue getnetworkinfo(const JSONRPCRequest& request)
LOCK(cs_main);
UniValue obj(UniValue::VOBJ);
- obj.push_back(Pair("version", CLIENT_VERSION));
- obj.push_back(Pair("subversion", strSubVersion));
- obj.push_back(Pair("protocolversion",PROTOCOL_VERSION));
+ obj.pushKV("version", CLIENT_VERSION);
+ obj.pushKV("subversion", strSubVersion);
+ obj.pushKV("protocolversion",PROTOCOL_VERSION);
if(g_connman)
- obj.push_back(Pair("localservices", strprintf("%016x", g_connman->GetLocalServices())));
- obj.push_back(Pair("localrelay", fRelayTxes));
- obj.push_back(Pair("timeoffset", GetTimeOffset()));
+ obj.pushKV("localservices", strprintf("%016x", g_connman->GetLocalServices()));
+ obj.pushKV("localrelay", fRelayTxes);
+ obj.pushKV("timeoffset", GetTimeOffset());
if (g_connman) {
- obj.push_back(Pair("networkactive", g_connman->GetNetworkActive()));
- obj.push_back(Pair("connections", (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
+ obj.pushKV("networkactive", g_connman->GetNetworkActive());
+ obj.pushKV("connections", (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL));
}
- obj.push_back(Pair("networks", GetNetworksInfo()));
- obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK())));
- obj.push_back(Pair("incrementalfee", ValueFromAmount(::incrementalRelayFee.GetFeePerK())));
+ obj.pushKV("networks", GetNetworksInfo());
+ obj.pushKV("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()));
+ obj.pushKV("incrementalfee", ValueFromAmount(::incrementalRelayFee.GetFeePerK()));
UniValue localAddresses(UniValue::VARR);
{
LOCK(cs_mapLocalHost);
for (const std::pair<CNetAddr, LocalServiceInfo> &item : mapLocalHost)
{
UniValue rec(UniValue::VOBJ);
- rec.push_back(Pair("address", item.first.ToString()));
- rec.push_back(Pair("port", item.second.nPort));
- rec.push_back(Pair("score", item.second.nScore));
+ rec.pushKV("address", item.first.ToString());
+ rec.pushKV("port", item.second.nPort);
+ rec.pushKV("score", item.second.nScore);
localAddresses.push_back(rec);
}
}
- obj.push_back(Pair("localaddresses", localAddresses));
- obj.push_back(Pair("warnings", GetWarnings("statusbar")));
+ obj.pushKV("localaddresses", localAddresses);
+ obj.pushKV("warnings", GetWarnings("statusbar"));
return obj;
}
@@ -516,7 +516,7 @@ UniValue setban(const JSONRPCRequest& request)
CNetAddr netAddr;
bool isSubnet = false;
- if (request.params[0].get_str().find("/") != std::string::npos)
+ if (request.params[0].get_str().find('/') != std::string::npos)
isSubnet = true;
if (!isSubnet) {
@@ -575,10 +575,10 @@ UniValue listbanned(const JSONRPCRequest& request)
{
const CBanEntry& banEntry = entry.second;
UniValue rec(UniValue::VOBJ);
- rec.push_back(Pair("address", entry.first.ToString()));
- rec.push_back(Pair("banned_until", banEntry.nBanUntil));
- rec.push_back(Pair("ban_created", banEntry.nCreateTime));
- rec.push_back(Pair("ban_reason", banEntry.banReasonToString()));
+ rec.pushKV("address", entry.first.ToString());
+ rec.pushKV("banned_until", banEntry.nBanUntil);
+ rec.pushKV("ban_created", banEntry.nCreateTime);
+ rec.pushKV("ban_reason", banEntry.banReasonToString());
bannedAddresses.push_back(rec);
}
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-08 07:04:57 +0000