diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-27 10:39:18 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-27 10:40:54 +0100 |
commit | e1169d7eea12e727cfffa755398fc964e48cbd10 (patch) | |
tree | cfe37cdf2c324f412426ca57f9e9d2b343cf2d0e /src/rpcnet.cpp | |
parent | 2fc12794c267e9666179e2c96d9a7b56801a11cf (diff) | |
parent | a946aa8d3ec7009ac670eeb65a525efe5eeb6e84 (diff) | |
download | bitcoin-e1169d7eea12e727cfffa755398fc964e48cbd10.tar.xz |
Merge pull request #3296
a946aa8 Store and use a sanitized subVer (Mike Hearn)
ba6a4ea Add some additional logging to give extra network insight. (Mike Hearn)
Diffstat (limited to 'src/rpcnet.cpp')
-rw-r--r-- | src/rpcnet.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 9f8dea80b0..8f0df798b4 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -126,7 +126,10 @@ Value getpeerinfo(const Array& params, bool fHelp) if (stats.dPingWait > 0.0) obj.push_back(Pair("pingwait", stats.dPingWait)); obj.push_back(Pair("version", stats.nVersion)); - obj.push_back(Pair("subver", stats.strSubVer)); + // Use the sanitized form of subver here, to avoid tricksy remote peers from + // corrupting or modifiying 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("startingheight", stats.nStartingHeight)); obj.push_back(Pair("banscore", stats.nMisbehavior)); |