Version 3.0.0

.gitignore

@@ -7,4 +7,4 @@
 
 ebin
 .idea
-.rebar
+.rebar

ChangeLog

@@ -1,10 +1,15 @@
+# 2015-04-20
+    * Version 3.0.0
+    * Add Http Proxy
+    * Acceptor Pool
+
 # 2014-11-09
 	* Version 2.0.0
 	* Restruct the Application
 	* Using aes_cbc128 to encryt data
 
 # 2013-07-08
-	*	Make project as an OTP Application
+	* Make project as an OTP Application
 
 # 2013-03-30
-	*	Version 0.1.0, First release
+	* Version 0.1.0, First release

README.md

@@ -8,6 +8,8 @@ This project can take you through a Firewall via Socks5 proxy.
 
 with the great erlang, the project has the following features:
 
+*   socks5 / http proxy. (https not supported)
+
 *   Robustness. never down.
 
 *   Scalable. handle thousands requests at the same time easily.
@@ -76,7 +78,7 @@ In my daily use, (1 cpu, 512MB RAM VPS)
     #### server.config
 
     *   port.   which port that the server listen on
-    *   key.    key to encrypt/decrypt data
+    *   key.    key to encrypt/decrypt data **16bytes**
 
 4.  `make server`
 5.  `./start_server.sh`
@@ -94,7 +96,8 @@ In my daily use, (1 cpu, 512MB RAM VPS)
 
     *   remote_addr. IP of the compute where `make-proxy` server runs
     *   remote_port. PORT that make-proxy server using. **SAME** as the defination of `server.config`.
-    *   local_port.  which port the make-proxy client will listen on.
+    *   local_socks5_port.  this port is used for socks5 proxy.
+    *   local_http_port.    this port is used for http proxy.
     *   key.    key to encrypt/decrypt data. this **MUST AS SAME AS** the defination of `server.config`.
 
 4.  `make client`
@@ -111,6 +114,5 @@ PORT = `7070`  (if not changed in the client.config)
 ## TODO
 
 1.  Support Socks5 Username/Password Authorize
-2.  Support HTTP Proxy
-3.  Traffic Statistics
+2.  Traffic Statistics
 

client.config.example

@@ -4,7 +4,8 @@
     [
         {remote_addr, "127.0.0.1"},
         {remote_port, 7071},
-        {local_port, 7070},
+        {local_socks5_port, 7070},
+        {local_http_port, 7171},
         {key, "1234567890abcdef"}
     ]    
 }

client/src/make_proxy_client.app.src

@@ -3,16 +3,24 @@
     make_proxy_client,
     [
         {description, "Make Proxy Client"},
-        {vsn, "2.0.0"},
+        {vsn, "3.0.0"},
         {modules, [
             mpc_app,
             mpc_sup,
-            mpc_acceptor_sup,
-            mpc_child_sup,
-            mpc_acceptor,
-            mpc_child
+            mpc_http_acceptor_sup,
+            mpc_http_child_sup,
+            mpc_socks5_acceptor_sup,
+            mpc_socks5_child_sup,
+            mpc_http_child,
+            mpc_socks5_child
+        ]},
+        {registered, [
+            mpc_sup,
+            mpc_http_acceptor_sup,
+            mpc_http_child_sup,
+            mpc_socks5_acceptor_sup,
+            mpc_socks5_child_sup
         ]},
-        {registered, [mpc_sup, mpc_acceptor_sup, mpc_child_sup]},
         {applications, [kernel, stdlib]},
         {mod, {mpc_app, []}}
     ]

client/src/mpc_sup.erl

@@ -58,7 +58,7 @@ start_link() ->
 init([]) ->
     RestartStrategy = one_for_one,
     MaxRestarts = 10,
-    MaxSecondsBetweenRestarts = 3600,
+    MaxSecondsBetweenRestarts = 600,
 
     SupFlags = {RestartStrategy, MaxRestarts, MaxSecondsBetweenRestarts},
 

server/src/make_proxy_server.app.src

@@ -3,13 +3,19 @@
     make_proxy_server,
     [
         {description, "Make Proxy Server"},
-        {vsn, "2.0.0"},
+        {vsn, "3.0.0"},
         {modules, [
             mp_app,
             mp_sup,
+            mp_acceptor_sup,
+            mp_child_sup,
             mp_child
         ]},
-        {registered, [mp_sup]},
+        {registered, [
+            mp_sup,
+            mp_acceptor_sup,
+            mp_child_sup
+        ]},
         {applications, [kernel, stdlib]},
         {mod, {mp_app, []}}
     ]