Upgrade ranch to 1.7

rebar.config

@@ -2,7 +2,7 @@
 {erl_opts, [debug_info,
             {parse_transform, lager_transform}]}.
 
-{deps, [{ranch, "1.5.0"},
+{deps, [{ranch, "1.7.0"},
         {lager, "3.6.3"}
         ]}.
 

rebar.lock

@@ -1,10 +1,10 @@
 {"1.1.0",
 [{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"lager">>,{pkg,<<"lager">>,<<"3.6.3">>},0},
- {<<"ranch">>,{pkg,<<"ranch">>,<<"1.5.0">>},0}]}.
+ {<<"ranch">>,{pkg,<<"ranch">>,<<"1.7.0">>},0}]}.
 [
 {pkg_hash,[
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"lager">>, <<"FE78951D174616273F87F0DBC3374D1430B1952E5EFC4E1C995592D30A207294">>},
- {<<"ranch">>, <<"F04166F456790FEE2AC1AA05A02745CC75783C2BFB26D39FAF6AEFC9A3D3A58A">>}]}
+ {<<"ranch">>, <<"9583F47160CA62AF7F8D5DB11454068EAA32B56EEADF984D4F46E61A076DF5F2">>}]}
 ].

src/mtp_handler.erl

@@ -49,8 +49,8 @@
 
 %% APIs
 
-start_link(Ref, Socket, Transport, Opts) ->
-    {ok, proc_lib:spawn_link(?MODULE, ranch_init, [{Ref, Socket, Transport, Opts}])}.
+start_link(Ref, _Socket, Transport, Opts) ->
+    {ok, proc_lib:spawn_link(?MODULE, ranch_init, [{Ref, Transport, Opts}])}.
 
 keys_str() ->
     [{Name, Port, hex(Secret)}
@@ -59,10 +59,10 @@ keys_str() ->
 %% Callbacks
 
 %% Custom gen_server init
-ranch_init({Ref, Socket, Transport, _} = Opts) ->
-    case init(Opts) of
+ranch_init({Ref, Transport, Opts}) ->
+    {ok, Socket} = ranch:handshake(Ref),
+    case init({Socket, Transport, Opts}) of
         {ok, State} ->
-            ok = ranch:accept_ack(Ref),
             BufSize = application:get_env(?APP, upstream_socket_buffer_size,
                                           ?MAX_SOCK_BUF_SIZE),
             ok = Transport:setopts(
@@ -78,7 +78,7 @@ ranch_init({Ref, Socket, Transport, _} = Opts) ->
             exit(normal)
     end.
 
-init({_Ref, Socket, Transport, [Name, Secret, Tag]}) ->
+init({Socket, Transport, [Name, Secret, Tag]}) ->
     mtp_metric:set_context_labels([Name]),
     mtp_metric:count_inc([?APP, in_connection, total], 1, #{}),
     case Transport:peername(Socket) of

src/mtproto_proxy_app.erl

@@ -40,10 +40,10 @@ start_proxy(#{name := Name, port := Port, secret := Secret, tag := Tag} = P) ->
     Res =
         ranch:start_listener(
           Name, ranch_tcp,
-          [{ip, ListenIp},
-           {port, Port},
-           {num_acceptors, NumAcceptors},
-           {max_connections, MaxConnections}],
+          #{socket_opts => [{ip, ListenIp},
+                            {port, Port}],
+            num_acceptors => NumAcceptors,
+            max_connections => MaxConnections},
           mtp_handler, [Name, Secret, Tag]),
     Url = io_lib:format(
             "https://t.me/proxy?server=~s&port=~w&secret=~s",