diff options
author | j.uhlig <[email protected]> | 2018-06-26 17:07:13 +0200 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2018-07-02 09:02:00 +0200 |
commit | 5ada450fe10a5fc51b7f3f0900571a10547635a1 (patch) | |
tree | 45ac84215485f09ebedce319121ed5f719b30493 /src/ranch_conns_sup.erl | |
parent | caeadc82615e9e5ce0c2d92f882cad7b9cb7322d (diff) | |
download | ranch-5ada450fe10a5fc51b7f3f0900571a10547635a1.tar.gz ranch-5ada450fe10a5fc51b7f3f0900571a10547635a1.tar.bz2 ranch-5ada450fe10a5fc51b7f3f0900571a10547635a1.zip |
Introduce Transport:handshake/1,2
This commit deprecates Transport:accept_ack/1 in favor of
a new forward-compatible function. Transport:handshake/1,2
will use ssl:handshake/2,3 from Ranch 2.0 onward.
Diffstat (limited to 'src/ranch_conns_sup.erl')
-rw-r--r-- | src/ranch_conns_sup.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ranch_conns_sup.erl b/src/ranch_conns_sup.erl index 812a6c3..72de2d7 100644 --- a/src/ranch_conns_sup.erl +++ b/src/ranch_conns_sup.erl @@ -115,9 +115,9 @@ loop(State=#state{parent=Parent, ref=Ref, conn_type=ConnType, {?MODULE, start_protocol, To, Socket} -> try Protocol:start_link(Ref, Socket, Transport, Opts) of {ok, Pid} -> - shoot(State, CurConns, NbChildren, Sleepers, To, Socket, Pid, Pid); + handshake(State, CurConns, NbChildren, Sleepers, To, Socket, Pid, Pid); {ok, SupPid, ProtocolPid} when ConnType =:= supervisor -> - shoot(State, CurConns, NbChildren, Sleepers, To, Socket, SupPid, ProtocolPid); + handshake(State, CurConns, NbChildren, Sleepers, To, Socket, SupPid, ProtocolPid); Ret -> To ! self(), error_logger:error_msg( @@ -219,11 +219,11 @@ loop(State=#state{parent=Parent, ref=Ref, conn_type=ConnType, loop(State, CurConns, NbChildren, Sleepers) end. -shoot(State=#state{ref=Ref, transport=Transport, ack_timeout=AckTimeout, max_conns=MaxConns}, +handshake(State=#state{ref=Ref, transport=Transport, ack_timeout=AckTimeout, max_conns=MaxConns}, CurConns, NbChildren, Sleepers, To, Socket, SupPid, ProtocolPid) -> case Transport:controlling_process(Socket, ProtocolPid) of ok -> - ProtocolPid ! {shoot, Ref, Transport, Socket, AckTimeout}, + ProtocolPid ! {handshake, Ref, Transport, Socket, AckTimeout}, put(SupPid, active), CurConns2 = CurConns + 1, if CurConns2 < MaxConns -> |