File 0151-kernel-Make-inet-socknames-1-handle-new-ne... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0151-kernel-Make-inet-socknames-1-handle-new-new-sockets.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Currently displaying revision 740810ae07adffc1a50bb3a32135aa98 , Show latest

From 0682d8358a7fe568dbda652a34674164b133576e Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 15 Oct 2021 18:57:34 +0200
Subject: [PATCH 1/3] [kernel] Make inet:socknames/1 handle new 'new' sockets

Make inet:socknames/1 handle 'new' (socket) sockets.
inet:socknames/1 for TCP and UDP are a simple wrapper
for sockname/1. And since we have not yet implemented
support for sctp in socket, that (socknames-) problem,
is not yet solvet.

OTP-17531
---
 lib/kernel/src/gen_tcp_socket.erl | 13 +++++++++++++
 lib/kernel/src/gen_udp_socket.erl | 10 ++++++++++
 lib/kernel/src/inet.erl           |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/lib/kernel/src/gen_tcp_socket.erl b/lib/kernel/src/gen_tcp_socket.erl
index 339dadad3f..863a8772c0 100644
--- a/lib/kernel/src/gen_tcp_socket.erl
+++ b/lib/kernel/src/gen_tcp_socket.erl
@@ -33,6 +33,7 @@
          monitor/1, cancel_monitor/1,
          setopts/2, getopts/2,
          sockname/1, peername/1,
+         socknames/1,
          getstat/2
         ]).
 
@@ -519,11 +520,13 @@ setopts(?MODULE_socket(Server, _Socket), Opts) when is_list(Opts) ->
     call(Server, {setopts, normalize_setopts(Opts)}).
 
 
+
 %% -------------------------------------------------------------------------
 
 getopts(?MODULE_socket(Server, _Socket), Opts) when is_list(Opts) ->
     call(Server, {getopts, normalize_getopts(Opts)}).
 
+
 %% -------------------------------------------------------------------------
 
 sockname(?MODULE_socket(_Server, Socket)) ->
@@ -532,6 +535,16 @@ sockname(?MODULE_socket(_Server, Socket)) ->
         {error, _} = Error -> Error
     end.
 
+
+%% -------------------------------------------------------------------------
+
+socknames(Socket) ->
+    case sockname(Socket) of
+        {ok, Addr} -> {ok, [Addr]};
+        {error, _} = Error -> Error
+    end.
+
+
 %% -------------------------------------------------------------------------
 
 peername(?MODULE_socket(_Server, Socket)) ->
diff --git a/lib/kernel/src/gen_udp_socket.erl b/lib/kernel/src/gen_udp_socket.erl
index 0eb15de202..d6486cf6f1 100644
--- a/lib/kernel/src/gen_udp_socket.erl
+++ b/lib/kernel/src/gen_udp_socket.erl
@@ -38,6 +38,7 @@
          monitor/1, cancel_monitor/1,
          setopts/2, getopts/2,
          sockname/1, peername/1,
+         socknames/1,
          getstat/2
         ]).
 
@@ -521,6 +522,15 @@ sockname(?MODULE_socket(_Server, Socket)) ->
     end.
 
 
+%% -------------------------------------------------------------------------
+
+socknames(Socket) ->
+    case sockname(Socket) of
+        {ok, Addr} -> {ok, [Addr]};
+        {error, _} = Error -> Error
+    end.
+
+
 %% -------------------------------------------------------------------------
 
 peername(?MODULE_socket(_Server, Socket)) ->
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 36f79eed82..99bc8a6278 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -335,6 +335,8 @@ setsockname(Socket, undefined) ->
 			 returned_non_ip_address()]} |
 		       {error, posix()}.
 
+socknames(?module_socket(GenSocketMod, _) = Socket) when is_atom(GenSocketMod) ->
+    GenSocketMod:?FUNCTION_NAME(Socket);
 socknames(Socket) ->
     prim_inet:socknames(Socket).
 
-- 
2.31.1

Places

File 0151-kernel-Make-inet-socknames-1-handle-new-new-sockets.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Places