File 2021-esock-Add-support-for-ioctl-request-siftxq... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2021-esock-Add-support-for-ioctl-request-siftxqlen.patch of Package erlang (Revision 2acc9ef00b7ed8ebf6555724dee420d9)

Currently displaying revision 2acc9ef00b7ed8ebf6555724dee420d9 , Show latest

From 69f41ac691fec11aff78b46cba960d696fe12a39 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 29 Oct 2021 17:35:18 +0200
Subject: [PATCH 21/58] [esock] Add support for ioctl request 'siftxqlen'

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 110 ++++++++++++++++++--
 lib/kernel/doc/src/socket.xml               |   8 +-
 lib/kernel/src/socket.erl                   |   9 +-
 3 files changed, 116 insertions(+), 11 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index f6f5bfe3d6..d90c209042 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -1958,6 +1958,12 @@ static ERL_NIF_TERM esock_ioctl_giftxqlen(ErlNifEnv* env,
 					 ESockDescriptor* descP,
 					 ERL_NIF_TERM ename);
 #endif
+#if defined(SIOCSIFTXQLEN)
+static ERL_NIF_TERM esock_ioctl_siftxqlen(ErlNifEnv* env,
+					 ESockDescriptor* descP,
+					 ERL_NIF_TERM ename,
+					 ERL_NIF_TERM elen);
+#endif
 
 #if defined(SIOCGIFMAP) && defined(ESOCK_USE_IFMAP)
 static ERL_NIF_TERM encode_ioctl_ifrmap(ErlNifEnv* env,
@@ -4118,6 +4124,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(sifmtu); \
+ LOCAL_ATOM_DECL(siftxqlen); \
 LOCAL_ATOM_DECL(slist); \
 LOCAL_ATOM_DECL(sndctrlbuf); \
 LOCAL_ATOM_DECL(sockaddr); \
@@ -5229,6 +5236,10 @@ ERL_NIF_TERM esock_supports_ioctl_requests(ErlNifEnv* env)
 requests = MKC(env, MKT2(env, atom_sifmtu, MKUL(env, SIOCSIFMTU)), requests);
 #endif
 
+#if defined(SIOCSIFTXQLEN)
+ requests = MKC(env, MKT2(env, atom_siftxqlen, MKUL(env, SIOCSIFTXQLEN)), requests);
+#endif
+
 return requests;
 }
 #endif // #ifndef __WIN32__
@@ -13044,6 +13055,7 @@ ERL_NIF_TERM esock_ioctl2(ErlNifEnv* env,
 * Request arg1 arg1 type arg2 arg2 type
 * ------- ------- --------- ------ ---------
 * gifmtu name string MTU integer
+ * giftxqlen name string Len integer
 */
 static
 ERL_NIF_TERM esock_ioctl3(ErlNifEnv* env,
@@ -13063,6 +13075,12 @@ ERL_NIF_TERM esock_ioctl3(ErlNifEnv* env,
 break;
 #endif
 
+#if defined(SIOCSIFTXQLEN)
+ case SIOCSIFTXQLEN:
+ return esock_ioctl_siftxqlen(env, descP, ename, eval);
+ break;
+#endif
+
 default:
 return esock_make_error(env, esock_atom_enotsup);
 break;
@@ -13729,14 +13747,14 @@ ERL_NIF_TERM esock_ioctl_sifmtu(ErlNifEnv* env,
 
 SSDBG( descP, ("SOCKET", "esock_ioctl_gifmtu {%d} -> entry with"
 		 "\r\n (e)Name: %T"
-		 "\r\n", descP->sock, ename) );
+		 "\r\n (e)MTU: %T"
+		 "\r\n", descP->sock, ename, emtu) );
 
 if (!esock_decode_string(env, ename, &ifn)) {
 
 SSDBG( descP,
-	 ("SOCKET", "esock_ioctl_sifmtu {%d} -> failed decode name: "
-	 "\r\n ename: %T"
-	 "\r\n", descP->sock, ename) );
+	 ("SOCKET", "esock_ioctl_sifmtu {%d} -> failed decode name"
+	 "\r\n", descP->sock) );
 
 return enif_make_badarg(env);
 }
@@ -13744,9 +13762,8 @@ ERL_NIF_TERM esock_ioctl_sifmtu(ErlNifEnv* env,
 if (! GET_INT(env, emtu, &ifreq.ifr_mtu)) {
 
 SSDBG( descP,
-	 ("SOCKET", "esock_ioctl_sifmtu {%d} -> failed decode MTU: "
-	 "\r\n emtu: %T"
-	 "\r\n", descP->sock, emtu) );
+	 ("SOCKET", "esock_ioctl_sifmtu {%d} -> failed decode MTU"
+	 "\r\n", descP->sock) );
 
 return enif_make_badarg(env);
 }
@@ -13851,6 +13868,85 @@ ERL_NIF_TERM esock_ioctl_giftxqlen(ErlNifEnv* env,
 #endif
 
 
+#if defined(SIOCSIFTXQLEN)
+static
+ERL_NIF_TERM esock_ioctl_siftxqlen(ErlNifEnv* env,
+				 ESockDescriptor* descP,
+				 ERL_NIF_TERM ename,
+				 ERL_NIF_TERM eqlen)
+{
+ ERL_NIF_TERM result;
+ struct ifreq ifreq;
+ char* ifn = NULL;
+ int nlen;
+
+ SSDBG( descP, ("SOCKET", "esock_ioctl_gifmtu {%d} -> entry with"
+		 "\r\n (e)Name: %T"
+		 "\r\n (e)QLen: %T"
+		 "\r\n", descP->sock, ename, eqlen) );
+
+ if (!esock_decode_string(env, ename, &ifn)) {
+
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_siftxqlen {%d} -> failed decode name"
+	 "\r\n", descP->sock) );
+
+ return enif_make_badarg(env);
+ }
+
+ if (! GET_INT(env, eqlen, &ifreq.ifr_qlen)) {
+
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_siftxqlen {%d} -> failed decode MTU"
+	 "\r\n", descP->sock) );
+
+ 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_giftxqlen {%d} -> try ioctl with"
+	 "\r\n QLen: %d"
+	 "\r\n", descP->sock, ifreq.ifr_qlen) );
+
+ if (ioctl(descP->sock, SIOCSIFMTU, (char *) &ifreq) < 0) {
+ int saveErrno = sock_errno();
+ ERL_NIF_TERM reason = MKA(env, erl_errno_id(saveErrno));
+
+ SSDBG( descP,
+	 ("SOCKET", "esock_ioctl_giftxqlen {%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_siftxqlen {%d} -> mtu 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;
+
+}
+#endif
+
+
 #if defined(SIOCGIFMAP) && defined(ESOCK_USE_IFMAP)
 static
 ERL_NIF_TERM encode_ioctl_ifrmap(ErlNifEnv* env,
diff --git a/lib/kernel/doc/src/socket.xml b/lib/kernel/doc/src/socket.xml
index 67fd306ec8..8c267ae64d 100644
--- a/lib/kernel/doc/src/socket.xml
+++ b/lib/kernel/doc/src/socket.xml
@@ -2063,10 +2063,16 @@
 
 	 <tag><c>sifmtu</c></tag>
 <item>
-	 Set the MTU (Maximum Transfer Unit, <c>integer()</c>)
+	 Set the MTU (Maximum Transfer Unit), <c>integer()</c>,
 	 for the interface with the specified name. 
 </item>
 
+ <tag><c>siftxqlen</c></tag>
+ <item>
+	 Set the transmit queue length, <c>integer()</c>,
+	 of the interface with the specified name. 
+ </item>
+
 	</taglist>
 
 </desc>
diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
index 4e388f47ac..ad284a5de2 100644
--- a/lib/kernel/src/socket.erl
+++ b/lib/kernel/src/socket.erl
@@ -4185,16 +4185,19 @@ ioctl(Socket, GetRequest, Arg) ->
 erlang:error(badarg, [Socket, GetRequest, Arg]).
 
 
--spec ioctl(Socket, SetRequest, Name, MTU) -> 'ok' | {'error', Reason} when
+-spec ioctl(Socket, SetRequest, Name, Value) -> 'ok' | {'error', Reason} when
 Socket :: socket(),
- SetRequest :: 'gifmtu',
+ SetRequest :: 'gifmtu' | 'siftxqlen',
 Name :: string(),
- MTU :: integer(),
+ Value :: integer(),
 Reason :: posix() | 'closed'.
 
 ioctl(?socket(SockRef), sifmtu = SetRequest, Name, MTU)
 when is_list(Name) andalso is_integer(MTU) ->
 prim_socket:ioctl(SockRef, SetRequest, Name, MTU);
+ioctl(?socket(SockRef), siftxqlen = SetRequest, Name, QLen)
+ when is_list(Name) andalso is_integer(QLen) ->
+ prim_socket:ioctl(SockRef, SetRequest, Name, QLen);
 ioctl(Socket, SetRequest, Arg1, Arg2) ->
 erlang:error(badarg, [Socket, SetRequest, Arg1, Arg2]).
 
-- 
2.31.1

Places

File 2021-esock-Add-support-for-ioctl-request-siftxqlen.patch of Package erlang (Revision 2acc9ef00b7ed8ebf6555724dee420d9)

Places