Merge pull request #908 from r4sas/openssl

add socks.outproxy.enabled and workout with Config.cpp tabulation

contrib/i2pd.conf

@@ -136,6 +136,8 @@ port = 4447
 # keys = socks-proxy-keys.dat
 
 ## Socks outproxy. Example below is set to use Tor for all connections except i2p
+## Uncomment and set to 'true' to enable using of SOCKS outproxy
+# outproxy.enabled = false
 ## Address and port of outproxy
 # outproxy = 127.0.0.1
 # outproxyport = 9050

libi2pd/Config.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2016, The PurpleI2P Project
+* Copyright (c) 2013-2017, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -27,8 +27,8 @@ namespace config {
 	options_description m_OptionsDesc;
 	variables_map m_Options;
 
-  void Init() {
+	void Init()
-
+	{
 		options_description general("General options");
 		general.add_options()
 			("help",                                                          "Show this message")
@@ -57,7 +57,7 @@ namespace config {
 			("share", value<int>()->default_value(100),                       "Limit of transit traffic from max bandwidth in percents. (default: 100")
 			("ntcp", value<bool>()->default_value(true),                      "Enable NTCP transport")
 			("ssu", value<bool>()->default_value(true),                       "Enable SSU transport")
-			("ntcpproxy", value<std::string>()->default_value(""), "proxy url for ntcp transport")
+			("ntcpproxy", value<std::string>()->default_value(""),            "Proxy URL for NTCP transport")
 #ifdef _WIN32
 			("svcctl", value<std::string>()->default_value(""),               "Windows service management ('install' or 'remove')")
 			("insomnia", value<bool>()->zero_tokens()->default_value(false),  "Prevent system from sleeping")
@@ -112,6 +112,7 @@ namespace config {
 			("socksproxy.outbound.quantity", value<std::string>()->default_value("5"), "SOCKS proxy outbound tunnels quantity")
 			("socksproxy.latency.min", value<std::string>()->default_value("0"),       "SOCKS proxy min latency for tunnels")
 			("socksproxy.latency.max", value<std::string>()->default_value("0"),       "SOCKS proxy max latency for tunnels")
+			("socksproxy.outproxy.enabled", value<bool>()->default_value(false),       "Enable or disable SOCKS outproxy")
 			("socksproxy.outproxy", value<std::string>()->default_value("127.0.0.1"),  "Upstream outproxy address for SOCKS Proxy")
 			("socksproxy.outproxyport", value<uint16_t>()->default_value(9050),        "Upstream outproxy port for SOCKS Proxy")
 		;
@@ -197,28 +198,30 @@ namespace config {
 			("addressbook.defaulturl", value<std::string>()->default_value(
 				"http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"
 			),                                                                     "AddressBook subscription URL for initial setup")
-      ("addressbook.subscriptions", value<std::string>()->default_value(""),
+			("addressbook.subscriptions", value<std::string>()->default_value(""), "AddressBook subscriptions URLs, separated by comma");
-                "AddressBook subscriptions URLs, separated by comma");
 
 		options_description trust("Trust options");
 		trust.add_options()
 			("trust.enabled", value<bool>()->default_value(false),     "Enable explicit trust options")
 			("trust.family", value<std::string>()->default_value(""),  "Router Familiy to trust for first hops")
 			("trust.routers", value<std::string>()->default_value(""), "Only Connect to these routers")
-      ("trust.hidden", value<bool>()->default_value(false), "Should we hide our router from other routers?");
+			("trust.hidden", value<bool>()->default_value(false),      "Should we hide our router from other routers?")
+		;
 
 		options_description websocket("Websocket Options");
 		websocket.add_options()
-      ("websockets.enabled", value<bool>()->default_value(false), "enable websocket server")
+			("websockets.enabled", value<bool>()->default_value(false),              "Enable websocket server")
-      ("websockets.address", value<std::string>()->default_value("127.0.0.1"), "address to bind websocket server on")
+			("websockets.address", value<std::string>()->default_value("127.0.0.1"), "Address to bind websocket server on")
-      ("websockets.port", value<uint16_t>()->default_value(7666), "port to bind websocket server on");
+			("websockets.port", value<uint16_t>()->default_value(7666),              "Port to bind websocket server on")
+		;
 
 		options_description exploratory("Exploratory Options");
 		exploratory.add_options()
 			("exploratory.inbound.length", value<int>()->default_value(2),    "Exploratory inbound tunnel length")
 			("exploratory.outbound.length", value<int>()->default_value(2),   "Exploratory outbound tunnel length")
 			("exploratory.inbound.quantity", value<int>()->default_value(3),  "Exploratory inbound tunnels quantity")
-	  ("exploratory.outbound.quantity",   value<int>()->default_value(3),  "Exploratory outbound tunnels quantity");
+			("exploratory.outbound.quantity", value<int>()->default_value(3), "Exploratory outbound tunnels quantity")
+		;
 
 		m_OptionsDesc
 			.add(general)
@@ -266,7 +269,8 @@ namespace config {
 		}
 	}
 
-  void ParseConfig(const std::string& path) {
+	void ParseConfig(const std::string& path)
+	{
 		if (path == "") return;
 
 		std::ifstream config(path, std::ios::in);
@@ -288,11 +292,13 @@ namespace config {
 		};
 	}
 
-  void Finalize() {
+	void Finalize()
+	{
 		notify(m_Options);
 	}
 
-  bool IsDefault(const char *name) {
+	bool IsDefault(const char *name)
+	{
 		if (!m_Options.count(name))
 			throw "try to check non-existent option";
 
@@ -301,7 +307,8 @@ namespace config {
 		return false;
 	}
 
-  bool GetOptionAsAny(const char *name, boost::any& value) {
+	bool GetOptionAsAny(const char *name, boost::any& value)
+	{
 		if (!m_Options.count(name))
 			return false;
 		value = m_Options[name];

libi2pd_client/ClientContext.cpp

@@ -81,6 +81,7 @@ namespace client
 			std::string socksProxyKeys; i2p::config::GetOption("socksproxy.keys",     socksProxyKeys);
 			std::string socksProxyAddr; i2p::config::GetOption("socksproxy.address",  socksProxyAddr);
 			uint16_t    socksProxyPort; i2p::config::GetOption("socksproxy.port",     socksProxyPort);
+			bool socksOutProxy; i2p::config::GetOption("socksproxy.outproxy.enabled", socksOutProxy);
 			std::string socksOutProxyAddr; i2p::config::GetOption("socksproxy.outproxy",     socksOutProxyAddr);
 			uint16_t    socksOutProxyPort; i2p::config::GetOption("socksproxy.outproxyport", socksOutProxyPort);
 			i2p::data::SigningKeyType sigType; i2p::config::GetOption("socksproxy.signaturetype",  sigType);
@@ -97,10 +98,13 @@ namespace client
 				else
 					LogPrint(eLogError, "Clients: failed to load SOCKS Proxy key");
 			}
-			try {
+			try
-			  m_SocksProxy = new i2p::proxy::SOCKSProxy(socksProxyAddr, socksProxyPort, socksOutProxyAddr, socksOutProxyPort, localDestination);
+			{
+				m_SocksProxy = new i2p::proxy::SOCKSProxy(socksProxyAddr, socksProxyPort, socksOutProxy, socksOutProxyAddr, socksOutProxyPort, localDestination);
 				m_SocksProxy->Start();
-			} catch (std::exception& e) {
+			}
+			catch (std::exception& e)
+			{
 				LogPrint(eLogError, "Clients: Exception in SOCKS Proxy: ", e.what());
 			}
 		}
@@ -513,7 +517,7 @@ namespace client
 						if (type == I2P_TUNNELS_SECTION_TYPE_SOCKS)
 						{
 							// socks proxy
-							clientTunnel = new i2p::proxy::SOCKSProxy(address, port, "", destinationPort, localDestination);
+							clientTunnel = new i2p::proxy::SOCKSProxy(address, port, false, "", destinationPort, localDestination);
 							clientEndpoint = ((i2p::proxy::SOCKSProxy*)clientTunnel)->GetAcceptor().local_endpoint();
 						}
 						else if (type == I2P_TUNNELS_SECTION_TYPE_HTTPPROXY)

libi2pd_client/SOCKS.cpp

@@ -768,12 +768,12 @@ namespace proxy
 			shared_from_this(), std::placeholders::_1, std::placeholders::_2));
 	}
 
-	SOCKSServer::SOCKSServer(const std::string& address, int port, const std::string& outAddress, uint16_t outPort,
+	SOCKSServer::SOCKSServer(const std::string& address, int port, bool outEnable, const std::string& outAddress, uint16_t outPort,
 			std::shared_ptr<i2p::client::ClientDestination> localDestination) : 
 		TCPIPAcceptor (address, port, localDestination ? localDestination : i2p::client::context.GetSharedLocalDestination ())
 	{
 		m_UseUpstreamProxy = false;
-		if (outAddress.length() > 0)
+		if (outAddress.length() > 0 && outEnable)
 			SetUpstreamProxy(outAddress, outPort);
 	}
 

libi2pd_client/SOCKS.h

@@ -14,8 +14,7 @@ namespace proxy
 	class SOCKSServer: public i2p::client::TCPIPAcceptor
 	{
 		public:
-
+			SOCKSServer(const std::string& address, int port, bool outEnable, const std::string& outAddress, uint16_t outPort,
-			SOCKSServer(const std::string& address, int port, const std::string& outAddress, uint16_t outPort,
 				std::shared_ptr<i2p::client::ClientDestination> localDestination = nullptr);
 			~SOCKSServer() {};
 
@@ -35,6 +34,4 @@ namespace proxy
 	typedef SOCKSServer SOCKSProxy;
 }
 }
-
-
 #endif