File 7719-erts-inet-drv-Fixed-debug.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 7719-erts-inet-drv-Fixed-debug.patch of Package erlang (Revision ab1ca4cb7b8975d653610c5471c0e276)

Currently displaying revision ab1ca4cb7b8975d653610c5471c0e276 , Show latest

From e9ad2ea04c4b689b48d5093925e69f5e58e17812 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 23 May 2022 15:25:04 +0200
Subject: [PATCH 09/11] [erts|inet-drv] Fixed debug

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

diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 8596b07c88..7b7281eab2 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -7269,6 +7269,19 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
                     mreq4.imr_multiaddr.s_addr = sock_htonl(ival);
                     ival = get_int32(ptr);
                     mreq4.imr_address.s_addr   = sock_htonl(ival);
+
+                    DEBUGF(("inet_set_opts(L_init_mreq,inet) -> "
+                            "try setopt: "
+                            "\r\n   maddr: %x"
+                            "\r\n   addr:  %x"
+                            "\r\n   if:    %d"
+                            "\r\n   sz:    %d"
+                            "\r\n",
+                            mreq4.imr_multiaddr.s_addr,
+                            mreq4.imr_address.s_addr,
+                            mreq4.imr_ifindex,
+                            mreqSz));
+
 #else
 
                     DEBUGF(("inet_set_opts(L_init_mreq,inet) -> mreq\r\n"));
@@ -7279,10 +7292,6 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
                     mreq4.imr_multiaddr.s_addr = sock_htonl(ival);
                     ival = get_int32(ptr);
                     mreq4.imr_interface.s_addr = sock_htonl(ival);
-#endif
-
-                    arg_ptr = (char*)&mreq4;
-                    arg_sz  = mreqSz;
 
                     DEBUGF(("inet_set_opts(L_init_mreq,inet) -> "
                             "try setopt: "
@@ -7294,6 +7303,11 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
                             mreq4.imr_interface.s_addr,
                             mreqSz));
 
+#endif
+
+                    arg_ptr = (char*)&mreq4;
+                    arg_sz  = mreqSz;
+
                 }
 #if defined(HAVE_IN6) && defined(AF_INET6) && defined(IPPROTO_IPV6)
                 else if ((domain == INET_AF_INET6) &&
-- 
2.35.3

Places

File 7719-erts-inet-drv-Fixed-debug.patch of Package erlang (Revision ab1ca4cb7b8975d653610c5471c0e276)

Places