Weed out unrequested interfaces if some interfaces were specifically requested; crash...

diff --git a/common/dispatch.c b/common/dispatch.c
index da822557f267fb97b4d8adea2f21bc5f7360058f..15927b509668e0dab5859bb2295b42080df4ab4c 100644 (file)
--- a/common/dispatch.c
+++ b/common/dispatch.c
@@ -69,6 +69,7 @@ void discover_interfaces ()
        struct subnet *subnet;
        struct shared_network *share;
        struct sockaddr_in *foo;
+       int ir;
 #ifdef USE_FALLBACK
        static struct shared_network fallback_network;
 #endif
@@ -85,6 +86,11 @@ void discover_interfaces ()
        if (i < 0)
                error ("ioctl: SIOCGIFCONF: %m");
 
+       if (interfaces)
+               ir = 0;
+       else
+               ir = INTERFACE_REQUESTED;
+
        /* Cycle through the list of interfaces looking for IP addresses.
           Go through twice; once to count the number if addresses, and a
           second time to copy them into an array of addresses. */
@@ -112,6 +118,7 @@ void discover_interfaces ()
                        memset (tmp, 0, sizeof *tmp);
                        strcpy (tmp -> name, ifp -> ifr_name);
                        tmp -> next = interfaces;
+                       tmp -> flags = ir;
                        interfaces = tmp;
                }
 
@@ -196,7 +203,9 @@ void discover_interfaces ()
        /* Weed out the interfaces that did not have IP addresses. */
        last = (struct interface_info *)0;
        for (tmp = interfaces; tmp; tmp = tmp -> next) {
-               if (!tmp -> tif) {
+               if (!tmp -> tif || !(tmp -> flags & INTERFACE_REQUESTED)) {
+                       if (tmp -> flags & INTERFACE_REQUESTED)
+                               error ("%s: not found", tmp -> name);
                        if (!last)
                                interfaces = interfaces -> next;
                        else

diff --git a/dispatch.c b/dispatch.c
index da822557f267fb97b4d8adea2f21bc5f7360058f..15927b509668e0dab5859bb2295b42080df4ab4c 100644 (file)
--- a/dispatch.c
+++ b/dispatch.c
@@ -69,6 +69,7 @@ void discover_interfaces ()
        struct subnet *subnet;
        struct shared_network *share;
        struct sockaddr_in *foo;
+       int ir;
 #ifdef USE_FALLBACK
        static struct shared_network fallback_network;
 #endif
@@ -85,6 +86,11 @@ void discover_interfaces ()
        if (i < 0)
                error ("ioctl: SIOCGIFCONF: %m");
 
+       if (interfaces)
+               ir = 0;
+       else
+               ir = INTERFACE_REQUESTED;
+
        /* Cycle through the list of interfaces looking for IP addresses.
           Go through twice; once to count the number if addresses, and a
           second time to copy them into an array of addresses. */
@@ -112,6 +118,7 @@ void discover_interfaces ()
                        memset (tmp, 0, sizeof *tmp);
                        strcpy (tmp -> name, ifp -> ifr_name);
                        tmp -> next = interfaces;
+                       tmp -> flags = ir;
                        interfaces = tmp;
                }
 
@@ -196,7 +203,9 @@ void discover_interfaces ()
        /* Weed out the interfaces that did not have IP addresses. */
        last = (struct interface_info *)0;
        for (tmp = interfaces; tmp; tmp = tmp -> next) {
-               if (!tmp -> tif) {
+               if (!tmp -> tif || !(tmp -> flags & INTERFACE_REQUESTED)) {
+                       if (tmp -> flags & INTERFACE_REQUESTED)
+                               error ("%s: not found", tmp -> name);
                        if (!last)
                                interfaces = interfaces -> next;
                        else