6cfb528a43
Aligned the package layout with the concurrent Debian packaging conventions. Relocated package files under 'debian/bullseye/' and removed legacy paths under 'debian/'. Updated related build references to ensure compatibility with Bullseye. ca-certificate cluster-resource-agents dhcp dnsmasq haproxy libfdt lighttpd linuxptp lvm2 lsb openssl pf-bb-config stalld synce4l systemd watchdog Change-Id: Id31c289b6504433f2b739be614022cfed0c2a9b8 Signed-off-by: pmp1 <preetham.mp@windriver.com>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From f1df67309b435da1d9e02b77100a793ba0165f04 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:25:18 -0400
|
|
Subject: [PATCH 3/7] WRS: Patch103: dhclient-ipv6-bind-to-interface.patch
|
|
|
|
---
|
|
common/socket.c | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/common/socket.c b/common/socket.c
|
|
index f30c171..b236c4a 100644
|
|
--- a/common/socket.c
|
|
+++ b/common/socket.c
|
|
@@ -252,6 +252,15 @@ if_register_socket(struct interface_info
|
|
}
|
|
#endif
|
|
|
|
+#if defined(SO_BINDTODEVICE)
|
|
+ /* Bind this socket to this interface. */
|
|
+ if ((!do_multicast || !*do_multicast) && info->ifp &&
|
|
+ setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
|
|
+ (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
|
|
+ log_error("setsockopt: SO_BINDTODEVICE: %m");
|
|
+ }
|
|
+#endif
|
|
+
|
|
/* Bind the socket to this interface's IP address. */
|
|
if (bind(sock, (struct sockaddr *)&name, name_len) < 0) {
|
|
log_error("Can't bind to dhcp address: %m");
|
|
@@ -262,15 +271,6 @@ if_register_socket(struct interface_info
|
|
log_fatal("includes a bootp server.");
|
|
}
|
|
|
|
-#if defined(SO_BINDTODEVICE)
|
|
- /* Bind this socket to this interface. */
|
|
- if ((local_family != AF_INET6) && (info->ifp != NULL) &&
|
|
- setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
|
|
- (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
|
|
- log_fatal("setsockopt: SO_BINDTODEVICE: %m");
|
|
- }
|
|
-#endif
|
|
-
|
|
/* IP_BROADCAST_IF instructs the kernel which interface to send
|
|
* IP packets whose destination address is 255.255.255.255. These
|
|
* will be treated as subnet broadcasts on the interface identified
|
|
--
|
|
1.9.1
|
|
|