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

handle compression method field

Browse source
This commit is contained in:
orignal 2014-12-11 20:44:08 -05:00
parent 3643d2f1da
commit 9ce56eb95f
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Reseed.cpp
View file

@ -217,7 +217,11 @@ namespace data
if (signature == headerSignature) if (signature == headerSignature)
{ {
// next local file // next local file
s.seekg (14, std::ios::cur); // skip field we don't care about s.seekg (4, std::ios::cur); // skip fields we don't care about
uint16_t compressionMethod;
s.read ((char *)&compressionMethod, 2);
compressionMethod = le16toh (compressionMethod);
s.seekg (8, std::ios::cur); // skip fields we don't care about
uint32_t compressedSize, uncompressedSize; uint32_t compressedSize, uncompressedSize;
s.read ((char *)&compressedSize, 4); s.read ((char *)&compressedSize, 4);
compressedSize = le32toh (compressedSize); compressedSize = le32toh (compressedSize);
@ -225,9 +229,9 @@ namespace data
uncompressedSize = le32toh (uncompressedSize); uncompressedSize = le32toh (uncompressedSize);
uint16_t fileNameLength, extraFieldLength; uint16_t fileNameLength, extraFieldLength;
s.read ((char *)&fileNameLength, 2); s.read ((char *)&fileNameLength, 2);
fileNameLength = le32toh (fileNameLength); fileNameLength = le16toh (fileNameLength);
s.read ((char *)&extraFieldLength, 2); s.read ((char *)&extraFieldLength, 2);
extraFieldLength = le32toh (extraFieldLength); extraFieldLength = le16toh (extraFieldLength);
char localFileName[255]; char localFileName[255];
s.read (localFileName, fileNameLength); s.read (localFileName, fileNameLength);
localFileName[fileNameLength] = 0; localFileName[fileNameLength] = 0;
@ -236,20 +240,28 @@ namespace data
uint8_t * compressed = new uint8_t[compressedSize]; uint8_t * compressed = new uint8_t[compressedSize];
s.read ((char *)compressed, compressedSize); s.read ((char *)compressed, compressedSize);
CryptoPP::Inflator decompressor; if (compressionMethod) // we assume Deflate
decompressor.Put (compressed, compressedSize);
delete[] compressed;
size_t len = decompressor.MaxRetrievable ();
if (len <= uncompressedSize)
{ {
uint8_t * uncompressed = new uint8_t[uncompressedSize]; CryptoPP::Inflator decompressor;
decompressor.Get (uncompressed, len); decompressor.Put (compressed, compressedSize);
i2p::data::netdb.AddRouterInfo (uncompressed, len); size_t len = decompressor.MaxRetrievable ();
numFiles++; if (len <= uncompressedSize)
delete[] uncompressed; {
uint8_t * uncompressed = new uint8_t[uncompressedSize];
decompressor.Get (uncompressed, len);
i2p::data::netdb.AddRouterInfo (uncompressed, len);
numFiles++;
delete[] uncompressed;
}
else
LogPrint (eLogError, "Actual uncompressed size ", decompressor.MaxRetrievable (), " exceed ", uncompressedSize, " from header");
} }
else else // no compression
LogPrint (eLogError, "Actual uncompressed size ", decompressor.MaxRetrievable (), " exceed ", uncompressedSize, " from header"); {
i2p::data::netdb.AddRouterInfo (compressed, compressedSize);
numFiles++;
}
delete[] compressed;
} }
else else
break; // no more files break; // no more files