Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[201811][isc-dhcp-relay] Patch to allow DHCP relay agent to discover interfaces even if they are down #3852

Merged
merged 1 commit into from
Dec 7, 2019
Merged

[201811][isc-dhcp-relay] Patch to allow DHCP relay agent to discover interfaces even if they are down #3852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/isc-dhcp/patch/0013-Don-t-skip-down-interfaces-when-discovering-interfac.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 422b08d47dca630396fa38d4239b9c0847dd4fb5 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Fri, 6 Dec 2019 06:09:17 +0000
Subject: [PATCH] Don't skip down interfaces when discovering interfaces in
relay mode

When discovering interfaces in relay mode, don't skip interfaces just
because they're down. If we fail to discover the interfaces because they
are down when the relay starts, but then are brought up at a later point
in time, the relay will discard any packets received on them because it
didn't discover the interface(s) when it started up.
---
common/discover.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/discover.c b/common/discover.c
index bf82735..f57e3ef 100644
--- a/common/discover.c
+++ b/common/discover.c
@@ -1014,7 +1014,8 @@ discover_interfaces(int state) {
info.flags & IFF_LOOPBACK ||
info.flags & IFF_POINTOPOINT) && !tmp) ||
(!(info.flags & IFF_UP) &&
- state != DISCOVER_UNCONFIGURED))
+ state != DISCOVER_UNCONFIGURED &&
+ state != DISCOVER_RELAY))
continue;

/* If there isn't already an interface by this name,
--
2.17.1

1 change: 1 addition & 0 deletions src/isc-dhcp/patch/series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
0010-Add-enable-use-sockets-to-configure-flags-in-debian-.patch
0011-Bugfix-Ensure-HAVE_SO_BINDTODEVICE-has-a-chance-to-b.patch
0012-If-destination-of-BOOTREQUEST-is-directed-broadcast-.patch
0013-Don-t-skip-down-interfaces-when-discovering-interfac.patch