ffe029ef99
Use dhcp-config package to package config files for dhcp package. Rename files folder to patches Removed site.h which is not used Deployment test and ping test between VMs pass config and script files check pass. Story: 2003768 Task: 27582 Change-Id: Ib7fd3c0ed6d706f89d08890e90ccee42673b3679 Signed-off-by: zhipengl <zhipengs.liu@intel.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
|
|
@@ -236,6 +236,15 @@ if_register_socket(struct interface_info *info, int family,
|
|
}
|
|
#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");
|
|
@@ -246,15 +255,6 @@ if_register_socket(struct interface_info *info, int family,
|
|
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
|
|
|