File 2024-esock-Add-support-for-ioctl-request-sifbrd... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2024-esock-Add-support-for-ioctl-request-sifbrdaddr.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Currently displaying revision f11a8876faa0a8240b9c8df85bc35eb2 , Show latest

From f240060375cebfb61003216df25cec6b69bdf0cd Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 1 Nov 2021 15:36:16 +0100
Subject: [PATCH 24/58] [esock] Add support for ioctl request 'sifbrdaddr'

Not yet tested!

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 95 ++++++++++++++++++++-
 lib/kernel/doc/src/socket.xml               |  6 ++
 lib/kernel/src/socket.erl                   |  5 +-
 3 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 6ff37abe6a..8cbd83723a 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1941,6 +1941,10 @@ static ERL_NIF_TERM esock_ioctl_sifdstaddr(ErlNifEnv*       env,
 static ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv*       env,
 					   ESockDescriptor* descP,
 					   ERL_NIF_TERM     ename);
+static ERL_NIF_TERM esock_ioctl_sifbrdaddr(ErlNifEnv*       env,
+					   ESockDescriptor* descP,
+					   ERL_NIF_TERM     ename,
+					   ERL_NIF_TERM     eaddr);
 static ERL_NIF_TERM esock_ioctl_gifnetmask(ErlNifEnv*       env,
 					   ESockDescriptor* descP,
 					   ERL_NIF_TERM     ename);
@@ -4132,6 +4136,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(sifbrdaddr);       \
     LOCAL_ATOM_DECL(sifdstaddr);       \
     LOCAL_ATOM_DECL(sifmtu);           \
     LOCAL_ATOM_DECL(siftxqlen);        \
@@ -5250,6 +5255,10 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
   requests = MKC(env, MKT2(env, atom_sifdstaddr, MKUL(env, SIOCSIFDSTADDR)), requests);
 #endif
 
+#if defined(SIOCSIFBRDADDR)
+  requests = MKC(env, MKT2(env, atom_sifbrdaddr, MKUL(env, SIOCSIFBRDADDR)), requests);
+#endif
+
 #if defined(SIOCSIFMTU)
   requests = MKC(env, MKT2(env, atom_sifmtu, MKUL(env, SIOCSIFMTU)), requests);
 #endif
@@ -13074,6 +13083,7 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv*       env,
  * -------     -------   ---------    ------   ---------
  * sifaddr     name      string       Addr     sockaddr()
  * sifdstaddr  name      string       DstAddr  sockaddr()
+ * sifbrdaddr  name      string       BrdAddr  sockaddr()
  * gifmtu      name      string       MTU      integer()
  * giftxqlen   name      string       Len      integer()
  */
@@ -13101,6 +13111,12 @@ ERL_NIF_TERM esock_ioctl3(ErlNifEnv*       env,
     break;
 #endif
 
+#if defined(SIOCSIFBRDADDR)
+  case SIOCSIFBRDADDR:
+    return esock_ioctl_sifbrdaddr(env, descP, ename, eval);
+    break;
+#endif
+
 #if defined(SIOCSIFMTU)
   case SIOCSIFMTU:
     return esock_ioctl_sifmtu(env, descP, ename, eval);
@@ -13459,7 +13475,7 @@ ERL_NIF_TERM esock_ioctl_sifdstaddr(ErlNifEnv*       env,
 
   return result;
 
-}
+ }
 
 
 static
@@ -13517,6 +13533,83 @@ ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv*       env,
  }
 
 
+static
+ERL_NIF_TERM esock_ioctl_sifbrdaddr(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_sifbrdaddr {%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_broadaddr, &addrLen)) {
+
+    SSDBG( descP,
+	   ("SOCKET", "esock_ioctl_sifbrdaddr {%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_sifbrdaddr {%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_gifbrdaddr {%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_sifbrdaddr {%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;
+
+}
+
+
 #if defined(SIOCGIFNETMASK)
 static
 ERL_NIF_TERM esock_ioctl_gifnetmask(ErlNifEnv*       env,
diff --git a/lib/kernel/doc/src/socket.xml b/lib/kernel/doc/src/socket.xml
index 6aa215fc8d..23da5563da 100644
--- a/lib/kernel/doc/src/socket.xml
+++ b/lib/kernel/doc/src/socket.xml
@@ -2074,6 +2074,12 @@
 	    of a point-to-point interface with the specified name. </p>
           </item>
 
+	  <tag><c>sifbrdaddr</c></tag>
+          <item>
+	    <p>Set the broadcast address, <c>sockaddr()</c>,
+	    of the interface with the specified name. </p>
+          </item>
+
 	  <tag><c>sifmtu</c></tag>
           <item>
 	    <p>Set the MTU (Maximum Transfer Unit), <c>integer()</c>,
diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
index 6c0425d349..e168da9dae 100644
--- a/lib/kernel/src/socket.erl
+++ b/lib/kernel/src/socket.erl
@@ -4187,7 +4187,7 @@ ioctl(Socket, GetRequest, Arg) ->
 
 -spec ioctl(Socket, SetRequest, Name, Value) -> 'ok' | {'error', Reason} when
       Socket     :: socket(),
-      SetRequest :: 'sifaddr' | 'sifdstaddr' | 'gifmtu' | 'siftxqlen',
+      SetRequest :: 'sifaddr' | 'sifdstaddr' | 'sifbrdaddr' | 'gifmtu' | 'siftxqlen',
       Name       :: string(),
       Value      :: term(),
       Reason     :: posix() | 'closed'.
@@ -4198,6 +4198,9 @@ ioctl(?socket(SockRef), sifaddr = SetRequest, Name, 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), sifbrdaddr = SetRequest, Name, BrdAddr)
+  when is_list(Name) andalso is_map(BrdAddr) ->
+    prim_socket:ioctl(SockRef, SetRequest, Name, prim_socket:enc_sockaddr(BrdAddr));
 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 2024-esock-Add-support-for-ioctl-request-sifbrdaddr.patch of Package erlang (Revision f11a8876faa0a8240b9c8df85bc35eb2)

Places