From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 13 Apr 2009 21:40:57 +0000 (+0200)
Subject: Show message when ignoring VMware or VirtualBox interfaces
X-Git-Tag: 0.16~64
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=ac792e3fc9eef253d90363fa30216f72f8720481;hp=2cf1a67e444cb3aadefd2b1df970a5269c49e3ce;p=connman

Show message when ignoring VMware or VirtualBox interfaces
---

diff --git a/src/detect.c b/src/detect.c
index b096318..9f3895d 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -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