query loopback in all cases.

diff --git a/new_discovery.c b/new_discovery.c
index 3fba2ea9c509cbd3dddb3aa1fb2b8af5d02f6357..45b2a6089495a3b4f07142cb6df75a4412aa4e44 100644 (file)
--- a/new_discovery.c
+++ b/new_discovery.c
@@ -72,35 +72,13 @@ void new_discovery() {
     getifaddrs(&addrs);
     ifa = addrs;
 
-//
-//  count number of "up and running" interfaces
-//
-    int num_up_and_running = 0;
-    while (ifa) {
-      if (ifa->ifa_addr) {
-        if (ifa->ifa_addr->sa_family == AF_INET
-            && (ifa->ifa_flags & IFF_UP) == IFF_UP
-            && (ifa->ifa_flags & IFF_RUNNING) == IFF_RUNNING) {
-                num_up_and_running++;
-        }
-      }
-      ifa=ifa->ifa_next;
-    }
-
-    ifa=addrs;
     while (ifa) {
         g_main_context_iteration(NULL, 0);
         if (ifa->ifa_addr) {
           if(ifa->ifa_addr->sa_family == AF_INET &&
             (ifa->ifa_flags&IFF_UP)==IFF_UP &&
             (ifa->ifa_flags&IFF_RUNNING)==IFF_RUNNING) {
-//
-// if this is the loopback interface, do the discover only if
-// there is at most one interface
-//
-                if ((ifa->ifa_flags & IFF_LOOPBACK) != IFF_LOOPBACK
-                    || num_up_and_running <= 1)
-                                new_discover(ifa);
+               new_discover(ifa);
           }
         }
         ifa = ifa->ifa_next;

diff --git a/old_discovery.c b/old_discovery.c
index 82b4230155fb51d2099d34dd9362db2ebae10c11..694053b04231d2975e63bee1e5e0987f8096542d 100644 (file)
--- a/old_discovery.c
+++ b/old_discovery.c
@@ -515,35 +515,14 @@ void old_discovery() {
 fprintf(stderr,"old_discovery\n");
     getifaddrs(&addrs);
     ifa = addrs;
-//
-//  count number of "up and running" interfaces
-//
-    int num_up_and_running = 0;
-    while (ifa) {
-      if (ifa->ifa_addr) {
-       if (ifa->ifa_addr->sa_family == AF_INET
-           && (ifa->ifa_flags & IFF_UP) == IFF_UP
-            && (ifa->ifa_flags & IFF_RUNNING) == IFF_RUNNING) {
-               num_up_and_running++;
-       }
-      }
-      ifa=ifa->ifa_next;
-    }
-       
-    ifa=addrs;
+
     while (ifa) {
         g_main_context_iteration(NULL, 0);
         if (ifa->ifa_addr) {
          if(ifa->ifa_addr->sa_family == AF_INET &&
             (ifa->ifa_flags&IFF_UP)==IFF_UP &&
             (ifa->ifa_flags&IFF_RUNNING)==IFF_RUNNING) {
-//
-// if this is the loopback interface, do the discover only if
-// there is at most one interface
-//
-               if ((ifa->ifa_flags & IFF_LOOPBACK) != IFF_LOOPBACK
-                   || num_up_and_running <= 1)
-                               discover(ifa);
+               discover(ifa);
          }
         }
         ifa = ifa->ifa_next;