From 2e912158af030c3774495eef91204e1f6e213ce0 Mon Sep 17 00:00:00 2001
From: Alexander Sack <asac@ubuntu.com>
Date: Fri, 4 Sep 2009 16:55:48 +0200
Subject: [PATCH] core: ensure that modem-manager claimed data devices are
 ignored

add function nm_modem_manager_has_modem_for_iface to modem-manager api
and ignore device additions in nm-manager if the iface is claimed by
modem-manager; also forget about already managed devices once they get
claimed by modem-manager.
---
 src/modem-manager/nm-modem-manager.c | 19 ++++++++++++
 src/modem-manager/nm-modem-manager.h |  3 ++
 src/nm-manager.c                     | 46 ++++++++++++++++++++++++++--
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c
index e3be114a66..3b9f6438a6 100644
--- a/src/modem-manager/nm-modem-manager.c
+++ b/src/modem-manager/nm-modem-manager.c
@@ -47,6 +47,25 @@ nm_modem_manager_get (void)
 	return singleton;
 }
 
+gboolean
+nm_modem_manager_has_modem_for_iface (NMModemManager *manager,
+                                      const gchar *iface)
+{
+	NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (manager);
+	GList *iter;
+	g_assert (manager);
+	g_assert (NM_IS_MODEM_MANAGER(manager));
+	g_assert (iface);
+
+	for (iter = g_hash_table_get_values(priv->modems); iter != NULL; iter = iter->next) {
+		NMDevice *device = NM_DEVICE(iter->data);
+		const gchar *device_iface = nm_device_get_iface (device);
+		if (!g_strcmp0 (iface, device_iface))
+			return TRUE;
+	}
+	return FALSE;
+}
+
 static gboolean
 get_modem_properties (DBusGConnection *connection,
 					  const char *path,
diff --git a/src/modem-manager/nm-modem-manager.h b/src/modem-manager/nm-modem-manager.h
index fb51f73988..34e99f1ec8 100644
--- a/src/modem-manager/nm-modem-manager.h
+++ b/src/modem-manager/nm-modem-manager.h
@@ -32,4 +32,7 @@ GType nm_modem_manager_get_type (void);
 
 NMModemManager *nm_modem_manager_get (void);
 
+gboolean nm_modem_manager_has_modem_for_iface (NMModemManager *manager,
+                                               const gchar *iface);
+
 #endif /* NM_MODEM_MANAGER_H */
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 7a1ab2f38b..0305c64c2c 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -30,6 +30,7 @@
 #include "nm-dbus-manager.h"
 #include "nm-vpn-manager.h"
 #include "nm-modem-manager.h"
+#include "nm-modem.h"
 #include "nm-device-bt.h"
 #include "nm-device-interface.h"
 #include "nm-device-private.h"
@@ -124,6 +125,15 @@ static const char *internal_activate_device (NMManager *manager,
                                              gboolean assumed,
                                              GError **error);
 
+static NMDevice *
+find_device_by_iface (NMManager *self, const gchar *iface);
+
+static GSList *
+remove_one_device (NMManager *manager,
+                   GSList *list,
+                   NMDevice *device,
+                   gboolean quitting);
+
 #define SSD_POKE_INTERVAL 120
 #define ORIGDEV_TAG "originating-device"
 
@@ -281,8 +291,13 @@ modem_added (NMModemManager *modem_manager,
 			 NMDevice *modem,
 			 gpointer user_data)
 {
+	NMManagerPrivate *priv;
 	NMDeviceType type;
+	NMDevice *replace_device;
 	const char *type_name;
+	const char *ip_iface;
+
+	priv = NM_MANAGER_GET_PRIVATE (user_data);
 
 	type = nm_device_get_device_type (NM_DEVICE (modem));
 	if (type == NM_DEVICE_TYPE_GSM)
@@ -292,6 +307,13 @@ modem_added (NMModemManager *modem_manager,
 	else
 		type_name = "Unknown modem";
 
+	ip_iface = nm_device_get_ip_iface (modem);
+
+	replace_device = find_device_by_iface (NM_MANAGER (user_data), ip_iface);
+	if (replace_device) {
+		priv->devices = remove_one_device (NM_MANAGER (user_data), priv->devices, replace_device, FALSE);
+	}
+
 	add_device (NM_MANAGER (user_data), NM_DEVICE (g_object_ref (modem)));
 }
 
@@ -1176,6 +1198,14 @@ add_device (NMManager *self, NMDevice *device)
 
 	priv->devices = g_slist_append (priv->devices, device);
 
+	iface = nm_device_get_ip_iface (device);
+	g_assert (iface);
+
+	if (!NM_IS_MODEM(device) && nm_modem_manager_has_modem_for_iface (priv->modem_manager, iface)) {
+		g_object_unref (device);
+		return;
+	}
+
 	g_signal_connect (device, "state-changed",
 					  G_CALLBACK (manager_device_state_changed),
 					  self);
@@ -1194,8 +1224,6 @@ add_device (NMManager *self, NMDevice *device)
 
 	type_desc = nm_device_get_type_desc (device);
 	g_assert (type_desc);
-	iface = nm_device_get_iface (device);
-	g_assert (iface);
 	driver = nm_device_get_driver (device);
 	if (!driver)
 		driver = "unknown";
@@ -1435,6 +1463,20 @@ bluez_manager_bdaddr_removed_cb (NMBluezManager *bluez_mgr,
 	}
 }
 
+static NMDevice *
+find_device_by_iface (NMManager *self, const gchar *iface)
+{
+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+	GSList *iter;
+	for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
+		NMDevice *device = NM_DEVICE (iter->data);
+		const gchar *d_iface = nm_device_get_ip_iface (device);
+		if (!strcmp (d_iface, iface))
+			return device;
+	}
+	return NULL;
+}
+
 static NMDevice *
 find_device_by_ifindex (NMManager *self, guint32 ifindex)
 {