Show message when ignoring VMware or VirtualBox interfaces
authorMarcel Holtmann <marcel@holtmann.org>
Mon, 13 Apr 2009 21:40:57 +0000 (23:40 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 13 Apr 2009 21:40:57 +0000 (23:40 +0200)
src/detect.c

index b096318..9f3895d 100644 (file)
@@ -203,18 +203,18 @@ static void detect_newlink(unsigned short type, int index,
 
                sk = socket(PF_INET, SOCK_DGRAM, 0);
 
-               if (g_str_has_prefix(devname, "bnep") == TRUE)
+               if (g_str_has_prefix(devname, "vmnet") == TRUE ||
+                               g_str_has_prefix(devname, "vboxnet") == TRUE) {
+                       connman_info("Ignoring network interface %s", devname);
                        devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
-               else if (g_str_has_prefix(devname, "wmx") == TRUE)
+               } else if (g_str_has_prefix(devname, "bnep") == TRUE)
                        devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
-               else if (g_str_has_prefix(devname, "vmnet") == TRUE)
+               else if (g_str_has_prefix(devname, "wmx") == TRUE)
                        devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
-               else if (g_str_has_prefix(devname, "vboxnet") == TRUE)
+               else if (stat(wimax_path, &st) == 0 && (st.st_mode & S_IFDIR))
                        devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
                else if (stat(bridge_path, &st) == 0 && (st.st_mode & S_IFDIR))
                        devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
-               else if (stat(wimax_path, &st) == 0 && (st.st_mode & S_IFDIR))
-                       devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
                else if (ioctl(sk, SIOCGIWNAME, &iwr) == 0)
                        devtype = CONNMAN_DEVICE_TYPE_WIFI;
                else