File 2033-esock-Tweaks-to-make-socket-ioctl-compile-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2033-esock-Tweaks-to-make-socket-ioctl-compile-on-OpenInd.patch of Package erlang (Revision 00188dd62c257ad2e14e824eab72d7ee)

Currently displaying revision 00188dd62c257ad2e14e824eab72d7ee , Show latest

From 255a7da180501cec463bc9dd04d58e3b31b87b15 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 4 Nov 2021 17:27:53 +0100
Subject: [PATCH 33/58] [esock] Tweaks to make socket ioctl compile on
 OpenIndiana

OTP-17528
---
 erts/config.h.in                            | 15 +++++
 erts/configure                              | 68 +++++++++++++++++----
 erts/configure.in                           | 27 ++++++++
 erts/emulator/nifs/common/prim_socket_nif.c | 68 +++++++++++++--------
 4 files changed, 141 insertions(+), 37 deletions(-)

diff --git a/erts/config.h.in b/erts/config.h.in
index 86af73fb4f..8eb0d28bf9 100644
--- a/erts/config.h.in
+++ b/erts/config.h.in
@@ -83,9 +83,18 @@
 /* ESOCK counter size */
 #undef ESOCK_COUNTER_SIZE
 
+/* Interface hwaddr supported */
+#undef ESOCK_USE_HWADDR
+
+/* Interface ifindex supported */
+#undef ESOCK_USE_IFINDEX
+
 /* Interface map supported */
 #undef ESOCK_USE_IFMAP
 
+/* Interface index supported */
+#undef ESOCK_USE_INDEX
+
 /* Use SO_[RCV|SND]TMIEO */
 #undef ESOCK_USE_RCVSNDTIMEO
 
@@ -986,6 +995,12 @@
 /* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_HWADDR
 
+/* Define to 1 if `ifr_ifindex' is a member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_IFINDEX
+
+/* Define to 1 if `ifr_index' is a member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_INDEX
+
 /* Define to 1 if `ifr_map' is a member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_MAP
 
diff --git a/erts/configure b/erts/configure
index bfc356baed..8b6aad3f1c 100755
--- a/erts/configure
+++ b/erts/configure
@@ -773,7 +773,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -920,7 +919,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1173,15 +1171,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1319,7 +1308,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1472,7 +1461,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -14120,6 +14108,60 @@ $as_echo "#define ESOCK_USE_IFMAP /**/" >>confdefs.h
 fi
 
 
+ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_ifreq_ifr_hwaddr" "#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+
+"
+if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
+_ACEOF
+
+
+$as_echo "#define ESOCK_USE_HWADDR /**/" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_ifindex" "ac_cv_member_struct_ifreq_ifr_ifindex" "#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+
+"
+if test "x$ac_cv_member_struct_ifreq_ifr_ifindex" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_IFREQ_IFR_IFINDEX 1
+_ACEOF
+
+
+$as_echo "#define ESOCK_USE_IFINDEX /**/" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_index" "ac_cv_member_struct_ifreq_ifr_index" "#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+
+"
+if test "x$ac_cv_member_struct_ifreq_ifr_index" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_IFREQ_IFR_INDEX 1
+_ACEOF
+
+
+$as_echo "#define ESOCK_USE_INDEX /**/" >>confdefs.h
+
+fi
+
+
 
 #--------------------------------------------------------------------
 #	Check for the existence of the -lsocket and -lnsl libraries.
diff --git a/erts/configure.in b/erts/configure.in
index d0c7376b0e..d7828ca14f 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1484,6 +1484,33 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_map],
 	 #endif
 	])
 
+AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr],
+        [AC_DEFINE(ESOCK_USE_HWADDR, [], [Interface hwaddr supported])],
+	[],
+	[#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+	])
+
+AC_CHECK_MEMBERS([struct ifreq.ifr_ifindex],
+        [AC_DEFINE(ESOCK_USE_IFINDEX, [], [Interface ifindex supported])],
+	[],
+	[#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+	])
+
+AC_CHECK_MEMBERS([struct ifreq.ifr_index],
+        [AC_DEFINE(ESOCK_USE_INDEX, [], [Interface index supported])],
+	[],
+	[#ifdef __WIN32__
+	 #else
+	 #include <net/if.h>
+	 #endif
+	])
+
 
 dnl
 dnl This test kindly borrowed from Tcl
diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 38590b6197..f69628ae4f 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(SIOCGIFHWADDR)
+#if defined(SIOCGIFHWADDR) && defined(ESOCK_USE_HWADDR)
 #define IOCTL_GIFHWADDR_FUNC_DEF IOCTL_GET_FUNC_DEF(gifhwaddr)
 #else
 #define IOCTL_GIFHWADDR_FUNC_DEF
@@ -2078,7 +2078,7 @@ static ERL_NIF_TERM encode_ioctl_ifrmap(ErlNifEnv*       env,
 					ESockDescriptor* descP,
 					struct ifmap*    mapP);
 #endif
-#if defined(SIOCGIFHWADDR)
+#if defined(SIOCGIFHWADDR) && defined(ESOCK_USE_HWADDR)
 static ERL_NIF_TERM encode_ioctl_hwaddr(ErlNifEnv*       env,
 					ESockDescriptor* descP,
 					struct sockaddr* addrP);
@@ -2111,10 +2111,12 @@ static BOOLEAN_T decode_ioctl_txqlen(ErlNifEnv*       env,
 				     ERL_NIF_TERM     etxqlen,
 				     int*             txqlen);
 #endif
+#if defined(SIOCSIFTXQLEN)
 static BOOLEAN_T decode_ioctl_ivalue(ErlNifEnv*       env,
 				     ESockDescriptor* descP,
 				     ERL_NIF_TERM     eivalue,
 				     int*             ivalue);
+#endif
 static ERL_NIF_TERM encode_ioctl_ivalue(ErlNifEnv*       env,
 					ESockDescriptor* descP,
 					int              ivalue);
@@ -5239,8 +5241,6 @@ static
 ERL_NIF_TERM esock_supports_protocols(ErlNifEnv* env)
 {
   ERL_NIF_TERM protocols;
-  struct protoent *pe;
-  int stayopen;
 
   protocols = MKEL(env);
 
@@ -5248,24 +5248,28 @@ ERL_NIF_TERM esock_supports_protocols(ErlNifEnv* env)
   defined(HAVE_SETPROTOENT) &&			\
   defined(HAVE_ENDPROTOENT)
 
-  MLOCK(data.protocolsMtx);
-  stayopen = TRUE;
-  setprotoent(stayopen);
-  while ((pe = getprotoent()) != NULL) {
-    ERL_NIF_TERM names;
-    char **aliases;
+  {
+    struct protoent *pe;
+    int stayopen;
 
-    names = MKEL(env);
-    for (aliases = pe->p_aliases;  *aliases != NULL;  aliases++)
-      names = MKC(env, MKA(env, *aliases), names);
-    names = MKC(env, MKA(env, pe->p_name), names);
+    MLOCK(data.protocolsMtx);
+    stayopen = TRUE;
+    setprotoent(stayopen);
+    while ((pe = getprotoent()) != NULL) {
+      ERL_NIF_TERM names;
+      char **aliases;
 
-    protocols =
-      MKC(env, MKT2(env, names, MKI(env, pe->p_proto)), protocols);
-  }
-  endprotoent();
-  MUNLOCK(data.protocolsMtx);
+      names = MKEL(env);
+      for (aliases = pe->p_aliases;  *aliases != NULL;  aliases++)
+	names = MKC(env, MKA(env, *aliases), names);
+      names = MKC(env, MKA(env, pe->p_name), names);
 
+      protocols =
+	MKC(env, MKT2(env, names, MKI(env, pe->p_proto)), protocols);
+    }
+    endprotoent();
+    MUNLOCK(data.protocolsMtx);
+  }
 #endif
 
   /* Defaults for known protocols in case getprotoent()
@@ -5366,7 +5370,7 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
   requests = MKC(env, MKT2(env, atom_gifmtu, MKUL(env, SIOCGIFMTU)), requests);
 #endif
 
-#if defined(SIOCGIFHWADDR)
+#if defined(SIOCGIFHWADDR) && defined(ESOCK_USE_HWADDR)
   requests = MKC(env, MKT2(env, atom_gifhwaddr, MKUL(env, SIOCGIFHWADDR)), requests);
 #endif
 
@@ -13203,7 +13207,7 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv*       env,
     break;
 #endif
 
-#if defined(SIOCGIFHWADDR)
+#if defined(SIOCGIFHWADDR) && defined(ESOCK_USE_HWADDR)
   case SIOCGIFHWADDR:
     return esock_ioctl_gifhwaddr(env, descP, arg);
     break;
@@ -13319,8 +13323,15 @@ ERL_NIF_TERM esock_ioctl3(ErlNifEnv*       env,
 
 /* *** esock_ioctl_gifindex *** */
 #if defined(SIOCGIFINDEX)
+#if defined(ESOCK_USE_IFINDEX)
 #define IOCTL_GIFINDEX_FUNC_DECL					\
   IOCTL_GET_REQUEST_DECL(gifindex, SIOCGIFINDEX, ivalue, ifreq.ifr_ifindex)
+#elif defined(ESOCK_USE_INDEX)
+#define IOCTL_GIFINDEX_FUNC_DECL					\
+  IOCTL_GET_REQUEST_DECL(gifindex, SIOCGIFINDEX, ivalue, ifreq.ifr_index)
+#else
+#define IOCTL_GIFINDEX_FUNC_DECL
+#endif
 #else
 #define IOCTL_GIFINDEX_FUNC_DECL
 #endif
@@ -13379,7 +13390,7 @@ ERL_NIF_TERM esock_ioctl3(ErlNifEnv*       env,
 #endif
 
 /* *** esock_ioctl_gifhwaddr *** */
-#if defined(SIOCGIFHWADDR)
+#if defined(SIOCGIFHWADDR) && defined(ESOCK_USE_HWADDR)
 #define IOCTL_GIFHWADDR_FUNC_DECL					\
   IOCTL_GET_REQUEST_DECL(gifhwaddr, SIOCGIFHWADDR, hwaddr, &ifreq.ifr_hwaddr)
 #else
@@ -13617,10 +13628,12 @@ ERL_NIF_TERM esock_ioctl_gifname(ErlNifEnv*       env,
 #define IOCTL_SIFNETMASK_FUNC_DECL
 #endif
 
-/* *** esock_ioctl_sifmtu *** */
+/* *** esock_ioctl_sifmtu ***
+ * On some platforms, MTU is an unsigned int
+ */
 #if defined(SIOCSIFMTU)
 #define IOCTL_SIFMTU_FUNC_DECL						\
-  IOCTL_SET_REQUEST_DECL(sifmtu, SIOCSIFMTU, mtu, &ifreq.ifr_mtu)
+  IOCTL_SET_REQUEST_DECL(sifmtu, SIOCSIFMTU, mtu, (int*) &ifreq.ifr_mtu)
 #else
 #define IOCTL_SIFMTU_FUNC_DECL
 #endif
@@ -13901,6 +13914,7 @@ ERL_NIF_TERM encode_ioctl_ifrmap(ErlNifEnv*       env,
 #endif
 
 
+#if defined(SIOCGIFHWADDR) && defined(ESOCK_USE_HWADDR)
 static
 ERL_NIF_TERM encode_ioctl_hwaddr(ErlNifEnv*       env,
 				 ESockDescriptor* descP,
@@ -13917,6 +13931,7 @@ ERL_NIF_TERM encode_ioctl_hwaddr(ErlNifEnv*       env,
 
   return esock_make_ok2(env, eaddr);;
 }
+#endif
 
 
 static
@@ -14038,6 +14053,10 @@ BOOLEAN_T decode_ioctl_txqlen(ErlNifEnv*       env,
 }
 #endif
 
+/* All uses of the function should be added. For instance:
+ * #if defined(SIOCGIFTXQLEN) || defined(FOOBAR) || defined(YXA)
+ */
+#if defined(SIOCGIFTXQLEN)
 static
 BOOLEAN_T decode_ioctl_ivalue(ErlNifEnv*       env,
 			      ESockDescriptor* descP,
@@ -14058,6 +14077,7 @@ BOOLEAN_T decode_ioctl_ivalue(ErlNifEnv*       env,
 
   return result;
 }
+#endif
 				 
 
 static
-- 
2.31.1

Places

File 2033-esock-Tweaks-to-make-socket-ioctl-compile-on-OpenInd.patch of Package erlang (Revision 00188dd62c257ad2e14e824eab72d7ee)

Places