Merge remote-tracking branch 'purple/openssl' into openssl

DaemonLinux.cpp

@@ -17,8 +17,8 @@ void handle_signal(int sig)
 	switch (sig)
 	{
 	case SIGHUP:
-		LogPrint(eLogInfo, "Daemon: Got SIGHUP, doing nothing");
-		// TODO:
+		LogPrint(eLogInfo, "Daemon: Got SIGHUP, reopening log...");
+		ReopenLogFile ();
 	break;
 	case SIGABRT:
 	case SIGTERM:

Garlic.h

@@ -119,7 +119,8 @@ namespace garlic
 			// for HTTP only
 			size_t GetNumOutgoingTags () const { return m_SessionTags.size (); };
 	};	
-	using GarlicRoutingSessionPtr = std::shared_ptr<GarlicRoutingSession>;
+	//using GarlicRoutingSessionPtr = std::shared_ptr<GarlicRoutingSession>;
+	typedef std::shared_ptr<GarlicRoutingSession> GarlicRoutingSessionPtr; // TODO: replace to using after switch to 4.8	
 
 	class GarlicDestination: public i2p::data::LocalDestination
 	{

Log.cpp

@@ -13,7 +13,8 @@ static const char * g_LogLevelStr[eNumLogLevels] =
 
 void LogMsg::Process()
 {
-	auto& output = (log && log->GetLogStream ()) ? *log->GetLogStream () : std::cerr;	
+	auto stream = log ? log->GetLogStream () : nullptr;
+	auto& output = stream ? *stream : std::cout;	
 	if (log)	
 		output << log->GetTimestamp ();
 	else
@@ -45,16 +46,25 @@ void Log::Flush ()
 
 void Log::SetLogFile (const std::string& fullFilePath)
 {
-	auto logFile = new std::ofstream (fullFilePath, std::ofstream::out | std::ofstream::binary | std::ofstream::trunc);
+	m_FullFilePath = fullFilePath;	
+	auto logFile = std::make_shared<std::ofstream> (fullFilePath, std::ofstream::out | std::ofstream::binary | std::ofstream::trunc);
 	if (logFile->is_open ())
 	{
 		SetLogStream (logFile);
 		LogPrint(eLogInfo, "Log: will send messages to ",  fullFilePath);
 	}	
-	else
-		delete logFile;
 }
 
+void Log::ReopenLogFile ()
+{
+	if (m_FullFilePath.length () > 0)
+	{
+		SetLogFile (m_FullFilePath);
+		LogPrint(eLogInfo, "Log: file ", m_FullFilePath,  " reopen");
+	}
+}
+
+
 void Log::SetLogLevel (const std::string& level)
 {
   if      (level == "error") { m_MinLevel = eLogError; }
@@ -65,11 +75,10 @@ void Log::SetLogLevel (const std::string& level)
 		LogPrint(eLogError, "Log: Unknown loglevel: ", level);
 		return;
   }
-  LogPrint(eLogInfo, "Log: min messages level set to ", level);
+  LogPrint(eLogInfo, "Log: min msg level set to ", level);
 }
 
-void Log::SetLogStream (std::ostream * logStream)
+void Log::SetLogStream (std::shared_ptr<std::ostream> logStream)
 {
-	if (m_LogStream) delete m_LogStream;	
 	m_LogStream = logStream;
 }

Log.h

@@ -7,6 +7,7 @@
 #include <fstream>
 #include <functional>
 #include <chrono>
+#include <memory>
 #include "Queue.h"
 
 enum LogLevel
@@ -34,13 +35,14 @@ class Log: public i2p::util::MsgQueue<LogMsg>
 {
 	public:
 
-		Log (): m_LogStream (nullptr) { SetOnEmpty (std::bind (&Log::Flush, this)); };
-		~Log () { delete m_LogStream; };
+		Log () { SetOnEmpty (std::bind (&Log::Flush, this)); };
+		~Log () {};
 
 		void SetLogFile (const std::string& fullFilePath);
+		void ReopenLogFile ();
 		void SetLogLevel (const std::string& level);
-		void SetLogStream (std::ostream * logStream);
-		std::ostream * GetLogStream () const { return m_LogStream; };	
+		void SetLogStream (std::shared_ptr<std::ostream> logStream);
+		std::shared_ptr<std::ostream> GetLogStream () const { return m_LogStream; };	
 		const std::string& GetTimestamp ();
 		LogLevel GetLogLevel () { return m_MinLevel; };
 
@@ -50,7 +52,8 @@ class Log: public i2p::util::MsgQueue<LogMsg>
 
 	private:
 		
-		std::ostream * m_LogStream;
+		std::string m_FullFilePath; // empty if stream
+		std::shared_ptr<std::ostream> m_LogStream;
 		enum LogLevel m_MinLevel;
 		std::string m_Timestamp;
 #if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) && !defined(__clang__) // gcc 4.6
@@ -73,7 +76,7 @@ inline void StartLog (const std::string& fullFilePath)
 	}	
 }
 
-inline void StartLog (std::ostream * s)
+inline void StartLog (std::shared_ptr<std::ostream> s)
 {
 	if (!g_Log)
 	{	
@@ -101,6 +104,12 @@ inline void SetLogLevel (const std::string& level)
 		g_Log->SetLogLevel(level);
 }
 
+inline void ReopenLogFile ()
+{
+	if (g_Log)	
+		g_Log->ReopenLogFile ();
+}
+
 template<typename TValue>
 void LogPrint (std::stringstream& s, TValue arg) 
 {

Reseed.cpp

@@ -208,6 +208,11 @@ namespace data
 				uint16_t fileNameLength, extraFieldLength; 
 				s.read ((char *)&fileNameLength, 2);	
 				fileNameLength = le16toh (fileNameLength);
+				if ( fileNameLength > 255 ) {
+					// too big
+					LogPrint(eLogError, "Reseed: SU3 fileNameLength too large: ", fileNameLength);
+					return numFiles;
+				}
 				s.read ((char *)&extraFieldLength, 2);
 				extraFieldLength = le16toh (extraFieldLength);
 				char localFileName[255];

api.cpp

@@ -31,7 +31,7 @@ namespace api
 		i2p::crypto::TerminateCrypto ();
 	}	
 	
-	void StartI2P (std::ostream * logStream)
+	void StartI2P (std::shared_ptr<std::ostream> logStream)
 	{
 		if (logStream)
 			StartLog (logStream);

api.h

@@ -14,7 +14,7 @@ namespace api
 	// initialization start and stop	
 	void InitI2P (int argc, char* argv[], const char * appName);
 	void TerminateI2P ();
-	void StartI2P (std::ostream * logStream = nullptr);
+	void StartI2P (std::shared_ptr<std::ostream> logStream = nullptr);
 	// write system log to logStream, if not specified to <appName>.log in application's folder
 	void StopI2P ();
 	void RunPeerTest (); // should be called after UPnP