File 2023-esock-Add-support-for-ioctl-request-sifdst... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2023-esock-Add-support-for-ioctl-request-sifdstaddr.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From ec64ae0046123c77dcde17ec1fcd4a6a904a58fd Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 1 Nov 2021 12:41:39 +0100
Subject: [PATCH 23/58] [esock] Add support for ioctl request 'sifdstaddr'

Not yet tested!

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 97 ++++++++++++++++++++-
 lib/kernel/doc/src/socket.xml               | 13 +++
 lib/kernel/src/socket.erl                   |  9 +-
 3 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 936b32884a..6ff37abe6a 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1934,6 +1934,10 @@ static ERL_NIF_TERM esock_ioctl_sifaddr(ErlNifEnv* env,
 static ERL_NIF_TERM esock_ioctl_gifdstaddr(ErlNifEnv* env,
 					 ESockDescriptor* descP,
 					 ERL_NIF_TERM ename);
+static ERL_NIF_TERM esock_ioctl_sifdstaddr(ErlNifEnv* env,
+					 ESockDescriptor* descP,
+					 ERL_NIF_TERM ename,
+					 ERL_NIF_TERM eaddr);
 static ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv* env,
 					 ESockDescriptor* descP,
 					 ERL_NIF_TERM ename);
@@ -4128,6 +4132,7 @@ ERL_NIF_TERM esock_atom_socket_tag; // This has a "special" name ('$socket')
 LOCAL_ATOM_DECL(sendfile_waits); \
 LOCAL_ATOM_DECL(shutdown); \
 LOCAL_ATOM_DECL(sifaddr); \
+ LOCAL_ATOM_DECL(sifdstaddr); \
 LOCAL_ATOM_DECL(sifmtu); \
 LOCAL_ATOM_DECL(siftxqlen); \
 LOCAL_ATOM_DECL(slist); \
@@ -5241,6 +5246,10 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
 requests = MKC(env, MKT2(env, atom_sifaddr, MKUL(env, SIOCSIFADDR)), requests);
 #endif
 
+#if defined(SIOCSIFDSTADDR)
+ requests = MKC(env, MKT2(env, atom_sifdstaddr, MKUL(env, SIOCSIFDSTADDR)), requests);
+#endif
+
 #if defined(SIOCSIFMTU)
 requests = MKC(env, MKT2(env, atom_sifmtu, MKUL(env, SIOCSIFMTU)), requests);
 #endif
@@ -12874,7 +12883,7 @@ ERL_NIF_TERM nif_ioctl(ErlNifEnv* env,
 
 MLOCK(descP->readMtx);
 
- /* One argument: request */
+ /* Two arguments: Socket and get request */
 res = esock_ioctl1(env, descP, req);
 
 MUNLOCK(descP->readMtx);
@@ -13064,6 +13073,7 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv* env,
 * Request arg1 arg1 type arg2 arg2 type
 * ------- ------- --------- ------ ---------
 * sifaddr name string Addr sockaddr()
+ * sifdstaddr name string DstAddr sockaddr()
 * gifmtu name string MTU integer()
 * giftxqlen name string Len integer()
 */
@@ -13085,6 +13095,12 @@ ERL_NIF_TERM esock_ioctl3(ErlNifEnv* env,
 break;
 #endif
 
+#if defined(SIOCSIFDSTADDR)
+ case SIOCSIFDSTADDR:
+ return esock_ioctl_sifdstaddr(env, descP, ename, eval);
+ break;
+#endif
+
 #if defined(SIOCSIFMTU)
 case SIOCSIFMTU:
 return esock_ioctl_sifmtu(env, descP, ename, eval);
@@ -13369,7 +13385,84 @@ ERL_NIF_TERM esock_ioctl_gifdstaddr(ErlNifEnv* env,
 }
 
 
- static
+static
+ERL_NIF_TERM esock_ioctl_sifdstaddr(ErlNifEnv* env,
+				 ESockDescriptor* descP,
+				 ERL_NIF_TERM ename,
+				 ERL_NIF_TERM eaddr)
+{
+ ERL_NIF_TERM result;
+ struct ifreq ifreq;
+ char* ifn = NULL;
+ int nlen;
+ SOCKLEN_T addrLen;
+
+ SSDBG( descP, ("SOCKET", "esock_ioctl_sifdstaddr {%d} -> entry with"
+		 "\r\n (e)Name: %T"
+		 "\r\n (e)Addr: %T"
+		 "\r\n", descP->sock, ename, eaddr) );
+
+ if (!esock_decode_string(env, ename, &ifn)) {
+
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_sifaddr {%d} -> failed decode name"
+	 "\r\n", descP->sock) );
+
+ return enif_make_badarg(env);
+ }
+
+
+ if (! esock_decode_sockaddr(env, eaddr,
+			 (ESockAddress*) &ifreq.ifr_dstaddr, &addrLen)) {
+
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_sifdstaddr {%d} -> failed decode addr"
+	 "\r\n", descP->sock) );
+
+ return esock_make_invalid(env, atom_sockaddr);
+ }
+ VOID(addrLen);
+
+
+ // Make sure the length of the string is valid!
+ nlen = esock_strnlen(ifn, IFNAMSIZ);
+ 
+ sys_memset(ifreq.ifr_name, '\0', IFNAMSIZ); // Just in case
+ sys_memcpy(ifreq.ifr_name, ifn, 
+	 (nlen >= IFNAMSIZ) ? IFNAMSIZ-1 : nlen);
+ 
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_sifdstaddr {%d} -> try ioctl\r\n", descP->sock) );
+
+ if (ioctl(descP->sock, SIOCSIFADDR, (char *) &ifreq) < 0) {
+ int saveErrno = sock_errno();
+ ERL_NIF_TERM reason = MKA(env, erl_errno_id(saveErrno));
+
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_gifdstaddr {%d} -> failure: "
+	 "\r\n reason: %T (%d)"
+	 "\r\n", descP->sock, reason, saveErrno) );
+
+ result = esock_make_error(env, reason);
+
+ } else {
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_sifdstaddr {%d} -> addr successfully set\r\n",
+	 descP->sock) );
+ result = esock_atom_ok;
+ }
+
+ /* We know that if esock_decode_string is successful,
+ * we have "some" form of string, and therefor memory
+ * has been allocated (and need to be freed)... */
+ FREE(ifn);
+
+ return result;
+
+}
+
+
+static
 ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv* env,
 				 ESockDescriptor* descP,
 				 ERL_NIF_TERM ename)
diff --git a/lib/kernel/doc/src/socket.xml b/lib/kernel/doc/src/socket.xml
index 8c267ae64d..6aa215fc8d 100644
--- a/lib/kernel/doc/src/socket.xml
+++ b/lib/kernel/doc/src/socket.xml
@@ -2059,8 +2059,21 @@
 	argument is the "key", identifying the
 	interface (usually the name of the interface), and the
 	fourth is the "new" value.
+	These are privileged operation's. 
 <taglist>
 
+	 <tag><c>sifaddr</c></tag>
+ <item>
+	 Set the address, <c>sockaddr()</c>,
+	 of the interface with the specified name. 
+ </item>
+
+	 <tag><c>sifdstaddr</c></tag>
+ <item>
+	 Set the destination address, <c>sockaddr()</c>,
+	 of a point-to-point interface with the specified name. 
+ </item>
+
 	 <tag><c>sifmtu</c></tag>
 <item>
 	 Set the MTU (Maximum Transfer Unit), <c>integer()</c>,
diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
index 11e9a1d733..6c0425d349 100644
--- a/lib/kernel/src/socket.erl
+++ b/lib/kernel/src/socket.erl
@@ -4187,14 +4187,17 @@ ioctl(Socket, GetRequest, Arg) ->
 
 -spec ioctl(Socket, SetRequest, Name, Value) -> 'ok' | {'error', Reason} when
 Socket :: socket(),
- SetRequest :: 'sifaddr' | 'gifmtu' | 'siftxqlen',
+ SetRequest :: 'sifaddr' | 'sifdstaddr' | 'gifmtu' | 'siftxqlen',
 Name :: string(),
- Value :: integer(),
+ Value :: term(),
 Reason :: posix() | 'closed'.
 
 ioctl(?socket(SockRef), sifaddr = SetRequest, Name, Addr)
- when is_list(Name) ->
+ when is_list(Name) andalso is_map(Addr) ->
 prim_socket:ioctl(SockRef, SetRequest, Name, prim_socket:enc_sockaddr(Addr));
+ioctl(?socket(SockRef), sifdstaddr = SetRequest, Name, DstAddr)
+ when is_list(Name) andalso is_map(DstAddr) ->
+ prim_socket:ioctl(SockRef, SetRequest, Name, prim_socket:enc_sockaddr(DstAddr));
 ioctl(?socket(SockRef), sifmtu = SetRequest, Name, MTU)
 when is_list(Name) andalso is_integer(MTU) ->
 prim_socket:ioctl(SockRef, SetRequest, Name, MTU);
-- 
2.31.1

Places

File 2023-esock-Add-support-for-ioctl-request-sifdstaddr.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places