|
 |
31febb |
From 68a6c70f25762374f7aed0d4d755345c6f37c78d Mon Sep 17 00:00:00 2001
|
|
|
31febb |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
31febb |
Date: Mon, 31 May 2021 10:56:38 +0200
|
|
|
31febb |
Subject: [PATCH] Simplify construction of a hardcoded IPv4 address
|
|
|
31febb |
|
|
|
31febb |
Change-Id: I822313ee708935dd4ecb636c13a961fdd054d660
|
|
|
31febb |
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116434
|
|
|
31febb |
Tested-by: Jenkins
|
|
|
31febb |
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
|
31febb |
---
|
|
|
31febb |
sd/source/ui/remotecontrol/DiscoveryService.cxx | 12 +-----------
|
|
|
31febb |
1 file changed, 1 insertion(+), 11 deletions(-)
|
|
|
31febb |
|
|
|
31febb |
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
|
|
|
31febb |
index 9ed2ae727761..cf0043387403 100644
|
|
|
31febb |
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
|
|
|
31febb |
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
|
|
|
31febb |
@@ -119,17 +119,7 @@ void DiscoveryService::setupSockets()
|
|
|
31febb |
|
|
|
31febb |
struct ip_mreq multicastRequest;
|
|
|
31febb |
|
|
|
31febb |
-// the Win32 SDK 8.1 deprecates inet_addr()
|
|
|
31febb |
-#if defined(_WIN32)
|
|
|
31febb |
- IN_ADDR addr;
|
|
|
31febb |
- INT ret = InetPtonW(AF_INET, L"239.0.0.1", & addr);
|
|
|
31febb |
- if (1 == ret)
|
|
|
31febb |
- {
|
|
|
31febb |
- multicastRequest.imr_multiaddr.s_addr = addr.S_un.S_addr;
|
|
|
31febb |
- }
|
|
|
31febb |
-#else
|
|
|
31febb |
- multicastRequest.imr_multiaddr.s_addr = inet_addr( "239.0.0.1" );
|
|
|
31febb |
-#endif
|
|
|
31febb |
+ multicastRequest.imr_multiaddr.s_addr = htonl((239U << 24) | 1U); // 239.0.0.1
|
|
|
31febb |
multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
|
|
|
31febb |
|
|
|
31febb |
rc = setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
|
|
|
31febb |
--
|
|
|
31febb |
2.31.1
|
|
|
31febb |
|