From 60dc8e4208058814494b301c355a5996af9517a9 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 30 Jul 2014 15:27:03 +0200 Subject: Allow -onlynet=onion to be used Just an alias for onlynet=tor, but matches the new name of the proxy option -onion= better. --- src/netbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/netbase.cpp') diff --git a/src/netbase.cpp b/src/netbase.cpp index af6d11f0e2..f9f4755f7b 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -47,7 +47,7 @@ enum Network ParseNetwork(std::string net) { boost::to_lower(net); if (net == "ipv4") return NET_IPV4; if (net == "ipv6") return NET_IPV6; - if (net == "tor") return NET_TOR; + if (net == "tor" || net == "onion") return NET_TOR; return NET_UNROUTABLE; } -- cgit v1.2.3 From 075cf49e593025030c8b3572e606960f15de424e Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 30 Jul 2014 15:32:36 +0200 Subject: Add GetNetworkName function Returns the network name for an Network enum. --- src/netbase.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/netbase.cpp') diff --git a/src/netbase.cpp b/src/netbase.cpp index f9f4755f7b..4e109a8bc9 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -51,6 +51,16 @@ enum Network ParseNetwork(std::string net) { return NET_UNROUTABLE; } +std::string GetNetworkName(enum Network net) { + switch(net) + { + case NET_IPV4: return "ipv4"; + case NET_IPV6: return "ipv6"; + case NET_TOR: return "onion"; + default: return ""; + } +} + void SplitHostPort(std::string in, int &portOut, std::string &hostOut) { size_t colon = in.find_last_of(':'); // if a : is found, and it either follows a [...], or no other : is in the string, treat it as port separator -- cgit v1.2.3