Merge remote-tracking branch 'devnull/linux_tunnel_reload_on_hup'

ClientContext.cpp

@@ -202,7 +202,13 @@ namespace client
 
 	void ClientContext::ReloadConfig ()
 	{
-		ReadTunnels (); // TODO: it reads new tunnels only, should be implemented better
+		/*
+		 std::string config; i2p::config::GetOption("conf", config);
+		 i2p::config::ParseConfig(config);
+		*/
+		//I don't think we can just reload the main config without making a mess of things, so holding off for now.
+		Stop();
+		Start();
 	}
 	
 	void ClientContext::LoadPrivateKeys (i2p::data::PrivateKeys& keys, const std::string& filename, i2p::data::SigningKeyType sigType)

DaemonLinux.cpp

@@ -13,14 +13,16 @@
 #include "FS.h"
 #include "Log.h"
 #include "RouterContext.h"
+#include "ClientContext.h"
 
 void handle_signal(int sig)
 {
 	switch (sig)
 	{
 		case SIGHUP:
-			LogPrint(eLogInfo, "Daemon: Got SIGHUP, reopening log...");
+			LogPrint(eLogInfo, "Daemon: Got SIGHUP, reopening logs and tunnel configuration...");
 			i2p::log::Logger().Reopen ();
+			i2p::client::context.ReloadConfig();
 		break;
 		case SIGINT:
 			if (i2p::context.AcceptsTunnels () && !Daemon.gracefullShutdownInterval)