From ae5cd5d7253f04d67b0ea8a6017eb2c461593829 Mon Sep 17 00:00:00 2001
From: SisMaker <1713699517@qq.com>
Date: Wed, 12 Jan 2022 15:54:39 +0800
Subject: [PATCH] =?UTF-8?q?ft:=20Ppt=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/eNet.hrl        |  5 ++++-
 src/ssl/ntSslMgrSup.erl | 10 ++--------
 src/test/utSslANSrv.erl |  2 +-
 src/test/utTcpAFSrv.erl |  2 +-
 src/udp/ntUdpSrv.erl    |  2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/include/eNet.hrl b/include/eNet.hrl
index 2609744..81fb7c6 100644
--- a/include/eNet.hrl
+++ b/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]).
 
diff --git a/src/ssl/ntSslMgrSup.erl b/src/ssl/ntSslMgrSup.erl
index dccf92d..6e678f8 100644
--- a/src/ssl/ntSslMgrSup.erl
+++ b/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,
diff --git a/src/test/utSslANSrv.erl b/src/test/utSslANSrv.erl
index 8b29fda..3d6bc1d 100644
--- a/src/test/utSslANSrv.erl
+++ b/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}.
diff --git a/src/test/utTcpAFSrv.erl b/src/test/utTcpAFSrv.erl
index fff83a2..9a50199 100644
--- a/src/test/utTcpAFSrv.erl
+++ b/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}.
diff --git a/src/udp/ntUdpSrv.erl b/src/udp/ntUdpSrv.erl
index a838c0e..487a81f 100644
--- a/src/udp/ntUdpSrv.erl
+++ b/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()].