specify keys file for proxy's local destination

ClientContext.cpp

@@ -37,11 +37,15 @@ namespace client
 			m_SharedLocalDestination->Start ();
 		}
 
+		std::shared_ptr<ClientDestination> localDestination;	
 		// proxies	
-		m_HttpProxy = new i2p::proxy::HTTPProxy(i2p::util::config::GetArg("-httpproxyport", 4446));
+		std::string proxyKeys = i2p::util::config::GetArg("-proxykeys", "");
+		if (proxyKeys.length () > 0)
+			localDestination = LoadLocalDestination (proxyKeys, false);
+		m_HttpProxy = new i2p::proxy::HTTPProxy(i2p::util::config::GetArg("-httpproxyport", 4446), localDestination);
 		m_HttpProxy->Start();
 		LogPrint("HTTP Proxy started");
-		m_SocksProxy = new i2p::proxy::SOCKSProxy(i2p::util::config::GetArg("-socksproxyport", 4447));
+		m_SocksProxy = new i2p::proxy::SOCKSProxy(i2p::util::config::GetArg("-socksproxyport", 4447), localDestination);
 		m_SocksProxy->Start();
 		LogPrint("SOCKS Proxy Started");
 	
@@ -49,7 +53,7 @@ namespace client
 		std::string ircDestination = i2p::util::config::GetArg("-ircdest", "");
 		if (ircDestination.length () > 0) // ircdest is presented
 		{
-			std::shared_ptr<ClientDestination> localDestination = nullptr;
+			localDestination = nullptr;
 			std::string ircKeys = i2p::util::config::GetArg("-irckeys", "");	
 			if (ircKeys.length () > 0)
 				localDestination = LoadLocalDestination (ircKeys, false);
@@ -62,7 +66,7 @@ namespace client
 		std::string eepKeys = i2p::util::config::GetArg("-eepkeys", "");
 		if (eepKeys.length () > 0) // eepkeys file is presented
 		{
-			auto localDestination = LoadLocalDestination (eepKeys, true);
+			localDestination = LoadLocalDestination (eepKeys, true);
 			auto serverTunnel = new I2PServerTunnel (i2p::util::config::GetArg("-eephost", "127.0.0.1"),
  				i2p::util::config::GetArg("-eepport", 80), localDestination);
 			serverTunnel->Start ();

HTTPProxy.cpp

@@ -18,9 +18,11 @@ namespace i2p
 namespace proxy
 {
 	static const size_t http_buffer_size = 8192;
-	class HTTPProxyHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<HTTPProxyHandler> {
+	class HTTPProxyHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<HTTPProxyHandler> 
+	{
 		private:
-			enum state {
+			enum state 
+			{
 				GET_METHOD,
 				GET_HOSTNAME,
 				GET_HTTPV,
@@ -53,6 +55,7 @@ namespace proxy
 			state m_state;//Parsing state
 
 		public:
+
 			HTTPProxyHandler(HTTPProxyServer * parent, boost::asio::ip::tcp::socket * sock) : 
 				I2PServiceHandler(parent), m_sock(sock)
 				{ EnterState(GET_METHOD); }
@@ -92,7 +95,8 @@ namespace proxy
 					 std::bind(&HTTPProxyHandler::SentHTTPFailed, shared_from_this(), std::placeholders::_1));
 	}
 
-	void HTTPProxyHandler::EnterState(HTTPProxyHandler::state nstate) {
+	void HTTPProxyHandler::EnterState(HTTPProxyHandler::state nstate) 
+	{
 		m_state = nstate;
 	}
 
@@ -104,11 +108,10 @@ namespace proxy
 		boost::regex rHTTP("http://(.*?)(:(\\d+))?(/.*)");
 		boost::smatch m;
 		std::string path;
-		if(boost::regex_search(m_url, m, rHTTP, boost::match_extra)) {
+		if(boost::regex_search(m_url, m, rHTTP, boost::match_extra)) 
+		{
 			server=m[1].str();
-			if(m[2].str() != "") {
-				port=m[3].str();
-			}
+			if (m[2].str() != "")  port=m[3].str();
 			path=m[4].str();
 		}
 		LogPrint(eLogDebug,"--- HTTP Proxy server is: ",server, " port is: ", port, "\n path is: ",path);
@@ -117,8 +120,10 @@ namespace proxy
 		m_path = path;
 	}
 
-	bool HTTPProxyHandler::ValidateHTTPRequest() {
-		if ( m_version != "HTTP/1.0" && m_version != "HTTP/1.1" ) {
+	bool HTTPProxyHandler::ValidateHTTPRequest() 
+	{
+		if ( m_version != "HTTP/1.0" && m_version != "HTTP/1.1" ) 
+		{
 			LogPrint(eLogError,"--- HTTP Proxy unsupported version: ", m_version);
 			HTTPRequestFailed(); //TODO: send right stuff
 			return false;
@@ -126,7 +131,8 @@ namespace proxy
 		return true;
 	}
 
-	void HTTPProxyHandler::HandleJumpServices() {
+	void HTTPProxyHandler::HandleJumpServices() 
+	{
 		static const char * helpermark1 = "?i2paddresshelper=";
 		static const char * helpermark2 = "&i2paddresshelper=";
 		size_t addressHelperPos1 = m_path.rfind (helpermark1);
@@ -157,7 +163,8 @@ namespace proxy
 		m_path.erase(addressHelperPos);
 	}
 
-	bool HTTPProxyHandler::CreateHTTPRequest(uint8_t *http_buff, std::size_t len) {
+	bool HTTPProxyHandler::CreateHTTPRequest(uint8_t *http_buff, std::size_t len) 
+	{
 		ExtractRequest(); //TODO: parse earlier
 		if (!ValidateHTTPRequest()) return false;
 		HandleJumpServices();
@@ -176,36 +183,42 @@ namespace proxy
 	bool HTTPProxyHandler::HandleData(uint8_t *http_buff, std::size_t len)
 	{
 		assert(len); // This should always be called with a least a byte left to parse
-		while (len > 0) {
+		while (len > 0) 
+		{
 			//TODO: fallback to finding HOst: header if needed
-			switch (m_state) {
+			switch (m_state) 
+			{
 				case GET_METHOD:
-					switch (*http_buff) {
+					switch (*http_buff) 
+					{
 						case ' ': EnterState(GET_HOSTNAME); break;
 						default: m_method.push_back(*http_buff); break;
 					}
-					break;
+				break;
 				case GET_HOSTNAME:
-					switch (*http_buff) {
+					switch (*http_buff) 
+					{
 						case ' ': EnterState(GET_HTTPV); break;
 						default: m_url.push_back(*http_buff); break;
 					}
-					break;
+				break;
 				case GET_HTTPV:
-					switch (*http_buff) {
+					switch (*http_buff) 
+					{
 						case '\r': EnterState(GET_HTTPVNL); break;
 						default: m_version.push_back(*http_buff); break;
 					}
-					break;
+				break;
 				case GET_HTTPVNL:
-					switch (*http_buff) {
+					switch (*http_buff) 
+					{
 						case '\n': EnterState(DONE); break;
 						default:
 							LogPrint(eLogError,"--- HTTP Proxy rejected invalid request ending with: ", ((int)*http_buff));
 							HTTPRequestFailed(); //TODO: add correct code
 							return false;
 					}
-					break;
+				break;
 				default:
 					LogPrint(eLogError,"--- HTTP Proxy invalid state: ", m_state);
 					HTTPRequestFailed(); //TODO: add correct code 500
@@ -222,29 +235,33 @@ namespace proxy
 	void HTTPProxyHandler::HandleSockRecv(const boost::system::error_code & ecode, std::size_t len)
 	{
 		LogPrint(eLogDebug,"--- HTTP Proxy sock recv: ", len);
-		if(ecode) {
+		if(ecode) 
+		{
 			LogPrint(eLogWarning," --- HTTP Proxy sock recv got error: ", ecode);
                         Terminate();
 			return;
 		}
 
-		if (HandleData(m_http_buff, len)) {
-			if (m_state == DONE) {
+		if (HandleData(m_http_buff, len)) 
+		{
+			if (m_state == DONE) 
+			{
 				LogPrint(eLogInfo,"--- HTTP Proxy requested: ", m_url);
 				GetOwner()->CreateStream (std::bind (&HTTPProxyHandler::HandleStreamRequestComplete,
 						shared_from_this(), std::placeholders::_1), m_address, m_port);
-			} else {
-				AsyncSockRead();
 			} 
+			else 
+				AsyncSockRead();
 		}
 
 	}
 
 	void HTTPProxyHandler::SentHTTPFailed(const boost::system::error_code & ecode)
 	{
-		if (!ecode) {
+		if (!ecode)
 			Terminate();
-		} else {
+		else 
+		{
 			LogPrint (eLogError,"--- HTTP Proxy Closing socket after sending failure because: ", ecode.message ());
 			Terminate();
 		}
@@ -252,21 +269,24 @@ namespace proxy
 
 	void HTTPProxyHandler::HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream)
 	{
-		if (stream) {
+		if (stream) 
+		{
 			if (Kill()) return;
 			LogPrint (eLogInfo,"--- HTTP Proxy New I2PTunnel connection");
 			auto connection = std::make_shared<i2p::client::I2PTunnelConnection>(GetOwner(), m_sock, stream);
 			GetOwner()->AddHandler (connection);
 			connection->I2PConnect (reinterpret_cast<const uint8_t*>(m_request.data()), m_request.size());
 			Done(shared_from_this());
-		} else {
+		} 
+		else 
+		{
 			LogPrint (eLogError,"--- HTTP Proxy Issue when creating the stream, check the previous warnings for more info.");
 			HTTPRequestFailed(); // TODO: Send correct error message host unreachable
 		}
 	}
 
-	HTTPProxyServer::HTTPProxyServer(int port): 
-		TCPIPAcceptor(port, i2p::client::context.GetSharedLocalDestination ()) 
+	HTTPProxyServer::HTTPProxyServer(int port, std::shared_ptr<i2p::client::ClientDestination> localDestination): 
+		TCPIPAcceptor(port, localDestination ? localDestination : i2p::client::context.GetSharedLocalDestination ()) 
 	{
 	}
 	

HTTPProxy.h

@@ -6,6 +6,7 @@
 #include <boost/asio.hpp>
 #include <mutex>
 #include "I2PService.h"
+#include "Destination.h"
 
 namespace i2p
 {
@@ -13,14 +14,15 @@ namespace proxy
 {
 	class HTTPProxyServer: public i2p::client::TCPIPAcceptor
 	{
+		public:
+
+			HTTPProxyServer(int port, std::shared_ptr<i2p::client::ClientDestination> localDestination = nullptr);
+			~HTTPProxyServer() {};
+
 		protected:
 			// Implements TCPIPAcceptor
 			std::shared_ptr<i2p::client::I2PServiceHandler> CreateHandler(boost::asio::ip::tcp::socket * socket);
 			const char* GetName() { return "HTTP Proxy"; }
-
-		public:
-			HTTPProxyServer(int port);
-			~HTTPProxyServer() {}
 	};
 
 	typedef HTTPProxyServer HTTPProxy;

README.md

@@ -76,9 +76,10 @@ Cmdline options
 * --floodfill=          - 1 if router is floodfill, off by default
 * --httpproxyport=      - The port to listen on (HTTP Proxy)
 * --socksproxyport=     - The port to listen on (SOCKS Proxy)
+* --proxykeys=          - optional keys file for proxy's local destination
 * --ircport=            - The local port of IRC tunnel to listen on. 6668 by default
 * --ircdest=            - I2P destination address of IRC server. For example irc.postman.i2p
-* --irckeys=            - optional keys file for local destination
+* --irckeys=            - optional keys file for tunnel's local destination 
 * --eepkeys=            - File name containing destination keys, for example privKeys.dat.
                           The file will be created if it does not already exist (issue #110).
 * --eephost=            - Address incoming trafic forward to. 127.0.0.1 by default

SOCKS.cpp

@@ -17,10 +17,12 @@ namespace proxy
 	static const size_t socks_buffer_size = 8192;
 	static const size_t max_socks_hostname_size = 255; // Limit for socks5 and bad idea to traverse
 
-	struct SOCKSDnsAddress {
+	struct SOCKSDnsAddress 
+	{
 		uint8_t size;
 		char value[max_socks_hostname_size];
-		void FromString (std::string str) {
+		void FromString (std::string str) 
+		{
 			size = str.length();
 			if (str.length() > max_socks_hostname_size) size = max_socks_hostname_size;
 			memcpy(value,str.c_str(),size);
@@ -30,9 +32,11 @@ namespace proxy
 	};
 
 	class SOCKSServer;
-	class SOCKSHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<SOCKSHandler> {
+	class SOCKSHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<SOCKSHandler> 
+	{
 		private:
-			enum state {
+			enum state 
+			{
 				GET_SOCKSV,
 				GET_COMMAND,
 				GET_PORT,
@@ -49,18 +53,21 @@ namespace proxy
 				GET5_HOST,
 				DONE
 			};
-			enum authMethods {
+			enum authMethods 
+			{
 				AUTH_NONE = 0, //No authentication, skip to next step
 				AUTH_GSSAPI = 1, //GSSAPI authentication
 				AUTH_USERPASSWD = 2, //Username and password
 				AUTH_UNACCEPTABLE = 0xff //No acceptable method found
 			};
-			enum addrTypes {
+			enum addrTypes 
+			{
 				ADDR_IPV4 = 1, //IPv4 address (4 octets)
 				ADDR_DNS = 3, // DNS name (up to 255 octets)
 				ADDR_IPV6 = 4 //IPV6 address (16 octets)
 			};
-			enum errTypes {
+			enum errTypes 
+			{
 				SOCKS5_OK = 0, // No error for SOCKS5
 				SOCKS5_GEN_FAIL = 1, // General server failure
 				SOCKS5_RULE_DENIED = 2, // Connection disallowed by ruleset
@@ -75,16 +82,19 @@ namespace proxy
 				SOCKS4_IDENTD_MISSING = 92, // Couldn't connect to the identd server
 				SOCKS4_IDENTD_DIFFER = 93 // The ID reported by the application and by identd differ
 			};
-			enum cmdTypes {
+			enum cmdTypes 
+			{
 				CMD_CONNECT = 1, // TCP Connect
 				CMD_BIND = 2, // TCP Bind
 				CMD_UDP = 3 // UDP associate
 			};
-			enum socksVersions {
+			enum socksVersions 
+			{
 				SOCKS4 = 4, // SOCKS4
 				SOCKS5 = 5 // SOCKS5
 			};
-			union address {
+			union address 
+			{
 				uint32_t ip;
 				SOCKSDnsAddress dns;
 				uint8_t ipv6[16];
@@ -136,24 +146,26 @@ namespace proxy
 	void SOCKSHandler::AsyncSockRead()
 	{
 		LogPrint(eLogDebug,"--- SOCKS async sock read");
-		if(m_sock) {
+		if(m_sock)
 			m_sock->async_receive(boost::asio::buffer(m_sock_buff, socks_buffer_size),
 						std::bind(&SOCKSHandler::HandleSockRecv, shared_from_this(),
 								std::placeholders::_1, std::placeholders::_2));
-		} else {
+		else 
 			LogPrint(eLogError,"--- SOCKS no socket for read");
-		}
 	}
 
-	void SOCKSHandler::Terminate() {
+	void SOCKSHandler::Terminate() 
+	{
 		if (Kill()) return;
-		if (m_sock) {
+		if (m_sock) 
+		{
 			LogPrint(eLogDebug,"--- SOCKS close sock");
 			m_sock->close();
 			delete m_sock;
 			m_sock = nullptr;
 		}
-		if (m_stream) {
+		if (m_stream) 
+		{
 			LogPrint(eLogDebug,"--- SOCKS close stream");
 			m_stream.reset ();
 		}
@@ -170,8 +182,7 @@ namespace proxy
 		return boost::asio::const_buffers_1(m_response,8);
 	}
 
-	boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS5Response(SOCKSHandler::errTypes error, SOCKSHandler::addrTypes type,
-								   const SOCKSHandler::address &addr, uint16_t port)
+	boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS5Response(SOCKSHandler::errTypes error, SOCKSHandler::addrTypes type, const SOCKSHandler::address &addr, uint16_t port)
 	{
 		size_t size = 6;
 		assert(error <= SOCKS5_ADDR_UNSUP);
@@ -179,7 +190,8 @@ namespace proxy
 		m_response[1] = error; //Response code
 		m_response[2] = '\x00'; //RSV
 		m_response[3] = type; //Address type
-		switch (type) {
+		switch (type) 
+		{
 			case ADDR_IPV4:
 				size = 10;
 				htobe32buf(m_response+4,addr.ip);
@@ -203,12 +215,15 @@ namespace proxy
 		m_response[0] = '\x05'; //Version
 		m_response[1] = m_authchosen; //Response code
 		boost::asio::const_buffers_1 response(m_response,2);
-		if (m_authchosen == AUTH_UNACCEPTABLE) {
+		if (m_authchosen == AUTH_UNACCEPTABLE) 
+		{
 			LogPrint(eLogWarning,"--- SOCKS5 authentication negotiation failed");
 			boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksFailed,
 									      shared_from_this(), std::placeholders::_1));
 			return false;
-		} else {
+		} 
+		else 
+		{
 			LogPrint(eLogDebug,"--- SOCKS5 choosing authentication method: ", m_authchosen);
 			boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksResponse,
 									      shared_from_this(), std::placeholders::_1));
@@ -221,16 +236,17 @@ namespace proxy
 	{
 		boost::asio::const_buffers_1 response(nullptr,0);
 		assert(error != SOCKS4_OK && error != SOCKS5_OK);
-		switch (m_socksv) {
+		switch (m_socksv) 
+		{
 			case SOCKS4:
 				LogPrint(eLogWarning,"--- SOCKS4 failed: ", error);
 				if (error < SOCKS4_OK) error = SOCKS4_FAIL; //Transparently map SOCKS5 errors
 				response = GenerateSOCKS4Response(error, m_4aip, m_port);
-				break;
+			break;
 			case SOCKS5:
 				LogPrint(eLogWarning,"--- SOCKS5 failed: ", error);
 				response = GenerateSOCKS5Response(error, m_addrtype, m_address, m_port);
-				break;
+			break;
 		}
 		boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksFailed,
 								      shared_from_this(), std::placeholders::_1));
@@ -240,25 +256,27 @@ namespace proxy
 	{
 		boost::asio::const_buffers_1 response(nullptr,0);
 		//TODO: this should depend on things like the command type and callbacks may change
-		switch (m_socksv) {
+		switch (m_socksv) 
+		{
 			case SOCKS4:
 				LogPrint(eLogInfo,"--- SOCKS4 connection success");
 				response = GenerateSOCKS4Response(SOCKS4_OK, m_4aip, m_port);
-				break;
+			break;
 			case SOCKS5:
 				LogPrint(eLogInfo,"--- SOCKS5 connection success");
 				auto s = i2p::client::context.GetAddressBook().ToAddress(GetOwner()->GetLocalDestination()->GetIdentHash());
 				address ad; ad.dns.FromString(s);
 				//HACK only 16 bits passed in port as SOCKS5 doesn't allow for more
 				response = GenerateSOCKS5Response(SOCKS5_OK, ADDR_DNS, ad, m_stream->GetRecvStreamID());
-				break;
+			break;
 		}
 		boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksDone,
 								      shared_from_this(), std::placeholders::_1));
 	}
 
 	void SOCKSHandler::EnterState(SOCKSHandler::state nstate, uint8_t parseleft) {
-		switch (nstate) {
+		switch (nstate) 
+		{
 			case GET_PORT: parseleft = 2; break;
 			case GET_IPV4: m_addrtype = ADDR_IPV4; m_address.ip = 0; parseleft = 4; break;
 			case GET4_IDENT: m_4aip = m_address.ip; break;
@@ -271,28 +289,33 @@ namespace proxy
 		m_state = nstate;
 	}
 
-	bool SOCKSHandler::ValidateSOCKSRequest() {
-		if ( m_cmd != CMD_CONNECT ) {
+	bool SOCKSHandler::ValidateSOCKSRequest() 
+	{
+		if ( m_cmd != CMD_CONNECT ) 
+		{
 			//TODO: we need to support binds and other shit!
 			LogPrint(eLogError,"--- SOCKS unsupported command: ", m_cmd);
 			SocksRequestFailed(SOCKS5_CMD_UNSUP);
 			return false;
 		}
 		//TODO: we may want to support other address types!
-		if ( m_addrtype != ADDR_DNS ) {
-			switch (m_socksv) {
+		if ( m_addrtype != ADDR_DNS ) 
+		{
+			switch (m_socksv) 
+			{
 				case SOCKS5:
 					LogPrint(eLogError,"--- SOCKS5 unsupported address type: ", m_addrtype);
-					break;
+				break;
 				case SOCKS4:
 					LogPrint(eLogError,"--- SOCKS4a rejected because it's actually SOCKS4");
-					break;
+				break;
 			}
 			SocksRequestFailed(SOCKS5_ADDR_UNSUP);
 			return false;
 		}
 		//TODO: we may want to support other domains
-		if(m_addrtype == ADDR_DNS && m_address.dns.ToString().find(".i2p") == std::string::npos) {
+		if(m_addrtype == ADDR_DNS && m_address.dns.ToString().find(".i2p") == std::string::npos) 
+		{
 			LogPrint(eLogError,"--- SOCKS invalid hostname: ", m_address.dns.ToString());
 			SocksRequestFailed(SOCKS5_ADDR_UNSUP);
 			return false;
@@ -303,40 +326,45 @@ namespace proxy
 	bool SOCKSHandler::HandleData(uint8_t *sock_buff, std::size_t len)
 	{
 		assert(len); // This should always be called with a least a byte left to parse
-		while (len > 0) {
-			switch (m_state) {
+		while (len > 0) 
+		{
+			switch (m_state) 
+			{
 				case GET_SOCKSV:
 					m_socksv = (SOCKSHandler::socksVersions) *sock_buff;
-					switch (*sock_buff) {
+					switch (*sock_buff) 
+					{
 						case SOCKS4:
 							EnterState(GET_COMMAND); //Initialize the parser at the right position
-							break;
+						break;
 						case SOCKS5:
 							EnterState(GET5_AUTHNUM); //Initialize the parser at the right position
-							break;
+						break;
 						default:
 							LogPrint(eLogError,"--- SOCKS rejected invalid version: ", ((int)*sock_buff));
 							Terminate();
 							return false;
 					}
-					break;
+				break;
 				case GET5_AUTHNUM:
 					EnterState(GET5_AUTH, *sock_buff);
-					break;
+				break;
 				case GET5_AUTH:
 					m_parseleft --;
 					if (*sock_buff == AUTH_NONE)
 						m_authchosen = AUTH_NONE;
-					if ( m_parseleft == 0 ) {
+					if ( m_parseleft == 0 ) 
+					{
 						if (!Socks5ChooseAuth()) return false;
 						EnterState(GET5_REQUESTV);
 					}
-					break;
+				break;
 				case GET_COMMAND:
-					switch (*sock_buff) {
+					switch (*sock_buff) 
+					{
 						case CMD_CONNECT:
 						case CMD_BIND:
-							break;
+						break;
 						case CMD_UDP:
 							if (m_socksv == SOCKS5) break;
 						default:
@@ -345,70 +373,80 @@ namespace proxy
 							return false;
 					}
 					m_cmd = (SOCKSHandler::cmdTypes)*sock_buff;
-					switch (m_socksv) {
+					switch (m_socksv) 
+					{
 						case SOCKS5: EnterState(GET5_GETRSV); break;
 						case SOCKS4: EnterState(GET_PORT); break;
 					}
-					break;
+				break;
 				case GET_PORT:
 					m_port = (m_port << 8)|((uint16_t)*sock_buff);
 					m_parseleft--;
-					if (m_parseleft == 0) {
-						switch (m_socksv) {
+					if (m_parseleft == 0) 
+					{
+						switch (m_socksv) 
+						{
 							case SOCKS5: EnterState(DONE); break;
 							case SOCKS4: EnterState(GET_IPV4); break;
 						}
 					}
-					break;
+				break;
 				case GET_IPV4:
 					m_address.ip = (m_address.ip << 8)|((uint32_t)*sock_buff);
 					m_parseleft--;
-					if (m_parseleft == 0) {
-						switch (m_socksv) {
+					if (m_parseleft == 0) 
+					{
+						switch (m_socksv) 
+						{
 							case SOCKS5: EnterState(GET_PORT); break;
 							case SOCKS4: EnterState(GET4_IDENT); m_4aip = m_address.ip; break;
 						}
 					}
-					break;
+				break;
 				case GET4_IDENT:
-					if (!*sock_buff) {
-						if( m_4aip == 0 || m_4aip > 255 ) {
+					if (!*sock_buff) 
+					{
+						if( m_4aip == 0 || m_4aip > 255 )
 							EnterState(DONE);
-						} else {
+						else
 							EnterState(GET4A_HOST);
-						}
 					}
-					break;
+				break;
 				case GET4A_HOST:
-					if (!*sock_buff) {
+					if (!*sock_buff) 
+					{
 						EnterState(DONE);
 						break;
 					}
-					if (m_address.dns.size >= max_socks_hostname_size) {
+					if (m_address.dns.size >= max_socks_hostname_size) 
+					{
 						LogPrint(eLogError,"--- SOCKS4a destination is too large");
 						SocksRequestFailed(SOCKS4_FAIL);
 						return false;
 					}
 					m_address.dns.push_back(*sock_buff);
-					break;
+				break;
 				case GET5_REQUESTV:
-					if (*sock_buff != SOCKS5) {
+					if (*sock_buff != SOCKS5) 
+					{
 						LogPrint(eLogError,"--- SOCKS5 rejected unknown request version: ", ((int)*sock_buff));
 						SocksRequestFailed(SOCKS5_GEN_FAIL);
 						return false;
 					}
 					EnterState(GET_COMMAND);
-					break;
+				break;
 				case GET5_GETRSV:
-					if ( *sock_buff != 0 ) {
+					if ( *sock_buff != 0 ) 
+					{
 						LogPrint(eLogError,"--- SOCKS5 unknown reserved field: ", ((int)*sock_buff));
 						SocksRequestFailed(SOCKS5_GEN_FAIL);
 						return false;
 					}
 					EnterState(GET5_GETADDRTYPE);
-					break;
+				break;
 				case GET5_GETADDRTYPE:
-					switch (*sock_buff) {
+					switch (*sock_buff) 
+					{
 						case ADDR_IPV4: EnterState(GET_IPV4); break;
 						case ADDR_IPV6: EnterState(GET5_IPV6); break;
 						case ADDR_DNS : EnterState(GET5_HOST_SIZE); break;
@@ -417,20 +455,20 @@ namespace proxy
 							SocksRequestFailed(SOCKS5_GEN_FAIL);
 							return false;
 					}
-					break;
+				break;
 				case GET5_IPV6:
 					m_address.ipv6[16-m_parseleft] = *sock_buff;
 					m_parseleft--;
 					if (m_parseleft == 0) EnterState(GET_PORT);
-					break;
+				break;
 				case GET5_HOST_SIZE:
 					EnterState(GET5_HOST, *sock_buff);
-					break;
+				break;
 				case GET5_HOST:
 					m_address.dns.push_back(*sock_buff);
 					m_parseleft--;
 					if (m_parseleft == 0) EnterState(GET_PORT);
-					break;
+				break;
 				default:
 					LogPrint(eLogError,"--- SOCKS parse state?? ", m_state);
 					Terminate();
@@ -438,7 +476,8 @@ namespace proxy
 			}
 			sock_buff++;
 			len--;
-			if (m_state == DONE) {
+			if (m_state == DONE) 
+			{
 				m_remaining_data_len = len;
 				m_remaining_data = sock_buff;
 				return ValidateSOCKSRequest();
@@ -450,29 +489,32 @@ namespace proxy
 	void SOCKSHandler::HandleSockRecv(const boost::system::error_code & ecode, std::size_t len)
 	{
 		LogPrint(eLogDebug,"--- SOCKS sock recv: ", len);
-		if(ecode) {
+		if(ecode) 
+		{
 			LogPrint(eLogWarning," --- SOCKS sock recv got error: ", ecode);
-                        Terminate();
+            Terminate();
 			return;
 		}
 
-		if (HandleData(m_sock_buff, len)) {
-			if (m_state == DONE) {
+		if (HandleData(m_sock_buff, len)) 
+		{
+			if (m_state == DONE) 
+			{
 				LogPrint(eLogInfo,"--- SOCKS requested ", m_address.dns.ToString(), ":" , m_port);
 				GetOwner()->CreateStream ( std::bind (&SOCKSHandler::HandleStreamRequestComplete,
 						shared_from_this(), std::placeholders::_1), m_address.dns.ToString(), m_port);
-			} else {
-				AsyncSockRead();
 			} 
+			else
+				AsyncSockRead();
 		}
-
 	}
 
 	void SOCKSHandler::SentSocksFailed(const boost::system::error_code & ecode)
 	{
-		if (!ecode) {
+		if (!ecode) 
 			Terminate();
-		} else {
+		else 
+		{
 			LogPrint (eLogError,"--- SOCKS Closing socket after sending failure because: ", ecode.message ());
 			Terminate();
 		}
@@ -480,8 +522,9 @@ namespace proxy
 
 	void SOCKSHandler::SentSocksDone(const boost::system::error_code & ecode)
 	{
-		if (!ecode) {
-		if (Kill()) return;
+		if (!ecode) 
+		{
+			if (Kill()) return;
 			LogPrint (eLogInfo,"--- SOCKS New I2PTunnel connection");
 			auto connection = std::make_shared<i2p::client::I2PTunnelConnection>(GetOwner(), m_sock, m_stream);
 			GetOwner()->AddHandler (connection);
@@ -497,7 +540,8 @@ namespace proxy
 
 	void SOCKSHandler::SentSocksResponse(const boost::system::error_code & ecode)
 	{
-		if (ecode) {
+		if (ecode) 
+		{
 			LogPrint (eLogError,"--- SOCKS Closing socket after sending reply because: ", ecode.message ());
 			Terminate();
 		}
@@ -505,17 +549,20 @@ namespace proxy
 
 	void SOCKSHandler::HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream)
 	{
-		if (stream) {
+		if (stream) 
+		{
 			m_stream = stream;
 			SocksRequestSuccess();
-		} else {
+		} 
+		else 
+		{
 			LogPrint (eLogError,"--- SOCKS Issue when creating the stream, check the previous warnings for more info.");
 			SocksRequestFailed(SOCKS5_HOST_UNREACH);
 		}
 	}
 
-	SOCKSServer::SOCKSServer(int port) : 
-		TCPIPAcceptor (port, i2p::client::context.GetSharedLocalDestination ()) 
+	SOCKSServer::SOCKSServer(int port, std::shared_ptr<i2p::client::ClientDestination> localDestination) : 
+		TCPIPAcceptor (port, localDestination ? localDestination : i2p::client::context.GetSharedLocalDestination ()) 
 	{
 	}
 	

SOCKS.h

@@ -13,14 +13,15 @@ namespace proxy
 {
 	class SOCKSServer: public i2p::client::TCPIPAcceptor
 	{
+		public:
+
+			SOCKSServer(int port, std::shared_ptr<i2p::client::ClientDestination> localDestination = nullptr);
+			~SOCKSServer() {};
+
 		protected:
 			// Implements TCPIPAcceptor
 			std::shared_ptr<i2p::client::I2PServiceHandler> CreateHandler(boost::asio::ip::tcp::socket * socket);
 			const char* GetName() { return "SOCKS"; }
-
-		public:
-			SOCKSServer(int port);
-			~SOCKSServer() {}
 	};
 
 	typedef SOCKSServer SOCKSProxy;