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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/tcp_echo/src/echo_protocol.erl | 10 | ||||
| -rw-r--r-- | examples/tcp_reverse/src/reverse_protocol.erl | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/examples/tcp_echo/src/echo_protocol.erl b/examples/tcp_echo/src/echo_protocol.erl index 6e1df40..d8944c6 100644 --- a/examples/tcp_echo/src/echo_protocol.erl +++ b/examples/tcp_echo/src/echo_protocol.erl @@ -4,14 +4,14 @@ -behaviour(ranch_protocol). -export([start_link/4]). --export([init/4]). +-export([init/3]). -start_link(Ref, Socket, Transport, Opts) -> - Pid = spawn_link(?MODULE, init, [Ref, Socket, Transport, Opts]), +start_link(Ref, _Socket, Transport, Opts) -> + Pid = spawn_link(?MODULE, init, [Ref, Transport, Opts]), {ok, Pid}. -init(Ref, Socket, Transport, _Opts = []) -> - ok = ranch:accept_ack(Ref), +init(Ref, Transport, _Opts = []) -> + {ok, Socket} = ranch:handshake(Ref), loop(Socket, Transport). loop(Socket, Transport) -> diff --git a/examples/tcp_reverse/src/reverse_protocol.erl b/examples/tcp_reverse/src/reverse_protocol.erl index a37ca46..91a5b95 100644 --- a/examples/tcp_reverse/src/reverse_protocol.erl +++ b/examples/tcp_reverse/src/reverse_protocol.erl @@ -20,16 +20,16 @@ %% API. -start_link(Ref, Socket, Transport, Opts) -> - {ok, proc_lib:spawn_link(?MODULE, init, [{Ref, Socket, Transport, Opts}])}. +start_link(Ref, _Socket, Transport, Opts) -> + {ok, proc_lib:spawn_link(?MODULE, init, [{Ref, Transport, Opts}])}. %% gen_statem. callback_mode() -> state_functions. -init({Ref, Socket, Transport, _Opts = []}) -> - ok = ranch:accept_ack(Ref), +init({Ref, Transport, _Opts = []}) -> + {ok, Socket} = ranch:handshake(Ref), ok = Transport:setopts(Socket, [{active, once}, {packet, line}]), gen_statem:enter_loop(?MODULE, [], connected, #state{socket=Socket, transport=Transport}, |