File 0239-kernel-gen-tcp-socket-Tweak-bind.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0239-kernel-gen-tcp-socket-Tweak-bind.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Currently displaying revision a0b3ae25eeaaf8007a46a3a2b2ca2729 , Show latest

From 6c8d9cfd2d155d3c66212404b3b71bec2f4cc8f5 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 23 Jul 2021 18:35:36 +0200
Subject: [PATCH 1/2] [kernel|gen-tcp-socket] Tweak bind

It should be possible to bind to a port, but not address.
That is if you provide a port number but no address when
creating a socket (connect or listen). This case should be
mapped to #{port => Port, addr => any}.

OTP-17156
---
 lib/kernel/src/gen_tcp_socket.erl | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/kernel/src/gen_tcp_socket.erl b/lib/kernel/src/gen_tcp_socket.erl
index 46b8b1f0db..815a1079ec 100644
--- a/lib/kernel/src/gen_tcp_socket.erl
+++ b/lib/kernel/src/gen_tcp_socket.erl
@@ -219,21 +219,24 @@ default_any(Domain, undefined = Undefined) ->
 default_any(_Domain, BindAddr) ->
     BindAddr.
 
-bind_addr(_Domain, BindIP, BindPort) when BindIP =:= undefined ->
-    0 = BindPort, % Assert
+bind_addr(_Domain, BindIP, BindPort)
+  when ((BindIP =:= undefined) andalso (BindPort =:= 0)) ->
     %% Do not bind!
     undefined;
-bind_addr(Domain, BindIP, BindPort) ->
+bind_addr(local = Domain, BindIP, _BindPort) ->
     case BindIP of
-        {Domain, Path} when Domain =:= local ->
-            #{family => Domain,
-              path   => Path};
-        _ when Domain =:= inet;
-               Domain =:= inet6 ->
-            #{family => Domain,
-              addr   => BindIP,
-              port   => BindPort}
-    end.
+	any ->
+	    undefined;
+	{local, Path} ->
+	    #{family => Domain,
+	      path   => Path}
+    end;
+bind_addr(Domain, BindIP, BindPort)
+  when (Domain =:= inet) orelse (Domain =:= inet6) ->
+    Addr = if (BindIP =:= undefined) -> any; true -> BindIP end,
+    #{family => Domain,
+      addr   => Addr,
+      port   => BindPort}.
 
 call_bind(_Server, undefined) ->
     ok;
-- 
2.31.1

Places

File 0239-kernel-gen-tcp-socket-Tweak-bind.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Places