Browse Source

[refactor] move SplitHostPort() into utilstrencodings

This moves SplitHostPort from libbitcoin_common to libbitcoin_util so it
is available to bitcoin-cli.
0.15
John Newbery 7 years ago
parent
commit
fe4fabaf12
  1. 1
      src/httpserver.cpp
  2. 19
      src/netbase.cpp
  3. 1
      src/netbase.h
  4. 1
      src/test/netbase_tests.cpp
  5. 19
      src/utilstrencodings.cpp
  6. 1
      src/utilstrencodings.h

1
src/httpserver.cpp

@ -7,6 +7,7 @@
#include "chainparamsbase.h" #include "chainparamsbase.h"
#include "compat.h" #include "compat.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h"
#include "netbase.h" #include "netbase.h"
#include "rpc/protocol.h" // For HTTP status codes #include "rpc/protocol.h" // For HTTP status codes
#include "sync.h" #include "sync.h"

19
src/netbase.cpp

@ -58,25 +58,6 @@ std::string GetNetworkName(enum Network net) {
} }
} }
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
bool fHaveColon = colon != in.npos;
bool fBracketed = fHaveColon && (in[0]=='[' && in[colon-1]==']'); // if there is a colon, and in[0]=='[', colon is not 0, so in[colon-1] is safe
bool fMultiColon = fHaveColon && (in.find_last_of(':',colon-1) != in.npos);
if (fHaveColon && (colon==0 || fBracketed || !fMultiColon)) {
int32_t n;
if (ParseInt32(in.substr(colon + 1), &n) && n > 0 && n < 0x10000) {
in = in.substr(0, colon);
portOut = n;
}
}
if (in.size()>0 && in[0] == '[' && in[in.size()-1] == ']')
hostOut = in.substr(1, in.size()-2);
else
hostOut = in;
}
bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup) bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup)
{ {
vIP.clear(); vIP.clear();

1
src/netbase.h

@ -39,7 +39,6 @@ public:
enum Network ParseNetwork(std::string net); enum Network ParseNetwork(std::string net);
std::string GetNetworkName(enum Network net); std::string GetNetworkName(enum Network net);
void SplitHostPort(std::string in, int &portOut, std::string &hostOut);
bool SetProxy(enum Network net, const proxyType &addrProxy); bool SetProxy(enum Network net, const proxyType &addrProxy);
bool GetProxy(enum Network net, proxyType &proxyInfoOut); bool GetProxy(enum Network net, proxyType &proxyInfoOut);
bool IsProxy(const CNetAddr &addr); bool IsProxy(const CNetAddr &addr);

1
src/test/netbase_tests.cpp

@ -4,6 +4,7 @@
#include "netbase.h" #include "netbase.h"
#include "test/test_bitcoin.h" #include "test/test_bitcoin.h"
#include "utilstrencodings.h"
#include <string> #include <string>

19
src/utilstrencodings.cpp

@ -91,6 +91,25 @@ std::vector<unsigned char> ParseHex(const std::string& str)
return ParseHex(str.c_str()); return ParseHex(str.c_str());
} }
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
bool fHaveColon = colon != in.npos;
bool fBracketed = fHaveColon && (in[0]=='[' && in[colon-1]==']'); // if there is a colon, and in[0]=='[', colon is not 0, so in[colon-1] is safe
bool fMultiColon = fHaveColon && (in.find_last_of(':',colon-1) != in.npos);
if (fHaveColon && (colon==0 || fBracketed || !fMultiColon)) {
int32_t n;
if (ParseInt32(in.substr(colon + 1), &n) && n > 0 && n < 0x10000) {
in = in.substr(0, colon);
portOut = n;
}
}
if (in.size()>0 && in[0] == '[' && in[in.size()-1] == ']')
hostOut = in.substr(1, in.size()-2);
else
hostOut = in;
}
std::string EncodeBase64(const unsigned char* pch, size_t len) std::string EncodeBase64(const unsigned char* pch, size_t len)
{ {
static const char *pbase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static const char *pbase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

1
src/utilstrencodings.h

@ -48,6 +48,7 @@ std::string DecodeBase32(const std::string& str);
std::string EncodeBase32(const unsigned char* pch, size_t len); std::string EncodeBase32(const unsigned char* pch, size_t len);
std::string EncodeBase32(const std::string& str); std::string EncodeBase32(const std::string& str);
void SplitHostPort(std::string in, int &portOut, std::string &hostOut);
std::string i64tostr(int64_t n); std::string i64tostr(int64_t n);
std::string itostr(int n); std::string itostr(int n);
int64_t atoi64(const char* psz); int64_t atoi64(const char* psz);

Loading…
Cancel
Save