Merge pull request #4914

ff36cbe RPC getnetworkinfo: export local node's client sub-version string (Jeff Garzik)
This commit is contained in:
Wladimir J. van der Laan 2014-09-25 10:17:28 +02:00
commit 58d4b23284
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -11,6 +11,7 @@
#include "sync.h"
#include "timedata.h"
#include "util.h"
#include "version.h"
#include <boost/foreach.hpp>
@ -393,6 +394,8 @@ Value getnetworkinfo(const Array& params, bool fHelp)
Object obj;
obj.push_back(Pair("version", (int)CLIENT_VERSION));
obj.push_back(Pair("subversion",
FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<string>())));
obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
obj.push_back(Pair("localservices", strprintf("%016x", nLocalServices)));
obj.push_back(Pair("timeoffset", GetTimeOffset()));