fix issue#9

emqx · Apr 9, 2015 · 4377127 · 4377127
1 parent a043231
commit 4377127
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/esockd_acceptor.erl b/src/esockd_acceptor.erl
@@ -102,8 +102,9 @@ handle_info({inet_async, LSock, Ref, {ok, Sock}}, State = #state{lsock    = LSoc
     %% accepted stats.
     AcceptStatsFun({inc, 1}),
 
-	{ok, Peername} = inet:peername(Sock),
-    Logger:info("~s - Accept from ~s", [SockName, esockd_net:format(peername, Peername)]),
+    %% fix issues#9: enotconn error occured...
+	%{ok, Peername} = inet:peername(Sock),
+    %Logger:info("~s - Accept from ~s", [SockName, esockd_net:format(peername, Peername)]),
     case BufferTuneFun(Sock) of
         ok -> 
             case esockd_connection_sup:start_connection(ConnSup, Mod, Sock, SockFun) of

diff --git a/src/esockd_connection_sup.erl b/src/esockd_connection_sup.erl
@@ -140,22 +140,26 @@ handle_call({start_connection, _SockArgs}, _From, State = #state{curr_clients =
 
 handle_call({start_connection, SockArgs = {_, Sock, _SockFun}}, _From, 
             State = #state{mfargs = MFArgs, curr_clients = Count, access_rules = Rules}) ->
-    {ok, {Addr, _Port}} = inet:peername(Sock),
-    case allowed(Addr, Rules) of
-        true ->
-            case catch esockd_connection:start_link(SockArgs, MFArgs) of
-                {ok, Pid} when is_pid(Pid) -> 
-                    put(Pid, true),
-                    {reply, {ok, Pid}, State#state{curr_clients = Count+1}};
-                ignore ->
-                    {reply, ignore, State};
-                {error, Reason} ->
-                    {reply, {error, Reason}, State};
-                What ->
-                    {reply, {error, What}, State}
+    case inet:peername(Sock) of
+        {ok, {Addr, _Port}} ->
+            case allowed(Addr, Rules) of
+                true ->
+                    case catch esockd_connection:start_link(SockArgs, MFArgs) of
+                        {ok, Pid} when is_pid(Pid) ->
+                            put(Pid, true),
+                            {reply, {ok, Pid}, State#state{curr_clients = Count+1}};
+                        ignore ->
+                            {reply, ignore, State};
+                        {error, Reason} ->
+                            {reply, {error, Reason}, State};
+                        What ->
+                            {reply, {error, What}, State}
+                    end;
+                false ->
+                    {reply, {error, fobidden}, State}
             end;
-        false -> 
-            {reply, {error, fobidden}, State}
+        {error, Reason} ->
+            {reply, {error, Reason}, State}
     end;
 
 handle_call(count_connections, _From, State = #state{curr_clients = Count}) ->