Permalink
Browse files

Merge pull request #6633

a6eb4ba Report minimum ping time in getpeerinfo (Matt Corallo)
  • Loading branch information...
laanwj committed Sep 4, 2015
2 parents 9aa9099 + a6eb4ba commit bbc2b39860f66b4c7b191f9f069eb6fd3a56f73b
Showing with 4 additions and 0 deletions.
  1. +1 −0 src/net.cpp
  2. +1 −0 src/net.h
  3. +2 −0 src/rpcnet.cpp
View
@@ -628,6 +628,7 @@ void CNode::copyStats(CNodeStats &stats)
// Raw ping time is in microseconds, but show it to user as whole seconds (Bitcoin users should be well used to small numbers with many decimal places by now :)
stats.dPingTime = (((double)nPingUsecTime) / 1e6);
stats.dPingMin = (((double)nMinPingUsecTime) / 1e6);
stats.dPingWait = (((double)nPingUsecWait) / 1e6);
// Leave string empty if addrLocal invalid (not filled in yet)
View
@@ -189,6 +189,7 @@ class CNodeStats
bool fWhitelisted;
double dPingTime;
double dPingWait;
double dPingMin;
std::string addrLocal;
};
View
@@ -96,6 +96,7 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
" \"conntime\": ttt, (numeric) The connection time in seconds since epoch (Jan 1 1970 GMT)\n"
" \"timeoffset\": ttt, (numeric) The time offset in seconds\n"
" \"pingtime\": n, (numeric) ping time\n"
" \"minping\": n, (numeric) minimum observed ping time\n"
" \"pingwait\": n, (numeric) ping wait\n"
" \"version\": v, (numeric) The peer version, such as 7001\n"
" \"subver\": \"/Satoshi:0.8.5/\", (string) The string version\n"
@@ -139,6 +140,7 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
obj.push_back(Pair("conntime", stats.nTimeConnected));
obj.push_back(Pair("timeoffset", stats.nTimeOffset));
obj.push_back(Pair("pingtime", stats.dPingTime));
obj.push_back(Pair("minping", stats.dPingMin));
if (stats.dPingWait > 0.0)
obj.push_back(Pair("pingwait", stats.dPingWait));
obj.push_back(Pair("version", stats.nVersion));

0 comments on commit bbc2b39

Please sign in to comment.