added port support for localnet

proxychains/core.h

@@ -17,6 +17,7 @@
 #ifndef __CORE_HEADER
 #define __CORE_HEADER
 #define BUFF_SIZE 8*1024  // used to read responses from proxies.
+#define     MAX_LOCALNET 1024
 /*error codes*/
 typedef enum
 {
@@ -34,6 +35,12 @@ typedef enum {DYNAMIC_TYPE,STRICT_TYPE,RANDOM_TYPE} chain_type;
 typedef enum {PLAY_STATE,DOWN_STATE,BLOCKED_STATE,BUSY_STATE} proxy_state;
 typedef enum {RANDOMLY,FIFOLY} select_type;
 
+typedef struct
+{
+	struct in_addr in_addr, netmask;
+	unsigned short port;
+} localaddr_arg;
+
 typedef struct
 {
 unsigned int ip;

proxychains/libproxychains.c

@@ -52,12 +52,14 @@ int proxychains_max_chain = 1;
 int proxychains_quiet_mode = 0;
 int proxychains_resolver = 0;
 static int init_l = 0;
-static inline void get_chain_data(
+localaddr_arg localnet_addr[MAX_LOCALNET];
-	proxy_data *pd,
+size_t num_localnet_addr = 0;
-	unsigned int *proxy_count,
-	chain_type *ct);
 
-static void init_lib()
+static inline void get_chain_data(proxy_data *pd, unsigned int *proxy_count,
+	chain_type *ct);
+static void init_lib(void);
+
+static void init_lib(void)
 {
 //	proxychains_write_log("ProxyChains-"VERSION
 //			" (http://proxychains.sf.net)\n");
@@ -146,6 +148,8 @@ static inline void get_chain_data(
 
 	int count=0,port_n=0,list=0;
 	char buff[1024],type[1024],host[1024],user[1024];
+	char local_in_addr_port[32];
+	char local_in_addr[32], local_in_port[32], local_netmask[32];
 	FILE* file;
 
 	if(proxychains_got_chain_data)
@@ -200,7 +204,54 @@ static inline void get_chain_data(
 					sscanf(buff,"%s %d",user,&tcp_read_time_out) ;
 				}else if(strstr(buff,"tcp_connect_time_out")){
 					sscanf(buff,"%s %d",user,&tcp_connect_time_out) ;
-				}else if(strstr(buff,"chain_len")){
+				}
+				else if(strstr(buff,"localnet"))
+				{
+					if (sscanf(buff,"%s %21[^/]/%15s", user,
+						local_in_addr_port, local_netmask) < 3) {
+						fprintf(stderr, "localnet format error");
+						exit(1);
+					}
+					/* clean previously used buffer */
+					memset(local_in_port, 0,
+						sizeof(local_in_port) / sizeof(local_in_port[0]));
+
+					if (sscanf(local_in_addr_port, "%15[^:]:%5s",
+						local_in_addr, local_in_port) < 2) {
+					    PDEBUG("added localnet: netaddr=%s, port=%s\n",
+							local_in_addr, local_netmask);
+					} else {
+					    PDEBUG("added localnet: netaddr=%s, port=%s, netmask=%s\n",
+							local_in_addr, local_in_port, local_netmask);
+					}
+					if (num_localnet_addr < MAX_LOCALNET)
+					{
+						int error;
+						error = inet_pton(AF_INET, local_in_addr, &localnet_addr[num_localnet_addr].in_addr);
+						if (error <= 0)
+						{
+							fprintf(stderr, "localnet address error\n");
+							exit(1);
+						}
+						error = inet_pton(AF_INET, local_netmask, &localnet_addr[num_localnet_addr].netmask);
+						if (error <= 0)
+						{
+							fprintf(stderr, "localnet netmask error\n");
+							exit(1);
+						}
+						if (local_in_port[0]) {
+							localnet_addr[num_localnet_addr].port = (short)atoi(local_in_port);
+						} else {
+							localnet_addr[num_localnet_addr].port = 0;
+						}
+						++num_localnet_addr;
+					}
+					else
+					{
+						fprintf(stderr, "# of localnet exceed %d.\n", MAX_LOCALNET);
+					}
+				}
+				else if(strstr(buff,"chain_len")){
 					char *pc;int len;
 					pc=strchr(buff,'=');
 					len=atoi(++pc);
@@ -223,6 +274,10 @@ static inline void get_chain_data(
 int connect (int sock, const struct sockaddr *addr, unsigned int len)
 {
 	int socktype=0,optlen=0,flags=0,ret=0;
+	char str[256];
+	struct in_addr *p_addr_in;
+	unsigned short port;
+	size_t i;
 
 	if(!init_l)
 		init_lib();
@@ -230,6 +285,25 @@ int connect (int sock, const struct sockaddr *addr, unsigned int len)
 	getsockopt(sock,SOL_SOCKET,SO_TYPE,&socktype,&optlen);
 	if (! (SOCKFAMILY(*addr)==AF_INET  && socktype==SOCK_STREAM))
 		return true_connect(sock,addr,len);
+
+	p_addr_in = &((struct sockaddr_in *)addr)->sin_addr;
+	port = ntohs(((struct sockaddr_in *)addr)->sin_port);
+
+	//PDEBUG("localnet: %s; ", inet_ntop(AF_INET,&in_addr_localnet, str, sizeof(str)));
+	//PDEBUG("netmask: %s; " , inet_ntop(AF_INET, &in_addr_netmask, str, sizeof(str)));
+	//PDEBUG("target: %s\n", inet_ntop(AF_INET, p_addr_in, str, sizeof(str)));
+	//PDEBUG("port: %d\n", port);
+	for (i = 0; i < num_localnet_addr; i++) {
+		if ((localnet_addr[i].in_addr.s_addr & localnet_addr[i].netmask.s_addr)
+			== (p_addr_in->s_addr & localnet_addr[i].netmask.s_addr))
+		{
+			if (localnet_addr[i].port && localnet_addr[i].port == port) {
+				PDEBUG("accessing localnet using true_connect\n");
+				return true_connect(sock,addr,len);
+			}
+		}
+	}
+
 	flags=fcntl(sock, F_GETFL, 0);
 	if(flags & O_NONBLOCK)
 	fcntl(sock, F_SETFL, !O_NONBLOCK);
@@ -308,8 +382,8 @@ int getnameinfo (const struct sockaddr * sa,
 	PDEBUG("getnameinfo: %s %s\n", host, serv);
 	return ret;
 }
-struct hostent *gethostbyaddr (const void *addr, socklen_t len,
+
-		                                      int type)
+struct hostent *gethostbyaddr (const void *addr, socklen_t len, int type)
 {
 	PDEBUG("TODO: gethostbyaddr hook\n"); 
 	if(!init_l)

proxychains/proxychains.conf

@@ -41,6 +41,16 @@ proxy_dns
 tcp_read_time_out 15000
 tcp_connect_time_out 8000
 
+# Example for localnet exclusion
+## Exclude connections to 192.168.1.0/24 with port 80
+# localnet 192.168.1.0:80/255.255.255.0
+
+## Exclude connections to 192.168.100.0/24
+# localnet 192.168.100.0/255.255.255.0
+
+## Exclude connections to ANYwhere with port 80
+# localnet 0.0.0.0:80/0.0.0.0
+
 # ProxyList format
 #       type  host  port [user pass]
 #       (values separated by 'tab' or 'blank')