File 2032-esock-Misc-and-renaming-the-arphrd-family-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2032-esock-Misc-and-renaming-the-arphrd-family-atoms.patch of Package erlang (Revision ec1c7b677b97434a36bbda872e0ed27c)

Currently displaying revision ec1c7b677b97434a36bbda872e0ed27c , Show latest

From 25370820e27d2e74b09bfa920e53420af116f729 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 4 Nov 2021 18:11:38 +0100
Subject: [PATCH 32/58] [esock] Misc and renaming the arphrd family atoms

All of them get a "prefix" of arphrd_

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 23 ++++++++++++---------
 erts/emulator/nifs/common/socket_int.h      | 17 ++++++++-------
 erts/emulator/nifs/common/socket_util.c     | 16 +++++++-------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 78479007d4..38590b6197 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1955,7 +1955,7 @@ static ERL_NIF_TERM esock_ioctl_gifname(ErlNifEnv*       env,
 #endif
 
 /* esock_ioctl_gifhwaddr */
-#if defined(SIOCGIFBRDADDR)
+#if defined(SIOCGIFHWADDR)
 #define IOCTL_GIFHWADDR_FUNC_DEF IOCTL_GET_FUNC_DEF(gifhwaddr)
 #else
 #define IOCTL_GIFHWADDR_FUNC_DEF
@@ -3859,6 +3859,14 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(add_source_membership);           \
     GLOBAL_ATOM_DECL(allmulti);                        \
     GLOBAL_ATOM_DECL(any);                             \
+    GLOBAL_ATOM_DECL(arphrd_dlci);		       \
+    GLOBAL_ATOM_DECL(arphrd_ether);		       \
+    GLOBAL_ATOM_DECL(arphrd_frelay);		       \
+    GLOBAL_ATOM_DECL(arphrd_ieee802);		       \
+    GLOBAL_ATOM_DECL(arphrd_ieee1394);		       \
+    GLOBAL_ATOM_DECL(arphrd_loopback);		       \
+    GLOBAL_ATOM_DECL(arphrd_netrom);		       \
+    GLOBAL_ATOM_DECL(arphrd_none);		       \
     GLOBAL_ATOM_DECL(associnfo);                       \
     GLOBAL_ATOM_DECL(authhdr);                         \
     GLOBAL_ATOM_DECL(auth_active_key);                 \
@@ -3894,7 +3902,6 @@ 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);                       \
@@ -3911,7 +3918,6 @@ 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);                           \
@@ -3922,7 +3928,6 @@ 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);                         \
@@ -3932,8 +3937,6 @@ 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(implink);                         \
@@ -3961,7 +3964,7 @@ static const struct in6_addr in6addr_loopback =
     GLOBAL_ATOM_DECL(link);                            \
     GLOBAL_ATOM_DECL(local);                           \
     GLOBAL_ATOM_DECL(local_auth_chunks);               \
-    GLOBAL_ATOM_DECL(loopback);                        \
+    GLOBAL_ATOM_DECL(loopback);			       \
     GLOBAL_ATOM_DECL(lowdelay);                        \
     GLOBAL_ATOM_DECL(lower_up);                        \
     GLOBAL_ATOM_DECL(mark);                            \
@@ -3982,7 +3985,6 @@ 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(noarp);                           \
     GLOBAL_ATOM_DECL(nodelay);                         \
     GLOBAL_ATOM_DECL(nodefrag);                        \
@@ -13628,7 +13630,7 @@ ERL_NIF_TERM esock_ioctl_gifname(ErlNifEnv*       env,
 #define IOCTL_SIFTXQLEN_FUNC_DECL						\
   IOCTL_SET_REQUEST_DECL(siftxqlen, SIOCSIFTXQLEN, txqlen, &ifreq.ifr_qlen)
 #else
-#define IOCTL_SIFMTU_FUNC_DECL
+#define IOCTL_SIFTXQLEN_FUNC_DECL
 #endif
 
 #define IOCTL_SET_FUNCS				\
@@ -14025,6 +14027,7 @@ BOOLEAN_T decode_ioctl_mtu(ErlNifEnv*       env,
 }
 				 
 
+#if defined(SIOCSIFTXQLEN)
 static
 BOOLEAN_T decode_ioctl_txqlen(ErlNifEnv*       env,
 			      ESockDescriptor* descP,
@@ -14033,7 +14036,7 @@ BOOLEAN_T decode_ioctl_txqlen(ErlNifEnv*       env,
 {
   return decode_ioctl_ivalue(env, descP, etxqlen, txqlen);
 }
-				 
+#endif
 
 static
 BOOLEAN_T decode_ioctl_ivalue(ErlNifEnv*       env,
diff --git a/erts/emulator/nifs/common/socket_int.h b/erts/emulator/nifs/common/socket_int.h
index b1e0055026..6cdfeb192f 100644
--- a/erts/emulator/nifs/common/socket_int.h
+++ b/erts/emulator/nifs/common/socket_int.h
@@ -183,6 +183,14 @@ typedef int BOOLEAN_T;
     GLOBAL_ATOM_DEF(add_source_membership);    \
     GLOBAL_ATOM_DEF(allmulti);                 \
     GLOBAL_ATOM_DEF(any);                      \
+    GLOBAL_ATOM_DEF(arphrd_dlci);	       \
+    GLOBAL_ATOM_DEF(arphrd_ether);	       \
+    GLOBAL_ATOM_DEF(arphrd_frelay);	       \
+    GLOBAL_ATOM_DEF(arphrd_ieee802);	       \
+    GLOBAL_ATOM_DEF(arphrd_ieee1394);	       \
+    GLOBAL_ATOM_DEF(arphrd_loopback);	       \
+    GLOBAL_ATOM_DEF(arphrd_netrom);	       \
+    GLOBAL_ATOM_DEF(arphrd_none);	       \
     GLOBAL_ATOM_DEF(associnfo);                \
     GLOBAL_ATOM_DEF(authhdr);                  \
     GLOBAL_ATOM_DEF(auth_active_key);          \
@@ -218,7 +226,6 @@ 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);                \
@@ -235,7 +242,6 @@ 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);                    \
@@ -246,7 +252,6 @@ 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);                  \
@@ -256,8 +261,6 @@ 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(implink);                  \
@@ -285,7 +288,7 @@ typedef int BOOLEAN_T;
     GLOBAL_ATOM_DEF(link);                     \
     GLOBAL_ATOM_DEF(local);                    \
     GLOBAL_ATOM_DEF(local_auth_chunks);        \
-    GLOBAL_ATOM_DEF(loopback);                 \
+    GLOBAL_ATOM_DEF(loopback);		       \
     GLOBAL_ATOM_DEF(lowdelay);                 \
     GLOBAL_ATOM_DEF(lower_up);                 \
     GLOBAL_ATOM_DEF(mark);                     \
@@ -306,11 +309,9 @@ 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(noarp);                    \
     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 7268cbe194..f3f0f57f74 100644
--- a/erts/emulator/nifs/common/socket_util.c
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -479,49 +479,49 @@ void esock_encode_hwsockaddr(ErlNifEnv*    env,
   switch (family) {
 #if defined(ARPHRD_NETROM)
   case ARPHRD_NETROM:
-    efamily = esock_atom_netrom;
+    efamily = esock_atom_arphrd_netrom;
     break;
 #endif
 
 #if defined(ARPHRD_ETHER)
   case ARPHRD_ETHER:
-    efamily = esock_atom_ether;
+    efamily = esock_atom_arphrd_ether;
     break;
 #endif
 
 #if defined(ARPHRD_IEEE802)
   case ARPHRD_IEEE802:
-    efamily = esock_atom_ieee802;
+    efamily = esock_atom_arphrd_ieee802;
     break;
 #endif
 
 #if defined(ARPHRD_DLCI)
   case ARPHRD_DLCI:
-    efamily = esock_atom_dlci;
+    efamily = esock_atom_arphrd_dlci;
     break;
 #endif
 
 #if defined(ARPHRD_FRELAY)
   case ARPHRD_FRELAY:
-    efamily = esock_atom_frelay;
+    efamily = esock_atom_arphrd_frelay;
     break;
 #endif
 
 #if defined(ARPHRD_IEEE1394)
   case ARPHRD_IEEE1394:
-    efamily = esock_atom_ieee1394;
+    efamily = esock_atom_arphrd_ieee1394;
     break;
 #endif
 
 #if defined(ARPHRD_LOOPBACK)
   case ARPHRD_LOOPBACK:
-    efamily = esock_atom_loopback;
+    efamily = esock_atom_arphrd_loopback;
     break;
 #endif
 
 #if defined(ARPHRD_NONE)
   case ARPHRD_NONE:
-    efamily = esock_atom_none;
+    efamily = esock_atom_arphrd_none;
     break;
 #endif
 
-- 
2.31.1

Places

File 2032-esock-Misc-and-renaming-the-arphrd-family-atoms.patch of Package erlang (Revision ec1c7b677b97434a36bbda872e0ed27c)

Places