File 1211-Improve-handling-of-when-to-bind.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1211-Improve-handling-of-when-to-bind.patch of Package erlang (Revision c60a113e1eaed31d142b913626c9a44a)

Currently displaying revision c60a113e1eaed31d142b913626c9a44a , Show latest

From 10ff50ac2e7ce1385b910d2209481941f9a6810b Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 5 May 2021 17:54:51 +0200
Subject: [PATCH 1/3] Improve handling of when to bind

---
 lib/kernel/src/gen_tcp_socket.erl     | 26 +++++++++-----------
 lib/kernel/src/inet.erl               | 34 ++++++++++++++-------------
 lib/kernel/src/inet6_tcp.erl          | 17 ++++++++++----
 lib/kernel/src/inet6_udp.erl          |  7 +++---
 lib/kernel/src/inet_int.hrl           | 16 +++++++++----
 lib/kernel/src/inet_tcp.erl           | 17 ++++++++++----
 lib/kernel/src/inet_udp.erl           |  7 +++---
 lib/kernel/src/local_tcp.erl          |  8 +++----
 lib/kernel/src/local_udp.erl          | 19 ++++++---------
 lib/kernel/test/gen_tcp_api_SUITE.erl | 15 +++++++-----
 10 files changed, 95 insertions(+), 71 deletions(-)

diff --git a/lib/kernel/src/gen_tcp_socket.erl b/lib/kernel/src/gen_tcp_socket.erl
index c1f67ca757..063e26ee9d 100644
--- a/lib/kernel/src/gen_tcp_socket.erl
+++ b/lib/kernel/src/gen_tcp_socket.erl
@@ -121,7 +121,7 @@ connect_lookup(Address, Port, Opts, Timer) ->
             opts = ConnectOpts}} ->
             %%
             %% ?DBG({Domain, BindIP}),
-            BindAddr = bind_addr(Domain, BindIP, BindPort, Fd),
+            BindAddr = bind_addr(Domain, BindIP, BindPort),
             ExtraOpts = extra_opts(Fd),
             connect_open(
               Addrs, Domain, ConnectOpts, StartOpts, ExtraOpts,
@@ -200,21 +200,17 @@ extra_opts(OpenOpts) when is_list(OpenOpts) ->
    maps:from_list(OpenOpts).
 
 
-bind_addr(_Domain, BindIP, _BindPort, Fd)
-  when BindIP =:= undefined;
-       is_integer(Fd), 0 =< Fd ->
+bind_addr(_Domain, BindIP, BindPort) when BindIP =:= undefined ->
+    erlang:display({?MODULE,?FUNCTION_NAME,[_Domain, BindIP, BindPort]}),
+    0 = BindPort,
     %% Do not bind!
     undefined;
-bind_addr(Domain, BindIP, BindPort, _Fd) ->
-    case Domain of
-        local ->
-            case BindIP of
-                any ->
-                    undefined;
-                {local, Path} ->
-                    #{family => Domain,
-                      path   => Path}
-            end;
+bind_addr(Domain, BindIP, BindPort) ->
+    erlang:display({?MODULE,?FUNCTION_NAME,[Domain, BindIP, BindPort]}),
+    case BindIP of
+        {Domain, Path} when Domain =:= local ->
+            #{family => Domain,
+              path   => Path};
         _ when Domain =:= inet;
                Domain =:= inet6 ->
             #{family => Domain,
@@ -253,7 +249,7 @@ listen(Port, Opts) ->
                     %%
                     Domain = domain(Mod),
                     %% ?DBG({Domain, BindIP}),
-                    BindAddr = bind_addr(Domain, BindIP, BindPort, Fd),
+                    BindAddr = bind_addr(Domain, BindIP, BindPort),
                     ExtraOpts = extra_opts(Fd),
 		    %% ?DBG([{listen_opts, ListenOpts}, {backlog, Backlog}]),
                     listen_open(
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 5c4c578147..1d65885a5e 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1282,11 +1282,14 @@ binary2filename(Bin) ->
 	    Bin
     end.
 
-translate_ip(any,      inet) -> {0,0,0,0};
-translate_ip(loopback, inet) -> {127,0,0,1};
+%% Protocol independent, i.e common code for all
+%% inet_* and inet6_* modules
+%%
+translate_ip(any,      inet)  -> {0,0,0,0};
+translate_ip(loopback, inet)  -> {127,0,0,1};
 translate_ip(any,      inet6) -> {0,0,0,0,0,0,0,0};
 translate_ip(loopback, inet6) -> {0,0,0,0,0,0,0,1};
-translate_ip(IP, _) -> IP.
+translate_ip(IP, _)           -> IP.  % undefined goes here
 
 mod(Opts, Tag, Address, Map) ->
     mod(Opts, Tag, Address, Map, undefined, []).
@@ -1633,25 +1636,24 @@ change_bindx_0_port({_IP, _Port}=Addr, _AssignedPort) ->
 	{'ok', socket()} | {'error', posix()}.
 
 fdopen(Fd, Opts, Protocol, Family, Type, Module) ->
-    fdopen(Fd, any, 0, Opts, Protocol, Family, Type, Module).
+    fdopen(Fd, undefined, 0, Opts, Protocol, Family, Type, Module).
 
 fdopen(Fd, Addr, Port, Opts, Protocol, Family, Type, Module) ->
-    Bound =
-	%% We do not do any binding if default port+addr options
+    DoNotBind =
+	%% We do not do any binding if no port+addr options
 	%% were given, in order to keep backwards compatability
 	%% with pre Erlang/OTP 17
-	case Addr of
-	    {0,0,0,0} when Port =:= 0 -> true;
-	    {0,0,0,0,0,0,0,0} when Port =:= 0 -> true;
-	    any when Port =:= 0 -> true;
-	    _ -> false
-	end,
-    case prim_inet:fdopen(Protocol, Family, Type, Fd, Bound) of
+        Addr =:= undefined, % Presumably already bound
+    if
+        DoNotBind ->
+            0 = Port, ok; % Assertion
+        true ->
+            ok
+    end,
+    case prim_inet:fdopen(Protocol, Family, Type, Fd, DoNotBind) of
 	{ok, S} ->
 	    case prim_inet:setopts(S, Opts) of
-		ok
-		  when Addr =:= undefined;
-		       Bound ->
+		ok when DoNotBind ->
 		    inet_db:register_socket(S, Module),
 		    {ok, S};
 		ok ->
diff --git a/lib/kernel/src/inet6_tcp.erl b/lib/kernel/src/inet6_tcp.erl
index cdb101e86a..28f6194484 100644
--- a/lib/kernel/src/inet6_tcp.erl
+++ b/lib/kernel/src/inet6_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -153,12 +153,21 @@ listen(Port, Opts) ->
 	{ok,
 	 #listen_opts{
 	    fd = Fd,
-	    ifaddr = BAddr = {A,B,C,D,E,F,G,H},
+	    ifaddr = BAddr,
 	    port = BPort,
 	    opts = SockOpts} = R}
-	when ?ip6(A,B,C,D,E,F,G,H), ?port(BPort) ->
+          when ?ip6(BAddr), ?port(BPort);
+               BAddr =:= undefined ->
 	    case inet:open(
-		   Fd, BAddr, BPort, SockOpts,
+		   Fd,
+                   if
+                       BAddr =:= undefined andalso
+                       (not (is_integer(Fd) andalso 0 =< Fd)) ->
+                           inet:translate_ip(any, ?FAMILY);
+                       true ->
+                           BAddr
+                   end,
+                   BPort, SockOpts,
 		   ?PROTO, ?FAMILY, ?TYPE, ?MODULE) of
 		{ok, S} ->
 		    case prim_inet:listen(S, R#listen_opts.backlog) of
diff --git a/lib/kernel/src/inet6_udp.erl b/lib/kernel/src/inet6_udp.erl
index b8c33e91ec..b2aa0124a5 100644
--- a/lib/kernel/src/inet6_udp.erl
+++ b/lib/kernel/src/inet6_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -56,10 +56,11 @@ open(Port, Opts) ->
 	{ok,
 	 #udp_opts{
 	    fd = Fd,
-	    ifaddr = BAddr = {A,B,C,D,E,F,G,H},
+	    ifaddr = BAddr,
 	    port = BPort,
 	    opts = SockOpts}}
-	when ?ip6(A,B,C,D,E,F,G,H), ?port(BPort) ->
+          when ?ip6(BAddr), ?port(BPort);
+               BAddr =:= undefined ->
 	    inet:open(
 	      Fd, BAddr, BPort, SockOpts, ?PROTO, ?FAMILY, ?TYPE, ?MODULE);
 	{ok, _} -> exit(badarg)
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index 4c69d7359c..5f84575153 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -373,10 +373,18 @@
 %% macro for use in guard for checking ip address {A,B,C,D}
 -define(ip(A,B,C,D),
 	(((A) bor (B) bor (C) bor (D)) band (bnot 16#ff)) =:= 0).
+-define(ip(Addr),
+        ?ip(element(1, (Addr)), element(2, (Addr)),
+            element(3, (Addr)), element(4, (Addr)))).
 
 -define(ip6(A,B,C,D,E,F,G,H), 
 	(((A) bor (B) bor (C) bor (D) bor (E) bor (F) bor (G) bor (H)) 
 	 band (bnot 16#ffff)) =:= 0).
+-define(ip6(Addr),
+        ?ip6(element(1, (Addr)), element(2, (Addr)),
+             element(3, (Addr)), element(4, (Addr)),
+             element(5, (Addr)), element(6, (Addr)),
+             element(7, (Addr)), element(8, (Addr)))).
 
 -define(ether(A,B,C,D,E,F), 
 	(((A) bor (B) bor (C) bor (D) bor (E) bor (F)) 
@@ -395,7 +403,7 @@
 %%
 -record(connect_opts, 
 	{ 
-	  ifaddr = undefined,   %% don't bind explicitly, let connect decide
+	  ifaddr,           %% don't bind explicitly, let connect decide
 	  port   = 0,       %% bind to port (default is dynamic port)
 	  fd     = -1,      %% fd >= 0 => already bound
 	  opts   = []       %% [{active,true}] added in inet:connect_options
@@ -403,7 +411,7 @@
 
 -record(listen_opts, 
 	{ 
-	  ifaddr = any,              %% bind to interface address
+	  ifaddr,                    %% interpreted as 'any' in *_tcp.erl
 	  port   = 0,                %% bind to port (default is dynamic port)
 	  backlog = ?LISTEN_BACKLOG, %% backlog
 	  fd      = -1,              %% %% fd >= 0 => already bound
@@ -413,7 +421,7 @@
 
 -record(udp_opts,
 	{
-	  ifaddr = any,
+	  ifaddr,
 	  port   = 0,
 	  fd     = -1,
 	  opts   = [{active,true}]
diff --git a/lib/kernel/src/inet_tcp.erl b/lib/kernel/src/inet_tcp.erl
index 5bee75d7a2..e5c9df2dde 100644
--- a/lib/kernel/src/inet_tcp.erl
+++ b/lib/kernel/src/inet_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -150,12 +150,21 @@ listen(Port, Opts) ->
 	{ok,
 	 #listen_opts{
 	    fd = Fd,
-	    ifaddr = BAddr = {A,B,C,D},
+	    ifaddr = BAddr,
 	    port = BPort,
 	    opts = SockOpts} = R}
-	when ?ip(A,B,C,D), ?port(BPort) ->
+          when ?ip(BAddr), ?port(BPort);
+               BAddr =:= undefined ->
 	    case inet:open(
-		   Fd, BAddr, BPort, SockOpts,
+		   Fd,
+                   if
+                       BAddr =:= undefined andalso
+                       (not (is_integer(Fd) andalso 0 =< Fd)) ->
+                           inet:translate_ip(any, ?FAMILY);
+                       true ->
+                           BAddr
+                   end,
+                   BPort, SockOpts,
 		   ?PROTO, ?FAMILY, ?TYPE, ?MODULE) of
 		{ok, S} ->
 		    case prim_inet:listen(S, R#listen_opts.backlog) of
diff --git a/lib/kernel/src/inet_udp.erl b/lib/kernel/src/inet_udp.erl
index 00ebd4bb1d..b895d33baf 100644
--- a/lib/kernel/src/inet_udp.erl
+++ b/lib/kernel/src/inet_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -57,10 +57,11 @@ open(Port, Opts) ->
 	{ok,
 	 #udp_opts{
 	    fd = Fd,
-	    ifaddr = BAddr = {A,B,C,D},
+	    ifaddr = BAddr,
 	    port = BPort,
 	    opts = SockOpts}}
-	  when ?ip(A,B,C,D), ?port(BPort) ->
+	  when ?ip(BAddr), ?port(BPort);
+               BAddr =:= undefined ->
 	    inet:open(
 	      Fd, BAddr, BPort, SockOpts, ?PROTO, ?FAMILY, ?TYPE, ?MODULE);
 	{ok, _} -> exit(badarg)
diff --git a/lib/kernel/src/local_tcp.erl b/lib/kernel/src/local_tcp.erl
index 0d8bbba583..da0b10b0e0 100644
--- a/lib/kernel/src/local_tcp.erl
+++ b/lib/kernel/src/local_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ getaddrs({?FAMILY, _} = Address) -> {ok, [Address]}.
 getaddrs({?FAMILY, _} = Address, _Timer) -> {ok, [Address]}.
 
 %% special this side addresses
-translate_ip(IP) -> IP.
+translate_ip(IP) -> local_udp:translate_ip(IP).
 
 %%
 %% Send data on a socket
@@ -131,8 +131,8 @@ listen(0, Opts) ->
 	    ifaddr = BAddr,
 	    port = 0,
 	    opts = SockOpts} = R}
-	when tuple_size(BAddr) =:= 2, element(1, BAddr) =:= ?FAMILY;
-	     BAddr =:= any ->
+          when tuple_size(BAddr) =:= 2, element(1, BAddr) =:= ?FAMILY;
+               BAddr =:= undefined ->
 	    case inet:open(
 		   Fd, BAddr, 0, SockOpts,
 		   ?PROTO, ?FAMILY, ?TYPE, ?MODULE) of
diff --git a/lib/kernel/src/local_udp.erl b/lib/kernel/src/local_udp.erl
index 9fe26df42c..7cd9633d93 100644
--- a/lib/kernel/src/local_udp.erl
+++ b/lib/kernel/src/local_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -41,7 +41,9 @@ getaddr({?FAMILY, _} = Address) -> {ok, Address}.
 getaddr({?FAMILY, _} = Address, _Timer) -> {ok, Address}.
 
 %% special this side addresses
-translate_ip(IP) -> IP.
+translate_ip(any)      -> undefined;       % Not for this ?FAMILY
+translate_ip(loopback) -> {?FAMILY, <<>>}; % Abstract address on Linux
+translate_ip(IP)       -> IP.              % undefined goes here
 
 open(0) -> open(0, []).
 %%
@@ -56,17 +58,10 @@ open(0, Opts) ->
 	    ifaddr = BAddr,
 	    port = 0,
 	    opts = SockOpts}}
-	when tuple_size(BAddr) =:= 2, element(1, BAddr) =:= ?FAMILY;
-	     BAddr =:= any ->
+          when tuple_size(BAddr) =:= 2, element(1, BAddr) =:= ?FAMILY;
+               BAddr =:= undefined ->
 	    inet:open(
-	      Fd,
-	      case BAddr of
-		  any ->
-		      undefined;
-		  _ ->
-		      BAddr
-	      end,
-	      0, SockOpts, ?PROTO, ?FAMILY, ?TYPE, ?MODULE);
+	      Fd, BAddr, 0, SockOpts, ?PROTO, ?FAMILY, ?TYPE, ?MODULE);
 	{ok, _} -> exit(badarg)
     end.
 
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 5d305868a1..004aedb749 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -505,7 +505,7 @@ t_fdopen(Config) when is_list(Config) ->
     ?P("fdopen -> accepted: "
        "~n   A:  ~p"
        "~n   FD: ~p", [A, FD]),
-    {ok, Server}    = gen_tcp:fdopen(FD, []),
+    {ok, Server}    = gen_tcp:fdopen(FD, ?INET_BACKEND_OPTS(Config)),
     ok              = gen_tcp:send(Client, Question),
     {ok, Question}  = gen_tcp:recv(Server, length(Question), 2000),
     ok              = gen_tcp:send(Client, Question1),
@@ -783,11 +783,13 @@ do_local_fdopen(Config) ->
     _ = file:delete(SFile),
     %%
     InetBackendOpts = ?INET_BACKEND_OPTS(Config),
-    ?P("create listen socket with ifaddr ~p", [SAddr]),
-    L = ok(gen_tcp:listen(0, InetBackendOpts ++ [{ifaddr,SAddr},{active,false}])),
+    ListenOpts = InetBackendOpts ++ [{ifaddr,SAddr},{active,false}],
+    ?P("create listen socket with ListenOpts ~p", [ListenOpts]),
+    L = ok(gen_tcp:listen(0, ListenOpts)),
+    ConnectOpts = InetBackendOpts ++ [{active,false}],
     ?P("listen socket created: ~p"
-       "~n   => try connect", [L]),
-    C0 = ok(gen_tcp:connect(SAddr, 0, InetBackendOpts ++ [{active,false}])),
+       "~n   => try connect ~p", [L, ConnectOpts]),
+    C0 = ok(gen_tcp:connect(SAddr, 0, ConnectOpts)),
     ?P("connected: ~p"
        "~n   => get fd", [C0]),
     Fd = if
@@ -805,7 +807,7 @@ do_local_fdopen(Config) ->
          end,
     ?P("ignored fd:"
        "~n   => try fdopen (local)"),
-    C = ok(gen_tcp:fdopen(Fd, [local])),
+    C = ok(gen_tcp:fdopen(Fd, ?INET_BACKEND_OPTS(Config) ++ [local])),
     ?P("fd open: ~p"
        "~n   => try accept", [C]),
     S = ok(gen_tcp:accept(L)),
@@ -994,6 +996,7 @@ do_local_abstract(Config) ->
 
 
 local_handshake(S, SAddr, C, CAddr) ->
+    ?P("~w(~p, ~p, ~p, ~p)~n", [?FUNCTION_NAME, S, SAddr, C, CAddr]),
     SData = "9876543210",
     CData = "0123456789",
     SAddr = ok(inet:sockname(S)),
-- 
2.26.2

Places

File 1211-Improve-handling-of-when-to-bind.patch of Package erlang (Revision c60a113e1eaed31d142b913626c9a44a)

Places