Mercurial > hg > dhcpcd

changeset 1404:36bebf493897 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
We should not affect other interfaces when handling new interface notifications.
author Roy Marples <roy@marples.name>
date Wed, 02 Sep 2009 20:10:55 +0000
parents 747d1e9fafab
children 70641b760d07
files dhcpcd.c net.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dhcpcd.c	Wed Sep 02 20:10:23 2009 +0000
+++ b/dhcpcd.c	Wed Sep 02 20:10:55 2009 +0000
@@ -1187,6 +1187,7 @@
 handle_interface(int action, const char *ifname)
 {
 	struct interface *ifs, *ifp, *ifn, *ifl = NULL;
+	const char * const argv[] = { ifname }; 
 	int i;
 
 	if (action == -1) {
@@ -1208,7 +1209,7 @@
 			return;
 	}
 
-	ifs = discover_interfaces(0, NULL);
+	ifs = discover_interfaces(-1, UNCONST(argv));
 	for (ifp = ifs; ifp; ifp = ifp->next) {
 		if (strcmp(ifp->name, ifname) != 0)
 			continue;
--- a/net.c	Wed Sep 02 20:10:23 2009 +0000
+++ b/net.c	Wed Sep 02 20:10:55 2009 +0000
@@ -308,6 +308,11 @@
 				continue;
 			p = argv[i];
 		} else {
+			/* -1 means we're discovering against a specific
+			 * interface, but we still need the below rules
+			 * to apply. */
+			if (argc == -1 && strcmp(argv[0], ifa->ifa_name) != 0)
+				continue;
 			for (i = 0; i < ifdc; i++)
 				if (!fnmatch(ifdv[i], ifa->ifa_name, 0))
 					break;