diff --git a/src/tcp/ntTcpAcceptor.erl b/src/tcp/ntTcpAcceptor.erl index 2ce233d..946cb33 100644 --- a/src/tcp/ntTcpAcceptor.erl +++ b/src/tcp/ntTcpAcceptor.erl @@ -93,7 +93,7 @@ handleMsg({inet_async, LSock, Ref, Msg}, #state{lSock = LSock, ref = Ref, conMod {ok, Sock} -> %% make it look like gen_tcp:accept inet_db:register_socket(Sock, SockMod), - try ConMod:newAcceptor(Sock) of + try ConMod:newConn(Sock) of {ok, Pid} -> gen_tcp:controlling_process(Sock, Pid), Pid ! {?mSockReady, Sock}, diff --git a/src/tcp/ntTcpListener.erl b/src/tcp/ntTcpListener.erl index de7f8ac..43a1f2e 100644 --- a/src/tcp/ntTcpListener.erl +++ b/src/tcp/ntTcpListener.erl @@ -87,7 +87,7 @@ loop(Parent, State) -> , opts :: [listenOpt()] }). --define(DEFAULT_TCP_OPTIONS, [{nodelay, true}, {packet, 2}, {reuseaddr, true}, {send_timeout, 30000}, {send_timeout_close, true}]). +-define(DEFAULT_TCP_OPTIONS, [{nodelay, true}, {reuseaddr, true}, {send_timeout, 30000}, {send_timeout_close, true}]). init({AptSupName, Port, ListenOpts}) -> process_flag(trap_exit, true), diff --git a/src/test/atFalseTcpSrv.erl b/src/test/atFalseTcpSrv.erl index 0d60377..d6dc990 100644 --- a/src/test/atFalseTcpSrv.erl +++ b/src/test/atFalseTcpSrv.erl @@ -2,7 +2,7 @@ -behaviour(gen_server). %% start --export([start/1, newAcceptor/1]). +-export([start/1, newConn/1]). -export([start_link/2]). @@ -34,24 +34,10 @@ start(Port) -> start_link(Transport, Sock) -> {ok, proc_lib:spawn_link(?MODULE, init, [[Transport, Sock]])}. -newAcceptor(Sock) -> +newConn(Sock) -> start_link(prim_inet, Sock). - %case whereis(tttttMgr) of - % undefined -> - % start_link(prim_inet, Sock); - % Pid -> - % {ok, Pid} - %end. - -safeRegister(Name) -> - try register(Name, self()) of - true -> true - catch - _:_ -> {false, whereis(Name)} - end. init([Transport, Sock]) -> - safeRegister(tttttMgr), gen_server:enter_loop(?MODULE, [], #state{}). handle_call(_Request, _From, State) -> diff --git a/src/test/tcpCli.erl b/src/test/tcpCli.erl index 1b0e1eb..a830bd4 100644 --- a/src/test/tcpCli.erl +++ b/src/test/tcpCli.erl @@ -19,7 +19,7 @@ -export([start/3, send/2, run/4, connect/4, loop/2]). --define(TCP_OPTIONS, [binary, {packet, 2}, {active, true}]). +-define(TCP_OPTIONS, [binary, {packet, 0}, {active, true}]). start(Host, Port, Num) -> spawn(?MODULE, run, [self(), Host, Port, Num]),