File 2019-esock-Add-support-for-ioctl-4-set-in-prim_... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2019-esock-Add-support-for-ioctl-4-set-in-prim_socket.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From de5f0859e74796d753aa1559c1e14fc8ec155ba2 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 29 Oct 2021 16:43:59 +0200
Subject: [PATCH 19/58] [esock] Add support for ioctl/4 (set) in prim_socket

OTP-17528
---
 erts/preloaded/ebin/prim_socket.beam | Bin 34204 -> 34596 bytes
 erts/preloaded/src/prim_socket.erl   |  18 +++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/erts/preloaded/src/prim_socket.erl b/erts/preloaded/src/prim_socket.erl
index ad976b9d91..47038a9bcc 100644
--- a/erts/preloaded/src/prim_socket.erl
+++ b/erts/preloaded/src/prim_socket.erl
@@ -43,7 +43,7 @@
     setopt/3, setopt_native/3,
     getopt/2, getopt_native/3,
     sockname/1, peername/1,
-    ioctl/2, ioctl/3,
+    ioctl/2, ioctl/3, ioctl/4,
     cancel/3
    ]).
 
@@ -832,6 +832,17 @@ ioctl(SRef, GReq, Arg) ->
     end.
 
 
+ioctl(SRef, SReq, Arg1, Arg2) ->
+    case enc_ioctl_request(SReq) of
+	undefined ->
+	    {error, {invalid, {ioctl_request, SReq}}};
+	invalid ->
+	    {error, {invalid, {ioctl_request, SReq}}};
+	SReqNUM ->
+	    nif_ioctl(SRef, SReqNUM, Arg1, Arg2)
+    end.
+
+
 %% ----------------------------------
 
 cancel(SRef, Op, Ref) ->
@@ -1113,8 +1124,9 @@ nif_getopt(_SockRef, _Lev, _Opt, _ValSpec) -> erlang:nif_error(undef).
 nif_sockname(_SockRef) -> erlang:nif_error(undef).
 nif_peername(_SockRef) -> erlang:nif_error(undef).
 
-nif_ioctl(_SockRef, _GReq)       -> erlang:nif_error(undef).
-nif_ioctl(_SockRef, _GReq, _Arg) -> erlang:nif_error(undef).
+nif_ioctl(_SockRef, _GReq)               -> erlang:nif_error(undef).
+nif_ioctl(_SockRef, _GReq, _Arg)         -> erlang:nif_error(undef).
+nif_ioctl(_SockRef, _SReq, _Arg1, _Arg2) -> erlang:nif_error(undef).
 
 nif_cancel(_SockRef, _Op, _SelectRef) -> erlang:nif_error(undef).
 
-- 
2.31.1

Places

File 2019-esock-Add-support-for-ioctl-4-set-in-prim_socket.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places