mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-21 14:34:49 +01:00
Code Issues Projects Releases Wiki Activity

util: make EncodeBase32 consume Spans

Browse source
This commit is contained in:
Sebastian Falbesoner 2020-08-07 19:55:51 +02:00
parent 8d6224fefe
commit 2bc207190e
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/netaddress.cpp
View file

@ -4,10 +4,11 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <netaddress.h> #include <netaddress.h>
#include <hash.h> #include <hash.h>
#include <tinyformat.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/asmap.h> #include <util/asmap.h>
#include <tinyformat.h>
#include <algorithm> #include <algorithm>
#include <array> #include <array>
@ -341,9 +342,9 @@ enum Network CNetAddr::GetNetwork() const
std::string CNetAddr::ToStringIP() const std::string CNetAddr::ToStringIP() const
{ {
if (IsTor()) if (IsTor())
return EncodeBase32(m_addr.data(), m_addr.size()) + ".onion"; return EncodeBase32(m_addr) + ".onion";
if (IsInternal()) if (IsInternal())
return EncodeBase32(m_addr.data(), m_addr.size()) + ".internal"; return EncodeBase32(m_addr) + ".internal";
CService serv(*this, 0); CService serv(*this, 0);
struct sockaddr_storage sockaddr; struct sockaddr_storage sockaddr;
socklen_t socklen = sizeof(sockaddr); socklen_t socklen = sizeof(sockaddr);

8
src/util/strencodings.cpp
View file

@ -201,20 +201,20 @@ std::string DecodeBase64(const std::string& str, bool* pf_invalid)
return std::string((const char*)vchRet.data(), vchRet.size()); return std::string((const char*)vchRet.data(), vchRet.size());
} }
std::string EncodeBase32(const unsigned char* pch, size_t len) std::string EncodeBase32(Span<const unsigned char> input)
{ {
static const char *pbase32 = "abcdefghijklmnopqrstuvwxyz234567"; static const char *pbase32 = "abcdefghijklmnopqrstuvwxyz234567";
std::string str; std::string str;
str.reserve(((len + 4) / 5) * 8); str.reserve(((input.size() + 4) / 5) * 8);
ConvertBits<8, 5, true>([&](int v) { str += pbase32[v]; }, pch, pch + len); ConvertBits<8, 5, true>([&](int v) { str += pbase32[v]; }, input.begin(), input.end());
while (str.size() % 8) str += '='; while (str.size() % 8) str += '=';
return str; return str;
} }
std::string EncodeBase32(const std::string& str) std::string EncodeBase32(const std::string& str)
{ {
return EncodeBase32((const unsigned char*)str.data(), str.size()); return EncodeBase32(MakeUCharSpan(str));
} }
std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid) std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid)

2
src/util/strencodings.h
View file

@ -52,7 +52,7 @@ std::string EncodeBase64(const unsigned char* pch, size_t len);
std::string EncodeBase64(const std::string& str); std::string EncodeBase64(const std::string& str);
std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid = nullptr); std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid = nullptr);
std::string DecodeBase32(const std::string& str, bool* pf_invalid = nullptr); std::string DecodeBase32(const std::string& str, bool* pf_invalid = nullptr);
std::string EncodeBase32(const unsigned char* pch, size_t len); std::string EncodeBase32(Span<const unsigned char> input);
std::string EncodeBase32(const std::string& str); std::string EncodeBase32(const std::string& str);
void SplitHostPort(std::string in, int& portOut, std::string& hostOut); void SplitHostPort(std::string in, int& portOut, std::string& hostOut);