File 7721-erts-inet-drv-Adjust-for-Windows.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 7721-erts-inet-drv-Adjust-for-Windows.patch of Package erlang (Revision 2b8d27ae7717c343be1a05a52e3dc269)

Currently displaying revision 2b8d27ae7717c343be1a05a52e3dc269 , Show latest

From a3bb3d41c1b50da86d39a0c117297e539556575f Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 24 May 2022 10:27:37 +0200
Subject: [PATCH 11/11] [erts|inet-drv] Adjust for Windows

OTP-18091
---
 erts/emulator/drivers/common/inet_drv.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 7b7281eab2..780504ee12 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -6551,7 +6551,7 @@ int inet_setopt(int fd,
 {
     int res;
 
-#if  defined(IP_TOS) && defined(IPPROTO_IP)             \
+#if defined(IP_TOS) && defined(IPPROTO_IP)             \
     && defined(SO_PRIORITY) && !defined(__WIN32__)
     DEBUGF(("inet_setopt -> try trick setopt with"
              "\r\n   fd:        %d"
@@ -7235,19 +7235,12 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
                 len -= 4;
 
                 DEBUGF(("inet_set_opts(L_init_mreq) -> "
-                        "\r\n   proto:  %d (%d, %d)"
-                        "\r\n   type:   %d (%d, %d)"
+                        "\r\n   proto:  %d"
+                        "\r\n   type:   %d"
                         "\r\n   domain: %d"
                         "\r\n   if:     %d"
                         "\r\n",
-                        proto, IPPROTO_IP, IPPROTO_IPV6,
-                        type,  IP_ADD_MEMBERSHIP,
-#if defined(INET_ADD_MEMBERSHIP)
-                        INET_ADD_MEMBERSHIP,
-#else
-                        -1,
-#endif
-                        domain, ival));
+                        proto, type, domain, ival));
 
                 if ((domain == INET_AF_INET) && (desc->sfamily == AF_INET)) {
 
-- 
2.35.3

Places

File 7721-erts-inet-drv-Adjust-for-Windows.patch of Package erlang (Revision 2b8d27ae7717c343be1a05a52e3dc269)

Places