Integrate RTNL deeper into IP configuration tracking

8 files changed, 66 insertions, 48 deletions

diff --git a/include/rtnl.h b/include/rtnl.h
index 4a60fb0a..6c40f41e 100644
--- a/include/rtnl.h
+++ b/include/rtnl.h
@@ -57,7 +57,6 @@ struct connman_rtnl {
 int connman_rtnl_register(struct connman_rtnl *rtnl);
 void connman_rtnl_unregister(struct connman_rtnl *rtnl);
 
-int connman_rtnl_send_getlink(void);
 int connman_rtnl_send_getroute(void);
 
 #ifdef __cplusplus
diff --git a/plugins/ethernet.c b/plugins/ethernet.c
index cce61c2e..97e1d6ae 100644
--- a/plugins/ethernet.c
+++ b/plugins/ethernet.c
@@ -93,8 +93,6 @@ static int ethernet_probe(struct connman_device *device)
 	ethernet->watch = connman_rtnl_add_newlink_watch(ethernet->index,
 						ethernet_newlink, device);
 
-	//connman_rtnl_send_getlink();
-
 	return 0;
 }
 
diff --git a/plugins/mbm.c b/plugins/mbm.c
index de3da0c1..d27a3f4c 100644
--- a/plugins/mbm.c
+++ b/plugins/mbm.c
@@ -224,8 +224,6 @@ static int mbm_probe(struct connman_device *device)
 	data->watch = connman_rtnl_add_newlink_watch(index,
 						mbm_newlink, device);
 
-	//connman_rtnl_send_getlink();
-
 	return 0;
 }
 
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 039e1176..4dfaf277 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -133,8 +133,6 @@ static int wifi_probe(struct connman_device *device)
 	wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
 							wifi_newlink, device);
 
-	//connman_rtnl_send_getlink();
-
 	return 0;
 }
 
diff --git a/src/connman.h b/src/connman.h
index b9079777..28df972d 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -92,6 +92,8 @@ int __connman_security_check_privilege(DBusMessage *message,
 #include <connman/ipconfig.h>
 
 int __connman_ipconfig_get_index(struct connman_ipconfig *ipconfig);
+unsigned short __connman_ipconfig_get_type(struct connman_ipconfig *ipconfig);
+unsigned int __connman_ipconfig_get_flags(struct connman_ipconfig *ipconfig);
 
 void __connman_ipconfig_update_link(struct connman_ipconfig *ipconfig,
 					unsigned flags, unsigned change);
@@ -358,6 +360,3 @@ void __connman_rtnl_start(void);
 void __connman_rtnl_cleanup(void);
 
 int __connman_rtnl_send(const void *buf, size_t len);
-
-int __connman_rtnl_register_ipconfig(struct connman_ipconfig *ipconfig);
-void __connman_rtnl_unregister_ipconfig(struct connman_ipconfig *ipconfig);
diff --git a/src/ipconfig.c b/src/ipconfig.c
index 764836ab..70131ad5 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -37,6 +37,7 @@ struct connman_ipconfig {
 	gint refcount;
 	int index;
 	char *interface;
+	unsigned short type;
 	unsigned int flags;
 	enum connman_ipconfig_method method;
 };
@@ -65,8 +66,6 @@ struct connman_ipconfig *connman_ipconfig_create(int index)
 
 	DBG("ipconfig %p", ipconfig);
 
-	//__connman_rtnl_register_ipconfig(ipconfig);
-
 	connman_info("%s {create} index %d", ipconfig->interface,
 							ipconfig->index);
 
@@ -95,8 +94,6 @@ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
 void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
 {
 	if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
-		//__connman_rtnl_unregister_ipconfig(ipconfig);
-
 		connman_info("%s {remove} index %d", ipconfig->interface,
 							ipconfig->index);
 
@@ -125,6 +122,16 @@ int __connman_ipconfig_get_index(struct connman_ipconfig *ipconfig)
 	return ipconfig->index;
 }
 
+unsigned short __connman_ipconfig_get_type(struct connman_ipconfig *ipconfig)
+{
+	return ipconfig->type;
+}
+
+unsigned int __connman_ipconfig_get_flags(struct connman_ipconfig *ipconfig)
+{
+	return ipconfig->flags;
+}
+
 void __connman_ipconfig_update_link(struct connman_ipconfig *ipconfig,
 					unsigned flags, unsigned change)
 {
diff --git a/src/rtnl.c b/src/rtnl.c
index d7b317c3..bec9674d 100644
--- a/src/rtnl.c
+++ b/src/rtnl.c
@@ -47,6 +47,28 @@ struct watch_data {
 static GSList *watch_list = NULL;
 static unsigned int watch_id = 0;
 
+static GHashTable *ipconfig_hash = NULL;
+static GSList *ipconfig_list = NULL;
+
+static void register_ipconfig(struct connman_ipconfig *ipconfig)
+{
+	ipconfig_list = g_slist_append(ipconfig_list, ipconfig);
+}
+
+static void unregister_ipconfig(struct connman_ipconfig *ipconfig)
+{
+	ipconfig_list = g_slist_remove(ipconfig_list, ipconfig);
+}
+
+static void free_ipconfig(gpointer data)
+{
+	struct connman_ipconfig *ipconfig = data;
+
+	unregister_ipconfig(ipconfig);
+
+	connman_ipconfig_unref(ipconfig);
+}
+
 /**
  * connman_rtnl_add_newlink_watch:
  * @index: network device index
@@ -60,6 +82,7 @@ static unsigned int watch_id = 0;
 unsigned int connman_rtnl_add_newlink_watch(int index,
 			connman_rtnl_link_cb_t callback, void *user_data)
 {
+	struct connman_ipconfig *ipconfig;
 	struct watch_data *watch;
 
 	watch = g_try_new0(struct watch_data, 1);
@@ -76,6 +99,14 @@ unsigned int connman_rtnl_add_newlink_watch(int index,
 
 	DBG("id %d", watch->id);
 
+	ipconfig = g_hash_table_lookup(ipconfig_hash, GINT_TO_POINTER(index));
+	if (ipconfig != NULL) {
+		unsigned int flags = __connman_ipconfig_get_flags(ipconfig);
+
+		if (callback)
+			callback(flags, 0, user_data);
+	}
+
 	return watch->id;
 }
 
@@ -105,6 +136,23 @@ void connman_rtnl_remove_watch(unsigned int id)
 	}
 }
 
+static void trigger_newlink(gpointer key, gpointer value, gpointer user_data)
+{
+	struct connman_rtnl *rtnl = user_data;
+	struct connman_ipconfig *ipconfig = value;
+	int index = GPOINTER_TO_INT(key);
+
+	if (index < 0 || ipconfig == NULL)
+		return;
+
+	if (rtnl->newlink) {
+		unsigned short type = __connman_ipconfig_get_type(ipconfig);
+		unsigned int flags = __connman_ipconfig_get_flags(ipconfig);
+
+		rtnl->newlink(type, index, flags, 0);
+	}
+}
+
 static GSList *rtnl_list = NULL;
 
 static gint compare_priority(gconstpointer a, gconstpointer b)
@@ -130,6 +178,8 @@ int connman_rtnl_register(struct connman_rtnl *rtnl)
 	rtnl_list = g_slist_insert_sorted(rtnl_list, rtnl,
 							compare_priority);
 
+	g_hash_table_foreach(ipconfig_hash, trigger_newlink, rtnl);
+
 	return 0;
 }
 
@@ -146,17 +196,6 @@ void connman_rtnl_unregister(struct connman_rtnl *rtnl)
 	rtnl_list = g_slist_remove(rtnl_list, rtnl);
 }
 
-static GHashTable *ipconfig_hash = NULL;
-
-static void free_ipconfig(gpointer data)
-{
-	struct connman_ipconfig *ipconfig = data;
-
-	__connman_rtnl_unregister_ipconfig(ipconfig);
-
-	connman_ipconfig_unref(ipconfig);
-}
-
 static void process_newlink(unsigned short type, int index,
 					unsigned flags, unsigned change)
 {
@@ -175,7 +214,7 @@ static void process_newlink(unsigned short type, int index,
 				g_hash_table_insert(ipconfig_hash,
 					GINT_TO_POINTER(index), ipconfig);
 
-				__connman_rtnl_register_ipconfig(ipconfig);
+				register_ipconfig(ipconfig);
 			}
 		}
 
@@ -318,8 +357,6 @@ static void extract_addr(struct ifaddrmsg *msg, int bytes,
 	}
 }
 
-static GSList *ipconfig_list = NULL;
-
 static void process_newaddr(int family, int prefixlen, int index,
 					struct ifaddrmsg *msg, int bytes)
 {
@@ -364,22 +401,6 @@ static void process_deladdr(int family, int prefixlen, int index,
 	}
 }
 
-int __connman_rtnl_register_ipconfig(struct connman_ipconfig *ipconfig)
-{
-	DBG("ipconfig %p", ipconfig);
-
-	ipconfig_list = g_slist_append(ipconfig_list, ipconfig);
-
-	return 0;
-}
-
-void __connman_rtnl_unregister_ipconfig(struct connman_ipconfig *ipconfig)
-{
-	DBG("ipconfig %p", ipconfig);
-
-	ipconfig_list = g_slist_remove(ipconfig_list, ipconfig);
-}
-
 static inline void print_inet(struct rtattr *attr, const char *name, int family)
 {
 	if (family == AF_INET) {
@@ -852,7 +873,7 @@ static gboolean netlink_event(GIOChannel *chan,
 	return TRUE;
 }
 
-int connman_rtnl_send_getlink(void)
+static int send_getlink(void)
 {
 	struct rtnl_request *req;
 
@@ -948,7 +969,7 @@ void __connman_rtnl_start(void)
 {
 	DBG("");
 
-	connman_rtnl_send_getlink();
+	send_getlink();
 	send_getaddr();
 	connman_rtnl_send_getroute();
 }
diff --git a/src/udev-compat.c b/src/udev-compat.c
index 3ac069b6..238c822f 100644
--- a/src/udev-compat.c
+++ b/src/udev-compat.c
@@ -135,8 +135,6 @@ int __connman_udev_init(void)
 void __connman_udev_start(void)
 {
 	DBG("");
-
-	connman_rtnl_send_getlink();
 }
 
 void __connman_udev_cleanup(void)