Rewrite the program and drop support to libevent 1.x.

Makefile

@@ -3,12 +3,10 @@ SRCS := $(OBJS:.o=.c)
 CONF := config.h
 DEPS := .depend
 OUT := redsocks2
-VERSION := 0.51
+VERSION := 0.60
 
 LIBS := -levent
-CFLAGS +=-fPIC -O2 \
-	 -I ~/openwrt/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/usr/include/ \
-	 -L ~/openwrt/openwrt/staging_dir/target-mipsel_dsp_uClibc-0.9.33.2/usr/lib/
+CFLAGS +=-fPIC -O3 
 override CFLAGS += -std=gnu99 -Wall
 #LDFLAGS += -fwhole-program
 

README

@@ -1,63 +1,6 @@
-This is a modified version of original redsocks.
-This variant is useful for anti-GFW (Great Fire Wall).
-
-Note:
-Method 'autosocks5' and 'autohttp-connect' are removed.
-To use the autoproxy feature, please change the redsocks section in 
-configuration file like this:
-
-redsocks {
- local_ip = 192.168.1.1;
- local_port = 1081;
- ip = 192.168.1.1;
- port = 9050;
- type = socks5; // I use socks5 proxy for GFW'ed IP
- autoproxy = 1; // I want autoproxy feature enabled on this section.
-		// The two lines above have same effect as 
-		//    type = autosocks5;
-		// in previous release.
- //type = http-connect;
- //login = username;
- //password = passwd;
-}
-
---------------------------------------------------------------------
-It provides the following advanced features:
-1. new 'direct' mehtod. 
-   This method is intent to direct any TCP connections directly without
-going through a proxy. Why this mehtod? Some ISP, like China Mobile (CMCC), 
-detects numbers of computers in your local network sharing same account by 
-montioring HTTP/HTTPS traffic. Only one computer has full access to all 
-websites. Other computers in local network are limited to some websites.
-By depolying transparent proxy with this method, all your computers can
-access websites without restrictions.
-2. new 'autosocks5' method. (REPLACED BY NEW METHOD!!!!)
-   This mehtod is specially customized for fighting against GFW. By
-default, all TCP connections are redirected to connect to target directly
-without going through socks5 proxy. But, in case the connection to target
-is RESET/CLOSED immediately for some reason (e.g. by GFW), the connection
-is redirected via socks5 proxy. The same logic is also applied when the
-connection to target fails to establish in certain seconds (13 seconds 
-currently). For such slow connection, no matter it is really a slow 
-connection or the handshake packets are dropped by GFW, making such 
-connections go through proxy is not a bad idea. 
-   REDSOCKS also maintances a cache for addresses that need to be relayed
-via proxy. So, whenever an address is identified need to be relayed via
-proxy, the subsequent connections to those addresses will be relayed via
-proxy immediately unless the addresses are removed from cache by code logic.
-   The advantage of this method is that you do not need to set thousands
-entries in iptables for blocked sites manually. It is especially useful
-for proxying Youtube which has so many sub-domains for video content cache.
-3. new 'autohttp-connect' method. (REPLACED BY NEW METHOD!!!!)
-   This method behaves similar as 'autoscoks5' method except the proxy
-to be used must support HTTP CONNECT method. This method is useful for
-using redsocks together with GoProxy.
-
-HOW TO BUILD:
-Since this variant of redsocks is customized for running with Openwrt, please
-read documents here (http://wiki.openwrt.org/doc/devel/crosscompile) for how
-to compile.
-
+This is a modified version of original redsocks and is useful for 
+anti-GFW (Great Fire Wall).
+The content below is from original redsocks project.
 ---------------------------------------------------------------------
 This tool allows you to redirect any TCP connection to SOCKS or HTTPS
 proxy using your firewall, so redirection is system-wide.

README.md

@@ -7,8 +7,17 @@ This variant is useful for anti-GFW (Great Fire Wall).
 
 HOW it works
 ------------
-Who can help me to complete this part? -_-
+Anyone can help me to complete this part? -_-
 
+HOW TO BUILD
+------------
+On general linux, simply run command below to build.
+
+	make
+
+Since this variant of redsocks is customized for running with Openwrt, please
+read documents here (http://wiki.openwrt.org/doc/devel/crosscompile) for how
+to cross compile.
 
 ##Note:
 Method 'autosocks5' and 'autohttp-connect' are removed.
@@ -29,12 +38,30 @@ configuration file like this:
 	 // It specified timeout value when trying to connect to destination
 	 // directly. Default is 10 seconds. When it is set to 0, default
 	 // timeout value will be used.
-	 timeout = 10;
+	 // NOTE: decrease the timeout value may lead increase of chance for
+	 // normal IP to be misjudged.
+	 timeout = 13;
 	 //type = http-connect;
 	 //login = username;
 	 //password = passwd;
 	}
 
+
+##Redirect Blocked Traffic via VPN Automatically
+Suppose you have VPN connection setup with interface tun0. You want all 
+all blocked traffic pass through via VPN connection while normal traffic
+pass through via default internet connection.
+
+	redsocks {
+		local_ip = 192.168.1.1;
+		local_port = 1080;
+		interface = tun0; // Outgoing interface for blocked traffic
+		type = direct;
+		timeout = 13;
+		autoproxy = 1;
+	}
+
+
 ##Work with GoAgent
 To make redsocks2 works with GoAgent proxy, you need to set proxy type as
 'http-relay' for HTTP protocol and 'http-connect' for HTTPS protocol  
@@ -53,7 +80,7 @@ The configuration for forwarding connections to GoAgent is like below:
 	 // It specified timeout value when trying to connect to destination
 	 // directly. Default is 10 seconds. When it is set to 0, default
 	 // timeout value will be used.
-	 timeout = 10;
+	 timeout = 13;
 	}
 	redsocks {
 	 local_ip = 192.168.1.1;
@@ -66,6 +93,9 @@ The configuration for forwarding connections to GoAgent is like below:
 	 // It specified timeout value when trying to connect to destination
 	 // directly. Default is 10 seconds. When it is set to 0, default
 	 // timeout value will be used.
-	 timeout = 10;
+	 timeout = 13;
 	}
 
+AUTHOR
+------
+Zhuofei Wang <semigodking@gmail.com>