File 2010-esock-Add-support-for-ioctl-request-gifhwa... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2010-esock-Add-support-for-ioctl-request-gifhwaddr.patch of Package erlang (Revision e1d9f9ddd7c311230c84f439253a9ab8)

Currently displaying revision e1d9f9ddd7c311230c84f439253a9ab8 , Show latest

From 16a52aed0aacbee5dc9a676b9ff4e5337a206f81 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 26 Oct 2021 14:02:33 +0200
Subject: [PATCH 10/58] [esock] Add support for ioctl request 'gifhwaddr'

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c |  87 ++++++++++-
 erts/emulator/nifs/common/socket_int.h      |   7 +
 erts/emulator/nifs/common/socket_util.c     | 151 +++++++++++++++-----
 erts/emulator/nifs/common/socket_util.h     |   6 +-
 lib/kernel/src/socket.erl                   |   8 +-
 5 files changed, 221 insertions(+), 38 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 1b34ba21e6..a71575f336 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1759,6 +1759,9 @@ static ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv*       env,
 static ERL_NIF_TERM esock_ioctl_gifnetmask(ErlNifEnv*       env,
 					   ESockDescriptor* descP,
 					   ERL_NIF_TERM     ename);
+static ERL_NIF_TERM esock_ioctl_gifhwaddr(ErlNifEnv*       env,
+					  ESockDescriptor* descP,
+					  ERL_NIF_TERM     ename);
 static ERL_NIF_TERM esock_ioctl_gifindex(ErlNifEnv*       env,
 					 ESockDescriptor* descP,
 					 ERL_NIF_TERM     ename);
@@ -3547,6 +3550,7 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(delayed_ack_time);                \
     GLOBAL_ATOM_DECL(dgram);                           \
     GLOBAL_ATOM_DECL(disable_fragments);               \
+    GLOBAL_ATOM_DECL(dlci);                            \
     GLOBAL_ATOM_DECL(domain);                          \
     GLOBAL_ATOM_DECL(dontfrag);                        \
     GLOBAL_ATOM_DECL(dontroute);                       \
@@ -3560,6 +3564,7 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(errqueue);                        \
     GLOBAL_ATOM_DECL(esp_network_level);               \
     GLOBAL_ATOM_DECL(esp_trans_level);                 \
+    GLOBAL_ATOM_DECL(ether);                           \
     GLOBAL_ATOM_DECL(events);                          \
     GLOBAL_ATOM_DECL(explicit_eor);                    \
     GLOBAL_ATOM_DECL(faith);                           \
@@ -3570,6 +3575,7 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(flowinfo);                        \
     GLOBAL_ATOM_DECL(fragment_interleave);             \
     GLOBAL_ATOM_DECL(freebind);                        \
+    GLOBAL_ATOM_DECL(frelay);                          \
     GLOBAL_ATOM_DECL(get_peer_addr_info);              \
     GLOBAL_ATOM_DECL(hatype);                          \
     GLOBAL_ATOM_DECL(hdrincl);                         \
@@ -3579,6 +3585,8 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(host);                            \
     GLOBAL_ATOM_DECL(icmp);                            \
     GLOBAL_ATOM_DECL(icmp6);                           \
+    GLOBAL_ATOM_DECL(ieee802);                         \
+    GLOBAL_ATOM_DECL(ieee1394);                        \
     GLOBAL_ATOM_DECL(ifindex);                         \
     GLOBAL_ATOM_DECL(igmp);                            \
     GLOBAL_ATOM_DECL(inet);                            \
@@ -3623,8 +3631,10 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(multicast_loop);                  \
     GLOBAL_ATOM_DECL(multicast_ttl);                   \
     GLOBAL_ATOM_DECL(name);                            \
+    GLOBAL_ATOM_DECL(netrom);                          \
     GLOBAL_ATOM_DECL(nodelay);                         \
     GLOBAL_ATOM_DECL(nodefrag);                        \
+    GLOBAL_ATOM_DECL(none);                            \
     GLOBAL_ATOM_DECL(noopt);                           \
     GLOBAL_ATOM_DECL(nopush);                          \
     GLOBAL_ATOM_DECL(nosignal);                        \
@@ -3785,6 +3795,7 @@ ERL_NIF_TERM esock_atom_socket_tag; // This has a "special" name ('$socket')
     LOCAL_ATOM_DECL(gifbrdaddr);       \
     LOCAL_ATOM_DECL(gifconf);          \
     LOCAL_ATOM_DECL(gifdstaddr);       \
+    LOCAL_ATOM_DECL(gifhwaddr);        \
     LOCAL_ATOM_DECL(gifindex);         \
     LOCAL_ATOM_DECL(gifmtu);           \
     LOCAL_ATOM_DECL(gifname);          \
@@ -4966,6 +4977,10 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
   requests = MKC(env, MKT2(env, atom_gifmtu, MKI(env, SIOCGIFMTU)), requests);
 #endif
 
+#if defined(SIOCGIFHWADDR)
+  requests = MKC(env, MKT2(env, atom_gifhwaddr, MKI(env, SIOCGIFHWADDR)), requests);
+#endif
+
 #if defined(SIOCGIFCONF)
   requests = MKC(env, MKT2(env, atom_gifconf, MKI(env, SIOCGIFCONF)), requests);
 #endif
@@ -12705,6 +12720,12 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv*       env,
     break;
 #endif
 
+#if defined(SIOCGIFHWADDR)
+  case SIOCGIFHWADDR:
+    return esock_ioctl_gifhwaddr(env, descP, arg);
+    break;
+#endif
+
   default:
     return esock_make_error(env, esock_atom_enotsup);
     break;
@@ -12955,7 +12976,7 @@ ERL_NIF_TERM esock_ioctl_gifbrdaddr(ErlNifEnv*       env,
  }
 
 
-static
+  static
 ERL_NIF_TERM esock_ioctl_gifnetmask(ErlNifEnv*       env,
 				    ESockDescriptor* descP,
 				    ERL_NIF_TERM     ename)
@@ -13007,10 +13028,72 @@ ERL_NIF_TERM esock_ioctl_gifnetmask(ErlNifEnv*       env,
 
   return result;
 
+ }
+
+
+static
+ERL_NIF_TERM esock_ioctl_gifhwaddr(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_gifhwaddr {%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_gifhwaddr {%d} -> try ioctl\r\n", descP->sock) );
+
+  if (ioctl(descP->sock, SIOCGIFHWADDR, (char *) &ifreq) < 0) {
+    int          saveErrno = sock_errno();
+    ERL_NIF_TERM reason    = MKA(env, erl_errno_id(saveErrno));
+
+    SSDBG( descP,
+	   ("SOCKET", "esock_ioctl_gifhwaddr {%d} -> failure: "
+	    "\r\n      reason: %T (%d)"
+	    "\r\n", descP->sock, reason, saveErrno) );
+
+    result = esock_make_error(env, reason);
+
+  } else {
+    ERL_NIF_TERM eaddr;
+    unsigned int sz = sizeof(ESockAddress);
+
+    esock_encode_hwsockaddr(env, (ESockAddress*) &ifreq.ifr_netmask, sz, &eaddr);
+
+    SSDBG( descP, ("SOCKET", "encode_ioctl_ifraddr -> done with"
+		   "\r\n    (HW) Addr: %T"
+		   "\r\n", eaddr) );
+
+    result =  esock_make_ok2(env, eaddr);;
+    
+  }
+
+  /* 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
+static
 ERL_NIF_TERM esock_ioctl_gifindex(ErlNifEnv*       env,
 				  ESockDescriptor* descP,
 				  ERL_NIF_TERM     ename)
diff --git a/erts/emulator/nifs/common/socket_int.h b/erts/emulator/nifs/common/socket_int.h
index a860e81f35..3e36516ba3 100644
--- a/erts/emulator/nifs/common/socket_int.h
+++ b/erts/emulator/nifs/common/socket_int.h
@@ -215,6 +215,7 @@ typedef int BOOLEAN_T;
     GLOBAL_ATOM_DEF(delayed_ack_time);         \
     GLOBAL_ATOM_DEF(dgram);                    \
     GLOBAL_ATOM_DEF(disable_fragments);        \
+    GLOBAL_ATOM_DEF(dlci);                     \
     GLOBAL_ATOM_DEF(domain);                   \
     GLOBAL_ATOM_DEF(dontfrag);                 \
     GLOBAL_ATOM_DEF(dontroute);                \
@@ -228,6 +229,7 @@ typedef int BOOLEAN_T;
     GLOBAL_ATOM_DEF(errqueue);                 \
     GLOBAL_ATOM_DEF(esp_network_level);        \
     GLOBAL_ATOM_DEF(esp_trans_level);          \
+    GLOBAL_ATOM_DEF(ether);                    \
     GLOBAL_ATOM_DEF(events);                   \
     GLOBAL_ATOM_DEF(explicit_eor);             \
     GLOBAL_ATOM_DEF(faith);                    \
@@ -238,6 +240,7 @@ typedef int BOOLEAN_T;
     GLOBAL_ATOM_DEF(flowinfo);                 \
     GLOBAL_ATOM_DEF(fragment_interleave);      \
     GLOBAL_ATOM_DEF(freebind);                 \
+    GLOBAL_ATOM_DEF(frelay);                   \
     GLOBAL_ATOM_DEF(get_peer_addr_info);       \
     GLOBAL_ATOM_DEF(hatype);                   \
     GLOBAL_ATOM_DEF(hdrincl);                  \
@@ -247,6 +250,8 @@ typedef int BOOLEAN_T;
     GLOBAL_ATOM_DEF(host);                     \
     GLOBAL_ATOM_DEF(icmp);                     \
     GLOBAL_ATOM_DEF(icmp6);                    \
+    GLOBAL_ATOM_DEF(ieee802);                  \
+    GLOBAL_ATOM_DEF(ieee1394);                 \
     GLOBAL_ATOM_DEF(ifindex);                  \
     GLOBAL_ATOM_DEF(igmp);                     \
     GLOBAL_ATOM_DEF(inet);                     \
@@ -291,8 +296,10 @@ typedef int BOOLEAN_T;
     GLOBAL_ATOM_DEF(multicast_loop);           \
     GLOBAL_ATOM_DEF(multicast_ttl);            \
     GLOBAL_ATOM_DEF(name);                     \
+    GLOBAL_ATOM_DEF(netrom);                   \
     GLOBAL_ATOM_DEF(nodelay);                  \
     GLOBAL_ATOM_DEF(nodefrag);                 \
+    GLOBAL_ATOM_DEF(none);                     \
     GLOBAL_ATOM_DEF(noopt);                    \
     GLOBAL_ATOM_DEF(nopush);                   \
     GLOBAL_ATOM_DEF(nosignal);                 \
diff --git a/erts/emulator/nifs/common/socket_util.c b/erts/emulator/nifs/common/socket_util.c
index 66db2cf27e..45d1de26c0 100644
--- a/erts/emulator/nifs/common/socket_util.c
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -33,6 +33,7 @@
 #include <ctype.h>
 #include <time.h>
 #include <stddef.h>
+#include <net/if_arp.h>
 
 #include "socket_int.h"
 #include "sys.h"
@@ -371,56 +372,138 @@ void esock_encode_sockaddr(ErlNifEnv*    env,
                            SOCKLEN_T     addrLen,
                            ERL_NIF_TERM* eSockAddr)
 {
-    int family;
+  int family;
 
-    // Sanity check
-    if (addrLen < (char *)&sockAddrP->sa.sa_data - (char *)sockAddrP) {
-        // We got crap, cannot even know the address family
-        esock_encode_sockaddr_broken(env, &sockAddrP->sa, addrLen, eSockAddr);
-        return;
-    }
-    family = sockAddrP->ss.ss_family;
+  // Sanity check
+  if (addrLen < (char *)&sockAddrP->sa.sa_data - (char *)sockAddrP) {
+    // We got crap, cannot even know the address family
+    esock_encode_sockaddr_broken(env, &sockAddrP->sa, addrLen, eSockAddr);
+    return;
+  }
+  family = sockAddrP->ss.ss_family;
 
-    UDBG( ("SUTIL", "esock_encode_sockaddr -> entry with"
-           "\r\n   family:  %d"
-           "\r\n   addrLen: %d"
-           "\r\n", family, addrLen) );
+  UDBG( ("SUTIL", "esock_encode_sockaddr -> entry with"
+	 "\r\n   family:  %d"
+	 "\r\n   addrLen: %d"
+	 "\r\n", family, addrLen) );
 
-    switch (family) {
-    case AF_INET:
-        esock_encode_sockaddr_in(env, &sockAddrP->in4, addrLen, eSockAddr);
-        break;
+  switch (family) {
+  case AF_INET:
+    esock_encode_sockaddr_in(env, &sockAddrP->in4, addrLen, eSockAddr);
+    break;
 
 #if defined(HAVE_IN6) && defined(AF_INET6)
-    case AF_INET6:
-        esock_encode_sockaddr_in6(env, &sockAddrP->in6, addrLen, eSockAddr);
-        break;
+  case AF_INET6:
+    esock_encode_sockaddr_in6(env, &sockAddrP->in6, addrLen, eSockAddr);
+    break;
 #endif
 
 #ifdef HAS_AF_LOCAL
-    case AF_LOCAL:
-        esock_encode_sockaddr_un(env, &sockAddrP->un, addrLen, eSockAddr);
-        break;
+  case AF_LOCAL:
+    esock_encode_sockaddr_un(env, &sockAddrP->un, addrLen, eSockAddr);
+    break;
 #endif
 
 #ifdef AF_UNSPEC
-    case AF_UNSPEC:
-        esock_encode_sockaddr_native(env, &sockAddrP->sa,
-                                     addrLen, esock_atom_unspec, eSockAddr);
-        break;
+  case AF_UNSPEC:
+    esock_encode_sockaddr_native(env, &sockAddrP->sa,
+				 addrLen, esock_atom_unspec, eSockAddr);
+    break;
 #endif
 
 #if defined(HAVE_NETPACKET_PACKET_H)
-    case AF_PACKET:
-        esock_encode_sockaddr_ll(env, &sockAddrP->ll, addrLen, eSockAddr);
-        break;
+  case AF_PACKET:
+    esock_encode_sockaddr_ll(env, &sockAddrP->ll, addrLen, eSockAddr);
+    break;
 #endif
 
-    default:
-        esock_encode_sockaddr_native(env, &sockAddrP->sa,
-                                     addrLen, MKI(env, family), eSockAddr);
-        break;
-    }
+  default:
+    esock_encode_sockaddr_native(env, &sockAddrP->sa,
+				 addrLen, MKI(env, family), eSockAddr);
+    break;
+  }
+}
+
+
+
+extern
+void esock_encode_hwsockaddr(ErlNifEnv*    env,
+			     ESockAddress* sockAddrP,
+			     SOCKLEN_T     addrLen,
+			     ERL_NIF_TERM* eSockAddr)
+{
+  ERL_NIF_TERM efamily;
+  int          family;
+
+  // Sanity check
+  if (addrLen < (char *)&sockAddrP->sa.sa_data - (char *)sockAddrP) {
+    // We got crap, cannot even know the address family
+    esock_encode_sockaddr_broken(env, &sockAddrP->sa, addrLen, eSockAddr);
+    return;
+  }
+  family = sockAddrP->ss.ss_family;
+
+  UDBG( ("SUTIL", "esock_encode_hwsockaddr -> entry with"
+	 "\r\n   family:  %d"
+	 "\r\n   addrLen: %d"
+	 "\r\n", family, addrLen) );
+
+  switch (family) {
+#if defined(ARPHRD_NETROM)
+  case ARPHRD_NETROM:
+    efamily = esock_atom_netrom;
+    break;
+#endif
+
+#if defined(ARPHRD_ETHER)
+  case ARPHRD_ETHER:
+    efamily = esock_atom_ether;
+    break;
+#endif
+
+#if defined(ARPHRD_IEEE802)
+  case ARPHRD_IEEE802:
+    efamily = esock_atom_ieee802;
+    break;
+#endif
+
+#if defined(ARPHRD_DLCI)
+  case ARPHRD_DLCI:
+    efamily = esock_atom_dlci;
+    break;
+#endif
+
+#if defined(ARPHRD_FRELAY)
+  case ARPHRD_FRELAY:
+    efamily = esock_atom_frelay;
+    break;
+#endif
+
+#if defined(ARPHRD_IEEE1394)
+  case ARPHRD_IEEE1394:
+    efamily = esock_atom_ieee1394;
+    break;
+#endif
+
+#if defined(ARPHRD_LOOPBACK)
+  case ARPHRD_LOOPBACK:
+    efamily = esock_atom_loopback;
+    break;
+#endif
+
+#if defined(ARPHRD_NONE)
+  case ARPHRD_NONE:
+    efamily = esock_atom_none;
+    break;
+#endif
+
+  default:
+    efamily = MKI(env, family);
+    break;
+  }
+
+  esock_encode_sockaddr_native(env, &sockAddrP->sa,
+			       addrLen, efamily, eSockAddr);
 }
 
 
diff --git a/erts/emulator/nifs/common/socket_util.h b/erts/emulator/nifs/common/socket_util.h
index 61b237383c..80ea62b8ab 100644
--- a/erts/emulator/nifs/common/socket_util.h
+++ b/erts/emulator/nifs/common/socket_util.h
@@ -74,7 +74,11 @@ void esock_encode_sockaddr(ErlNifEnv*    env,
                            ESockAddress* sockAddrP,
                            SOCKLEN_T     addrLen,
                            ERL_NIF_TERM* eSockAddr);
-
+extern
+void esock_encode_hwsockaddr(ErlNifEnv*    env,
+			     ESockAddress* sockAddrP,
+			     SOCKLEN_T     addrLen,
+			     ERL_NIF_TERM* eSockAddr);
 extern
 BOOLEAN_T esock_decode_sockaddr_in(ErlNifEnv*          env,
                                    ERL_NIF_TERM        eSockAddr,
diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
index fcebd2e57b..dd88b30845 100644
--- a/lib/kernel/src/socket.erl
+++ b/lib/kernel/src/socket.erl
@@ -4056,7 +4056,7 @@ ioctl(Socket, GetRequest) ->
 -spec ioctl(Socket, GetRequest, Name) -> {'ok', Result} | {'error', Reason} when
       Socket     :: socket(),
       GetRequest :: gifname | gifindex |
-                    gifaddr | gifdstaddr | gifbrdaddr | gifnetmask |
+                    gifaddr | gifdstaddr | gifbrdaddr | gifnetmask | gifhwaddr |
                     gifmtu,
       Name       :: string() | integer(),
       Result     :: term(),
@@ -4083,6 +4083,12 @@ ioctl(?socket(SockRef), gifnetmask = GetRequest, Name)
 ioctl(?socket(SockRef), gifmtu = GetRequest, Name)
   when is_list(Name) ->
     prim_socket:ioctl(SockRef, GetRequest, Name);
+%% This is a bit different.
+%% The family part contains the 'ARP protocol HARDWARE identifiers',
+%% which overlaps the other family values
+ioctl(?socket(SockRef), gifhwaddr = 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 2010-esock-Add-support-for-ioctl-request-gifhwaddr.patch of Package erlang (Revision e1d9f9ddd7c311230c84f439253a9ab8)

Places