PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-14 12:57:52 +00:00
Code Issues Releases Activity

use Inflator instead Gunzip

Browse Source
This commit is contained in:
orignal 2014-12-10 12:07:25 -05:00
parent 5dbee6b300
commit b66aa7408e
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Reseed.cpp
View File

@ -2,7 +2,7 @@
#include <fstream> #include <fstream>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <cryptopp/gzip.h> #include <cryptopp/zinflate.h>
#include "I2PEndian.h" #include "I2PEndian.h"
#include "Reseed.h" #include "Reseed.h"
#include "Log.h" #include "Log.h"
@ -138,6 +138,7 @@ namespace data
LogPrint (eLogError, "Unexpected SU3 magic number"); LogPrint (eLogError, "Unexpected SU3 magic number");
return; return;
} }
s.seekg (1, std::ios::cur); // su3 file format version
SigningKeyType signatureType; SigningKeyType signatureType;
s.read ((char *)&signatureType, 2); // signature type s.read ((char *)&signatureType, 2); // signature type
signatureType = be16toh (signatureType); signatureType = be16toh (signatureType);
@ -158,7 +159,7 @@ namespace data
s.read ((char *)&fileType, 1); // file type s.read ((char *)&fileType, 1); // file type
if (fileType != 0x00) // zip file if (fileType != 0x00) // zip file
{ {
LogPrint (eLogError, "Can't handle file type ", fileType); LogPrint (eLogError, "Can't handle file type ", (int)fileType);
return; return;
} }
s.seekg (1, std::ios::cur); // unused s.seekg (1, std::ios::cur); // unused
@ -166,7 +167,7 @@ namespace data
s.read ((char *)&contentType, 1); // content type s.read ((char *)&contentType, 1); // content type
if (contentType != 0x03) // reseed data if (contentType != 0x03) // reseed data
{ {
LogPrint (eLogError, "Unexpected content type ", contentType); LogPrint (eLogError, "Unexpected content type ", (int)contentType);
return; return;
} }
s.seekg (12, std::ios::cur); // unused s.seekg (12, std::ios::cur); // unused
@ -174,11 +175,10 @@ namespace data
s.seekg (versionLength, std::ios::cur); // skip version s.seekg (versionLength, std::ios::cur); // skip version
s.seekg (signerIDLength, std::ios::cur); // skip signer ID s.seekg (signerIDLength, std::ios::cur); // skip signer ID
size_t contentRead = 0;
// handle content // handle content
while (contentRead < contentLength && !s.eof ()) size_t contentPos = s.tellg ();
{ while (!s.eof ())
size_t start = s.tellg (); {
uint32_t signature; uint32_t signature;
s.read ((char *)&signature, 4); s.read ((char *)&signature, 4);
if (signature == headerSignature) if (signature == headerSignature)
@ -199,12 +199,11 @@ namespace data
s.read (localFileName, fileNameLength); s.read (localFileName, fileNameLength);
localFileName[fileNameLength] = 0; localFileName[fileNameLength] = 0;
s.seekg (extraFieldLength, std::ios::cur); s.seekg (extraFieldLength, std::ios::cur);
LogPrint (eLogDebug, "Proccessing file ", localFileName, " ", compressedSize, " bytes");
uint8_t * compressed = new uint8_t[compressedSize]; uint8_t * compressed = new uint8_t[compressedSize];
s.read ((char *)compressed, compressedSize); s.read ((char *)compressed, compressedSize);
contentRead = s.tellg () - start; CryptoPP::Inflator decompressor;
CryptoPP::Gunzip decompressor;
decompressor.Put (compressed, compressedSize); decompressor.Put (compressed, compressedSize);
delete[] compressed; delete[] compressed;
if (decompressor.MaxRetrievable () <= uncompressedSize) if (decompressor.MaxRetrievable () <= uncompressedSize)
@ -219,6 +218,9 @@ namespace data
} }
else else
break; // no more files break; // no more files
size_t end = s.tellg ();
if (end - contentPos >= contentLength)
break; // we are beyond contentLength
} }
} }
else else

13
i2p.cpp
View File

@ -1,18 +1,9 @@
#include <thread> #include <thread>
#include <stdlib.h> #include <stdlib.h>
#include "Daemon.h" #include "Daemon.h"
#include "Reseed.h"
int main( int argc, char* argv[] ) int main( int argc, char* argv[] )
{ {
Daemon.init(argc, argv); i2p::data::ProcessSU3File ("/home/roman/tmp/i2pseeds.su3");
if (Daemon.start())
{
while (Daemon.running)
{
//TODO Meeh: Find something better to do here.
std::this_thread::sleep_for (std::chrono::seconds(1));
}
}
Daemon.stop();
return EXIT_SUCCESS;
} }