ft: Ppt相关修改

include/eNet.hrl

@@ -30,7 +30,10 @@
    {conMod, atom()} |
    {tcpOpts, [gen_tcp:listen_option()]} |
    {sslOpts, [ssl:ssl_option()]} |
-   {udpOpts, [gen_udp:option()]}.
+   {sslHSTet, timeout()} |
+   {udpOpts, [gen_udp:option()]} |
+   {proxyPt, boolean()} |
+   {proxyPtTet, timeout()}.
 
 -export_type([listenOpt/0]).
 

src/ssl/ntSslMgrSup.erl

@@ -24,18 +24,12 @@ init({SupName, Port, ListenOpts}) ->
    ListenName = ntCom:lsName(ssl, SupName),
 
    SslOpts = ?getLValue(sslOpts, ListenOpts, []),
-   {HandshakeTimeout, LastSslOpts} =
-      case lists:keytake(handshake_timeout, 1, SslOpts) of
-         {value, {handshake_timeout, Timeout}, TemSslOpts} ->
-            {Timeout, TemSslOpts};
-         false ->
-            {?SSL_HANDSHAKE_TIMEOUT, SslOpts}
-      end,
+   SslHSTet = ?getLValue(sslHSTet, ListenOpts, ?SSL_HANDSHAKE_TIMEOUT),
 
    ChildSpecs = [
       #{
          id => AptSupName,
-         start => {ntSslAcceptorSup, start_link, [AptSupName, LastSslOpts, HandshakeTimeout]},
+         start => {ntSslAcceptorSup, start_link, [AptSupName, SslOpts, SslHSTet]},
          restart => permanent,
          shutdown => infinity,
          type => supervisor,

src/test/utSslANSrv.erl

@@ -75,7 +75,7 @@ handle_info(_Info, State) ->
    {noreply, State}.
 
 terminate(_Reason, #state{socket = Sock}) ->
-   catch port_close(Sock).
+   catch ssl:close(Sock).
 
 code_change(_OldVsn, State, _Extra) ->
    {ok, State}.

src/test/utTcpAFSrv.erl

@@ -68,7 +68,7 @@ handle_info(_Info, State) ->
     {noreply, State}.
 
 terminate(_Reason, #state{socket = Sock}) ->
-   catch port_close(Sock).
+   catch gen_tcp:close(Sock).
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.

src/udp/ntUdpSrv.erl

@@ -157,7 +157,7 @@ handleMsg(_Msg, State) ->
 
 terminate(_Reason, #state{oSock = LSock, listenAddr = Addr, listenPort = Port}) ->
    ?ntInfo("stopped on ~s:~p ~n", [inet:ntoa(Addr), Port]),
-   catch port_close(LSock),
+   catch gen_udp:close(LSock),
    ok.
 
 -spec getOpts(pid()) -> [listenOpt()].