Commit 3273cacf authored by Stefan Becker's avatar Stefan Becker

interfaces: ignore only interfaces we really want to (II)

This improves commit bd4b4781

There is a second place where this fix is needed.
parent 49d25a82
...@@ -273,7 +273,7 @@ get_local_ips_ioctl (gboolean include_loopback) ...@@ -273,7 +273,7 @@ get_local_ips_ioctl (gboolean include_loopback)
GList *loopbacks = NULL; GList *loopbacks = NULL;
#ifdef IGNORED_IFACE_PREFIX #ifdef IGNORED_IFACE_PREFIX
const gchar **prefix; const gchar **prefix;
gboolean ignored = FALSE; gboolean ignored;
#endif #endif
if ((sockfd = socket (AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) { if ((sockfd = socket (AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) {
...@@ -336,11 +336,12 @@ get_local_ips_ioctl (gboolean include_loopback) ...@@ -336,11 +336,12 @@ get_local_ips_ioctl (gboolean include_loopback)
} }
#ifdef IGNORED_IFACE_PREFIX #ifdef IGNORED_IFACE_PREFIX
ignored = FALSE;
for (prefix = ignored_iface_prefix_list; *prefix; prefix++) { for (prefix = ignored_iface_prefix_list; *prefix; prefix++) {
if (g_str_has_prefix (ifr->ifr_name, *prefix)) { if (g_str_has_prefix (ifr->ifr_name, *prefix)) {
nice_debug ("Ignoring interface %s as it matches prefix %s", nice_debug ("Ignoring interface %s as it matches prefix %s",
ifr->ifr_name, *prefix); ifr->ifr_name, *prefix);
ignored = true; ignored = TRUE;
break; break;
} }
} }
...@@ -375,7 +376,7 @@ nice_interfaces_get_local_ips (gboolean include_loopback) ...@@ -375,7 +376,7 @@ nice_interfaces_get_local_ips (gboolean include_loopback)
GList *loopbacks = NULL; GList *loopbacks = NULL;
#ifdef IGNORED_IFACE_PREFIX #ifdef IGNORED_IFACE_PREFIX
const gchar **prefix; const gchar **prefix;
gboolean ignored = FALSE; gboolean ignored;
#endif #endif
if (getifaddrs (&results) < 0) { if (getifaddrs (&results) < 0) {
...@@ -426,7 +427,7 @@ nice_interfaces_get_local_ips (gboolean include_loopback) ...@@ -426,7 +427,7 @@ nice_interfaces_get_local_ips (gboolean include_loopback)
nice_debug ("Ignoring interface %s as it matches prefix %s", nice_debug ("Ignoring interface %s as it matches prefix %s",
ifa->ifa_name, *prefix); ifa->ifa_name, *prefix);
g_free (addr_string); g_free (addr_string);
ignored = true; ignored = TRUE;
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment