Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-30 04:37:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Move base64 to util/

Browse source
This commit is contained in:
EinMByte 2015-07-28 19:27:27 +02:00
parent 3668c27db6
commit 89d3d17b28
19 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
NetDb.cpp
View file

@ -4,7 +4,7 @@
#include <vector>
#include <boost/asio.hpp>
#include <cryptopp/gzip.h>
#include "base64.h"
#include "util/base64.h"
#include "Log.h"
#include "util/Timestamp.h"
#include "I2NPProtocol.h"
@ -263,7 +263,7 @@ namespace data
}
// list of chars might appear in base64 string
const char * chars = GetBase64SubstitutionTable (); // 64 bytes
const char * chars = i2p::util::GetBase64SubstitutionTable (); // 64 bytes
boost::filesystem::path suffix;
for (int i = 0; i < 64; i++)
{
@ -544,7 +544,7 @@ namespace data
{
const uint8_t * buf = msg->GetPayload ();
char key[48];
int l = i2p::data::ByteStreamToBase64 (buf, 32, key, 48);
int l = i2p::util::ByteStreamToBase64 (buf, 32, key, 48);
key[l] = 0;
int num = buf[32]; // num
LogPrint ("DatabaseSearchReply for ", key, " num=", num);
@ -613,7 +613,7 @@ namespace data
{
const uint8_t * router = buf + 33 + i*32;
char peerHash[48];
int l1 = i2p::data::ByteStreamToBase64 (router, 32, peerHash, 48);
int l1 = i2p::util::ByteStreamToBase64 (router, 32, peerHash, 48);
peerHash[l1] = 0;
LogPrint (i,": ", peerHash);
@ -639,7 +639,7 @@ namespace data
return;
}
char key[48];
int l = i2p::data::ByteStreamToBase64 (buf, 32, key, 48);
int l = i2p::util::ByteStreamToBase64 (buf, 32, key, 48);
key[l] = 0;
uint8_t flag = buf[64];
LogPrint ("DatabaseLookup for ", key, " recieved flags=", (int)flag);