From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 1 Sep 2008 19:14:09 +0000 (+0200)
Subject: Use INET helpers for setting the interface name
X-Git-Tag: 0.1~196
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=a977d2f3861ad3344238326c744974009545c591;hp=7f30feb2513f6a1609f291e4e9c647a08434d2c2;p=connman

Use INET helpers for setting the interface name
---

diff --git a/plugins/dhclient.c b/plugins/dhclient.c
index ee8a3a5..342e6d7 100644
--- a/plugins/dhclient.c
+++ b/plugins/dhclient.c
@@ -31,6 +31,8 @@
 #include <connman/dbus.h>
 #include <connman/log.h>
 
+#include "inet.h"
+
 #define DHCLIENT_INTF "org.isc.dhclient"
 #define DHCLIENT_PATH "/org/isc/dhclient"
 
@@ -140,8 +142,8 @@ static int dhclient_probe(struct connman_element *element)
 	if (task == NULL)
 		return -ENOMEM;
 
-	task->ifindex = element->netdev.index;
-	task->ifname = g_strdup(element->netdev.name);
+	task->ifindex = element->index;
+	task->ifname = inet_index2name(element->index);
 	task->element = element;
 
 	if (task->ifname == NULL) {
@@ -203,7 +205,7 @@ static void dhclient_remove(struct connman_element *element)
 
 	g_static_mutex_lock(&task_mutex);
 
-	task = find_task_by_index(element->netdev.index);
+	task = find_task_by_index(element->index);
 	if (task != NULL)
 		task_list = g_slist_remove(task_list, task);
 
@@ -301,10 +303,9 @@ static DBusHandlerResult dhclient_filter(DBusConnection *conn,
 	} else if (g_ascii_strcasecmp(text, "BOUND") == 0 ||
 				g_ascii_strcasecmp(text, "REBOOT") == 0) {
 		struct connman_element *element;
-		element = connman_element_create();
+		element = connman_element_create(NULL);
 		element->type = CONNMAN_ELEMENT_TYPE_IPV4;
-		element->netdev.index = task->ifindex;
-		element->netdev.name = g_strdup(task->ifname);
+		element->index = task->ifindex;
 		connman_element_update(task->element);
 		connman_element_register(element, task->element);
 	} else if (g_ascii_strcasecmp(text, "RENEW") == 0 ||
diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index 3fd3cb9..b0d74c6 100644
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -28,6 +28,7 @@
 
 #include <connman/log.h>
 
+#include "inet.h"
 #include "supplicant.h"
 
 #define TIMEOUT 5000
@@ -909,8 +910,8 @@ int __supplicant_start(struct connman_element *element,
 	if (task == NULL)
 		return -ENOMEM;
 
-	task->ifindex = element->netdev.index;
-	task->ifname = g_strdup(element->netdev.name);
+	task->ifindex = element->index;
+	task->ifname = inet_index2name(element->index);
 	task->element = element;
 	task->callback = callback;
 
@@ -954,7 +955,7 @@ int __supplicant_stop(struct connman_element *element)
 
 	DBG("element %p name %s", element, element->name);
 
-	task = find_task_by_index(element->netdev.index);
+	task = find_task_by_index(element->index);
 	if (task == NULL)
 		return -ENODEV;
 
@@ -986,7 +987,7 @@ int __supplicant_scan(struct connman_element *element)
 
 	DBG("element %p name %s", element, element->name);
 
-	task = find_task_by_index(element->netdev.index);
+	task = find_task_by_index(element->index);
 	if (task == NULL)
 		return -ENODEV;
 
@@ -1013,7 +1014,7 @@ int __supplicant_connect(struct connman_element *element, const char *ssid)
 
 	DBG("element %p name %s", element, element->name);
 
-	task = find_task_by_index(element->netdev.index);
+	task = find_task_by_index(element->index);
 	if (task == NULL)
 		return -ENODEV;
 
@@ -1035,7 +1036,7 @@ int __supplicant_disconnect(struct connman_element *element)
 
 	DBG("element %p name %s", element, element->name);
 
-	task = find_task_by_index(element->netdev.index);
+	task = find_task_by_index(element->index);
 	if (task == NULL)
 		return -ENODEV;