File 0213-fix-do-not-bind-on-FD-with-undefined-ifadd... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0213-fix-do-not-bind-on-FD-with-undefined-ifaddr.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Currently displaying revision 740810ae07adffc1a50bb3a32135aa98 , Show latest

From dd6af7877674a6c5ff96853a2c6a46f42ffceb12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <lukasz@niemier.pl>
Date: Thu, 4 Nov 2021 15:08:30 +0100
Subject: [PATCH] fix: do not bind on FD with undefined ifaddr

This is behaviour exposed by the `inet` backend and also the expected
behaviour, as it allows to use `socket` backend together with systemd
socket activation where the application receives bound socket with
messages already in queue.

Close #4680
---
 lib/kernel/src/gen_tcp_socket.erl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/kernel/src/gen_tcp_socket.erl b/lib/kernel/src/gen_tcp_socket.erl
index 339dadad3f..689687ba23 100644
--- a/lib/kernel/src/gen_tcp_socket.erl
+++ b/lib/kernel/src/gen_tcp_socket.erl
@@ -198,7 +198,9 @@ extra_opts(OpenOpts) when is_list(OpenOpts) ->
    maps:from_list(OpenOpts).
 
 
-default_any(Domain, undefined = Undefined) ->
+default_any(_Domain, undefined, #{fd := _}) ->
+    undefined;
+default_any(Domain, undefined, _Opts) ->
     if
         Domain =:= inet;
         Domain =:= inet6 ->
@@ -206,9 +208,9 @@ default_any(Domain, undefined = Undefined) ->
               addr   => any,
               port   => 0};
         true ->
-            Undefined
+            undefined
     end;
-default_any(_Domain, BindAddr) ->
+default_any(_Domain, BindAddr, _Opts) ->
     BindAddr.
 
 bind_addr(_Domain, BindIP, BindPort)
@@ -290,7 +292,10 @@ listen_open(Domain, ListenOpts, StartOpts, ExtraOpts, Backlog, BindAddr) ->
                       [{start_opts, StartOpts} |
                        setopts_opts(ErrRef, ListenOpts)]),
                 ok(ErrRef, call(Server, {setopts, Setopts})),
-                ok(ErrRef, call_bind(Server, default_any(Domain, BindAddr))),
+                ok(ErrRef, call_bind(
+                             Server,
+                             default_any(Domain, BindAddr, ExtraOpts)
+                            )),
                 Socket = val(ErrRef, call(Server, {listen, Backlog})),
                 {ok, ?MODULE_socket(Server, Socket)}
             catch
-- 
2.31.1

Places

File 0213-fix-do-not-bind-on-FD-with-undefined-ifaddr.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Places