File 2022-esock-Add-support-for-ioctl-request-sifadd... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2022-esock-Add-support-for-ioctl-request-sifaddr.patch of Package erlang (Revision e3704281f725978c5a26174cd59024d0)

Currently displaying revision e3704281f725978c5a26174cd59024d0 , Show latest

From 83ba922f3fccc4871fd911b21973921054daf9df Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 1 Nov 2021 10:17:48 +0100
Subject: [PATCH 22/58] [esock] Add support for ioctl request 'sifaddr'

Not yet tested!

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 101 +++++++++++++++++++-
 erts/emulator/nifs/common/socket_util.h     |   1 +
 lib/kernel/src/socket.erl                   |   5 +-
 3 files changed, 102 insertions(+), 5 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index d90c209042..936b32884a 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1927,6 +1927,10 @@ static ERL_NIF_TERM esock_ioctl_gifflags(ErlNifEnv*       env,
 static ERL_NIF_TERM esock_ioctl_gifaddr(ErlNifEnv*       env,
 					ESockDescriptor* descP,
 					ERL_NIF_TERM     ename);
+static ERL_NIF_TERM esock_ioctl_sifaddr(ErlNifEnv*       env,
+					ESockDescriptor* descP,
+					ERL_NIF_TERM     ename,
+					ERL_NIF_TERM     eaddr);
 static ERL_NIF_TERM esock_ioctl_gifdstaddr(ErlNifEnv*       env,
 					   ESockDescriptor* descP,
 					   ERL_NIF_TERM     ename);
@@ -4123,6 +4127,7 @@ ERL_NIF_TERM esock_atom_socket_tag; // This has a "special" name ('$socket')
     LOCAL_ATOM_DECL(sendfile_tries);   \
     LOCAL_ATOM_DECL(sendfile_waits);   \
     LOCAL_ATOM_DECL(shutdown);         \
+    LOCAL_ATOM_DECL(sifaddr);          \
     LOCAL_ATOM_DECL(sifmtu);           \
     LOCAL_ATOM_DECL(siftxqlen);        \
     LOCAL_ATOM_DECL(slist);            \
@@ -5232,6 +5237,10 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
 #endif
 
   /* --- SET REQUESTS --- */
+#if defined(SIOCSIFADDR)
+  requests = MKC(env, MKT2(env, atom_sifaddr, MKUL(env, SIOCSIFADDR)), requests);
+#endif
+
 #if defined(SIOCSIFMTU)
   requests = MKC(env, MKT2(env, atom_sifmtu, MKUL(env, SIOCSIFMTU)), requests);
 #endif
@@ -5931,7 +5940,7 @@ ERL_NIF_TERM nif_bind(ErlNifEnv*         env,
     ESockDescriptor* descP;
     ERL_NIF_TERM     eSockAddr, ret;
     ESockAddress     sockAddr;
-    SOCKLEN_T       addrLen;
+    SOCKLEN_T        addrLen;
 
     ESOCK_ASSERT( argc == 2 );
 
@@ -13054,8 +13063,9 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv*       env,
  *
  * Request     arg1      arg1 type    arg2     arg2 type
  * -------     -------   ---------    ------   ---------
- * gifmtu      name      string       MTU      integer
- * giftxqlen   name      string       Len      integer
+ * sifaddr     name      string       Addr     sockaddr()
+ * gifmtu      name      string       MTU      integer()
+ * giftxqlen   name      string       Len      integer()
  */
 static
 ERL_NIF_TERM esock_ioctl3(ErlNifEnv*       env,
@@ -13069,6 +13079,12 @@ ERL_NIF_TERM esock_ioctl3(ErlNifEnv*       env,
 
   switch (req) {
 
+#if defined(SIOCSIFADDR)
+  case SIOCSIFADDR:
+    return esock_ioctl_sifaddr(env, descP, ename, eval);
+    break;
+#endif
+
 #if defined(SIOCSIFMTU)
   case SIOCSIFMTU:
     return esock_ioctl_sifmtu(env, descP, ename, eval);
@@ -13221,7 +13237,84 @@ ERL_NIF_TERM esock_ioctl_gifaddr(ErlNifEnv*       env,
 }
 
 
-  static
+static
+ERL_NIF_TERM esock_ioctl_sifaddr(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_sifaddr {%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_addr, &addrLen)) {
+
+    SSDBG( descP,
+	   ("SOCKET", "esock_ioctl_sifaddr {%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_sifaddr {%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_gifaddr {%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_sifaddr {%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_gifdstaddr(ErlNifEnv*       env,
 				    ESockDescriptor* descP,
 				    ERL_NIF_TERM     ename)
diff --git a/erts/emulator/nifs/common/socket_util.h b/erts/emulator/nifs/common/socket_util.h
index 80ea62b8ab..6fcb20ac6a 100644
--- a/erts/emulator/nifs/common/socket_util.h
+++ b/erts/emulator/nifs/common/socket_util.h
@@ -36,6 +36,7 @@
 #define LONG(L)  ((long) (L))
 #define ULONG(L) ((unsigned long) (L))
 #define SZT(I)   ((size_t) (I))
+#define VOID(D)  ((void) (D))
 #define VOIDP(P) ((void*) (P))
 #define CHARP(P) ((char*) (P))
 #define UCHARP(P) ((unsigned char*) (P))
diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
index ad284a5de2..11e9a1d733 100644
--- a/lib/kernel/src/socket.erl
+++ b/lib/kernel/src/socket.erl
@@ -4187,11 +4187,14 @@ ioctl(Socket, GetRequest, Arg) ->
 
 -spec ioctl(Socket, SetRequest, Name, Value) -> 'ok' | {'error', Reason} when
       Socket     :: socket(),
-      SetRequest :: 'gifmtu' | 'siftxqlen',
+      SetRequest :: 'sifaddr' | 'gifmtu' | 'siftxqlen',
       Name       :: string(),
       Value      :: integer(),
       Reason     :: posix() | 'closed'.
 
+ioctl(?socket(SockRef), sifaddr = SetRequest, Name, Addr)
+  when is_list(Name) ->
+    prim_socket:ioctl(SockRef, SetRequest, Name, prim_socket:enc_sockaddr(Addr));
 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 2022-esock-Add-support-for-ioctl-request-sifaddr.patch of Package erlang (Revision e3704281f725978c5a26174cd59024d0)

Places