Add detailed network info to getnetworkinfo RPC #4605

laanwj · 2014-07-30T13:39:16Z

This pull adds per-network information to the getnetworkinfo RPC call:

Is the network limited?
Is the network reachable
Which proxy is used for this network, if any

Inspired by #2575.

(After these changes it is also allowed to use -onlynet=onion instead of -onlynet=tor, as I like it better to call the network onion)

Just an alias for onlynet=tor, but matches the new name of the proxy option -onion= better.

Allows other parts of the program to query for reachable status of a network. Similar to IsLimited(net).

Returns the network name for an Network enum.

jgarzik · 2014-07-31T03:08:00Z

Only item I see is "proxy" changing in JSON output -- do we care about backwards compat here?

ACK otherwise

laanwj · 2014-07-31T06:43:35Z

getnetworkinfo is brand new, so not too many people will rely on the current interface yet and still use getinfo if they want 'the' proxy. I'm fine with adding it back for backwards compatibility, but IMO it gives the wrong idea that there is only one proxy.

Diapolo · 2014-08-04T08:49:54Z

src/rpcnet.cpp

Nit: Misses a , after [ and it's an (array) not (object).

No, there should be no , after [.
Good catch on the array versus object though.

Diapolo · 2014-08-04T08:53:54Z

Looks good, after fixing the nits this an untested ACK ;).

BitcoinPullTester · 2014-08-04T10:18:55Z

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4605_0590a54818ceb6c907c7ff6ff2f1a28d5ef383b2/ for binaries and test log.
This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/
Contact BlueMatt on freenode if something looks broken.

Diapolo · 2014-08-04T11:39:26Z

src/rpcnet.cpp

Another small nit: In the help message we have IPv4, IPv6 or Onion.

I prefer to use lowercase here. People will be using case-sensitive comparisons on this output, and thus using only lowercase rules out one source of typos.

I know that the -help documentation shows the network names uppercased, which is IMO a bit strange, but we do case-insensitive comparison so for us it doesn't matter.

I wasn't talking about uppercase, just , vs. or ;).

This commit adds per-network information to the getnetworkinfo RPC call: - Is the network limited? - Is the network reachable - Which proxy is used for this network, if any Inspired by bitcoin#2575.

aa82795 Add detailed network info to getnetworkinfo RPC (Wladimir J. van der Laan) 075cf49 Add GetNetworkName function (Wladimir J. van der Laan) c91a947 Add IsReachable(net) function (Wladimir J. van der Laan) 60dc8e4 Allow -onlynet=onion to be used (Wladimir J. van der Laan)

Just an alias for onlynet=tor, but matches the new name of the proxy option -onion= better. Conflicts: src/init.cpp Rebased-from: 60dc8e4208058814494b301c355a5996af9517a9 bitcoin/bitcoin#4605

Allows other parts of the program to query for reachable status of a network. Similar to IsLimited(net). Rebased-from: c91a9471be7a96311a7e1452a3624aa557bc185d bitcoin/bitcoin#4605

Returns the network name for an Network enum. Rebased-from: 075cf49e593025030c8b3572e606960f15de424e bitcoin/bitcoin#4605

This commit adds per-network information to the getnetworkinfo RPC call: - Is the network limited? - Is the network reachable - Which proxy is used for this network, if any Inspired by #2575. Conflicts: src/init.cpp src/rpcnet.cpp Rebased-from: aa8279513b5d206c172d3da3d5e3034c61d47b39 bitcoin/bitcoin#4605