adjust

siu5 · Apr 20, 2015 · cf8af82 · cf8af82
1 parent b10f7b6
commit cf8af82
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/client/src/mpc_http_acceptor_sup.erl b/client/src/mpc_http_acceptor_sup.erl
@@ -36,7 +36,7 @@ start_link() ->
     {ok, LSock} = gen_tcp:listen(Port, [binary,
         {ip, {0, 0, 0, 0}},
         {reuseaddr, true},
-        {active, once},
+        {active, false},
         {backlog, 256}]),
 
     supervisor:start_link({local, ?SERVER}, ?MODULE, [LSock]).

diff --git a/client/src/mpc_http_child.erl b/client/src/mpc_http_child.erl
@@ -58,8 +58,13 @@ start_link(Socket) ->
 %% @end
 %%--------------------------------------------------------------------
 init([Socket]) ->
-    {ok, Key} = application:get_env(make_proxy_client, key),
-    {ok, #state{key=Key, socket=Socket}}.
+    case inet:setopts(Socket, [{active, once}]) of
+        ok ->
+            {ok, Key} = application:get_env(make_proxy_client, key),
+            {ok, #state{key=Key, socket=Socket}};
+        {error, Reason} ->
+            {stop, Reason}
+    end.
 
 %%--------------------------------------------------------------------
 %% @private
@@ -96,7 +101,7 @@ handle_cast({http_new, Socket, Request}, #state{key = Key, socket = Socket} = St
         {ok, Target, NormalizedReqeust} ->
             ok = gen_tcp:send(Remote, mp_crypto:encrypt(Key, Target)),
             ok = gen_tcp:send(Remote, mp_crypto:encrypt(Key, NormalizedReqeust)),
-            inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
             {noreply, State#state{remote = Remote}, ?TIMEOUT};
         {error, Reason} ->
             {stop, Reason, State}
@@ -154,7 +159,7 @@ handle_info({tcp, Socket, Response}, #state{key=Key, socket=Client} = State) whe
     {ok, RealData} = mp_crypto:decrypt(Key, Response),
     case gen_tcp:send(Client, RealData) of
         ok ->
-            inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
             {noreply, State, ?TIMEOUT};
         {error, Error} ->
             {stop, Error, State}

diff --git a/client/src/mpc_socks5_child.erl b/client/src/mpc_socks5_child.erl
@@ -98,8 +98,8 @@ handle_cast(_Info, State) ->
 handle_info(timeout, #state{key=Key, socket=Socket, started = false} = State) ->
     case start_process(Socket, Key) of
         {ok, Remote} ->
-            inet:setopts(Socket, [{active, once}]),
-            inet:setopts(Remote, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Remote, [{active, once}]),
             {noreply, State#state{socket=Socket, remote=Remote, started = true}, ?TIMEOUT};
         {error, Error} ->
             {stop, Error, State}
@@ -113,7 +113,7 @@ handle_info(timeout, #state{started = true} = State)->
 handle_info({tcp, Socket, Request}, #state{key=Key, socket=Socket, remote=Remote} = State) ->
     case gen_tcp:send(Remote, mp_crypto:encrypt(Key, Request)) of
         ok ->
-            inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
             {noreply, State, ?TIMEOUT};
         {error, Error} ->
             {stop, Error, State}
@@ -124,7 +124,7 @@ handle_info({tcp, Socket, Response}, #state{key=Key, socket=Client, remote=Socke
     {ok, RealData} = mp_crypto:decrypt(Key, Response),
     case gen_tcp:send(Client, RealData) of
         ok ->
-            inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
             {noreply, State, ?TIMEOUT};
         {error, Error} ->
             {stop, Error, State}

diff --git a/server/src/mp_acceptor_sup.erl b/server/src/mp_acceptor_sup.erl
@@ -36,7 +36,7 @@ start_link() ->
     {ok, LSock} = gen_tcp:listen(Port, [binary,
         {ip, {0, 0, 0, 0}},
         {reuseaddr, true},
-        {active, once},
+        {active, false},
         {packet, 4},
         {backlog, 256}]),
 

diff --git a/server/src/mp_child.erl b/server/src/mp_child.erl
@@ -51,8 +51,13 @@ start_link(Socket) ->
 %% @end
 %%--------------------------------------------------------------------
 init([Socket]) ->
-    {ok, Key} = application:get_env(make_proxy_server, key),
-    {ok, #state{key=Key, socket = Socket}, ?TIMEOUT}.
+    case inet:setopts(Socket, [{active, once}]) of
+        ok ->
+            {ok, Key} = application:get_env(make_proxy_server, key),
+            {ok, #state{key=Key, socket = Socket}, ?TIMEOUT};
+        {error, Reason} ->
+            {stop, Reason}
+    end.
 
 %%--------------------------------------------------------------------
 %% @private
@@ -105,8 +110,8 @@ handle_info(timeout, #state{socket=Socket} = State) when is_port(Socket) ->
 handle_info({tcp, Socket, Request}, #state{key = Key, socket = Socket, remote = undefined} = State) ->
     case connect_to_remote(Request, Key) of
         {ok, Remote} ->
-            inet:setopts(Socket, [{active, once}]),
-            inet:setopts(Remote, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Remote, [{active, once}]),
             {noreply, State#state{remote=Remote}, ?TIMEOUT};
         {error, Error} ->
             {stop, Error, State}
@@ -117,7 +122,7 @@ handle_info({tcp, Socket, Request}, #state{key=Key, socket=Socket, remote=Remote
     {ok, RealData} = mp_crypto:decrypt(Key, Request),
     case gen_tcp:send(Remote, RealData) of
         ok ->
-            inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
             {noreply, State, ?TIMEOUT};
         {error, Error} ->
             {stop, Error, State}
@@ -127,7 +132,7 @@ handle_info({tcp, Socket, Request}, #state{key=Key, socket=Socket, remote=Remote
 handle_info({tcp, Socket, Response}, #state{key=Key, socket=Client, remote=Socket} = State) ->
     case gen_tcp:send(Client, mp_crypto:encrypt(Key, Response)) of
         ok ->
-            inet:setopts(Socket, [{active, once}]),
+            ok = inet:setopts(Socket, [{active, once}]),
             {noreply, State, ?TIMEOUT};
         {error, Error} ->
             {stop, Error, State}