File 2008-esock-Add-support-for-ioctl-request-gifnet... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From 4b244103051f96b2d1119dd6a2048cf714637d52 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 26 Oct 2021 12:43:37 +0200
Subject: [PATCH 08/58] [esock] Add support for ioctl request 'gifnetmask'

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 71 ++++++++++++++++++++-
 lib/kernel/src/socket.erl                   |  6 +-
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 21f732d4ae..bd43cfa444 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1756,6 +1756,9 @@ static ERL_NIF_TERM esock_ioctl_gifdstaddr(ErlNifEnv*       env,
 static ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv*       env,
 					   ESockDescriptor* descP,
 					   ERL_NIF_TERM     ename);
+static ERL_NIF_TERM esock_ioctl_gifnetmask(ErlNifEnv*       env,
+					   ESockDescriptor* descP,
+					   ERL_NIF_TERM     ename);
 static ERL_NIF_TERM esock_ioctl_gifindex(ErlNifEnv*       env,
 					 ESockDescriptor* descP,
 					 ERL_NIF_TERM     ename);
@@ -3781,6 +3784,7 @@ ERL_NIF_TERM esock_atom_socket_tag; // This has a "special" name ('$socket')
     LOCAL_ATOM_DECL(gifdstaddr);       \
     LOCAL_ATOM_DECL(gifindex);         \
     LOCAL_ATOM_DECL(gifname);          \
+    LOCAL_ATOM_DECL(gifnetmask);       \
     LOCAL_ATOM_DECL(host_unknown);     \
     LOCAL_ATOM_DECL(host_unreach);     \
     LOCAL_ATOM_DECL(how);              \
@@ -4950,6 +4954,10 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
   requests = MKC(env, MKT2(env, atom_gifbrdaddr, MKI(env, SIOCGIFBRDADDR)), requests);
 #endif
 
+#if defined(SIOCGIFNETMASK)
+  requests = MKC(env, MKT2(env, atom_gifnetmask, MKI(env, SIOCGIFNETMASK)), requests);
+#endif
+
 #if defined(SIOCGIFCONF)
   requests = MKC(env, MKT2(env, atom_gifconf, MKI(env, SIOCGIFCONF)), requests);
 #endif
@@ -12677,6 +12685,12 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv*       env,
     break;
 #endif
 
+#if defined(SIOCGIFNETMASK)
+  case SIOCGIFNETMASK:
+    return esock_ioctl_gifnetmask(env, descP, arg);
+    break;
+#endif
+
   default:
     return esock_make_error(env, esock_atom_enotsup);
     break;
@@ -12872,7 +12886,7 @@ ERL_NIF_TERM esock_ioctl_gifdstaddr(ErlNifEnv*       env,
  }
 
 
-static
+  static
 ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv*       env,
 				    ESockDescriptor* descP,
 				    ERL_NIF_TERM     ename)
@@ -12924,6 +12938,61 @@ ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv*       env,
 
   return result;
 
+ }
+
+
+static
+ERL_NIF_TERM esock_ioctl_gifnetmask(ErlNifEnv*       env,
+				    ESockDescriptor* descP,
+				    ERL_NIF_TERM     ename)
+{
+  ERL_NIF_TERM result;
+  struct ifreq ifreq;
+  char*        ifn = NULL;
+  int          nlen;
+
+  SSDBG( descP, ("SOCKET", "esock_ioctl_gifnetmask {%d} -> entry with"
+		 "\r\n      (e)Name: %T"
+		 "\r\n", descP->sock, ename) );
+
+  if (!esock_decode_string(env, ename, &ifn))
+    return enif_make_badarg(env);
+
+  // 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_gifnetmask {%d} -> try ioctl\r\n", descP->sock) );
+
+  if (ioctl(descP->sock, SIOCGIFNETMASK, (char *) &ifreq) < 0) {
+    int          saveErrno = sock_errno();
+    ERL_NIF_TERM reason    = MKA(env, erl_errno_id(saveErrno));
+
+    SSDBG( descP,
+	   ("SOCKET", "esock_ioctl_gifnetmask {%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_gifnetmask {%d} -> encode netmask\r\n",
+	    descP->sock) );
+    result = encode_ioctl_ifraddr(env, descP, &ifreq.ifr_netmask);
+  }
+
+  /* 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;
+
 }
 
 
diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
index b65267270c..d399c16664 100644
--- a/lib/kernel/src/socket.erl
+++ b/lib/kernel/src/socket.erl
@@ -4055,7 +4055,8 @@ ioctl(Socket, GetRequest) ->
 
 -spec ioctl(Socket, GetRequest, Name) -> {'ok', Result} | {'error', Reason} when
       Socket     :: socket(),
-      GetRequest :: gifname | gifindex | gifaddr | gifdstaddr | gifbrdaddr,
+      GetRequest :: gifname | gifindex |
+                    gifaddr | gifdstaddr | gifbrdaddr | gifnetmask,
       Name       :: string() | integer(),
       Result     :: term(),
       Reason     :: posix() | 'closed'.
@@ -4075,6 +4076,9 @@ ioctl(?socket(SockRef), gifdstaddr = GetRequest, Name)
 ioctl(?socket(SockRef), gifbrdaddr = GetRequest, Name)
   when is_list(Name) ->
     prim_socket:ioctl(SockRef, GetRequest, Name);
+ioctl(?socket(SockRef), gifnetmask = GetRequest, Name)
+  when is_list(Name) ->
+    prim_socket:ioctl(SockRef, GetRequest, Name);
 ioctl(Socket, GetRequest, Arg) ->
     erlang:error(badarg, [Socket, GetRequest, Arg]).
 
-- 
2.31.1

Places

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

Places