[PATCH] iwd: Fix missing Ethernet attributes

* [PATCH] iwd: Fix missing Ethernet attributes
@ 2021-10-01 12:13 VAUTRIN Emmanuel (Canal Plus Prestataire)
  2021-10-01 13:28 ` Michael Nazzareno Trimarchi
  2021-10-04  6:18 ` Daniel Wagner
  0 siblings, 2 replies; 6+ messages in thread
From: VAUTRIN Emmanuel (Canal Plus Prestataire) @ 2021-10-01 12:13 UTC (permalink / raw)
  To: connman

The Interface, Address and MTU attributes of Ethernet Service property
were not retrieved because the interface index was specified to late
(at network connection instead of creation), preventing the access
to the corresponding ipconfig.
---
 plugins/iwd.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/iwd.c b/plugins/iwd.c
index 14a442a7b67c..9f2114f47311 100644
--- a/plugins/iwd.c
+++ b/plugins/iwd.c
@@ -209,18 +209,13 @@ static int cm_network_probe(struct connman_network *network)
 static void update_network_connected(struct iwd_network *iwdn)
 {
 	struct iwd_device *iwdd;
-	int index;
 
 	iwdd = g_hash_table_lookup(devices, iwdn->device);
 	if (!iwdd)
 		return;
 
-	index = connman_inet_ifindex(iwdd->name);
-	if (index < 0)
-		return;
-
-	DBG("interface name %s index %d", iwdd->name, index);
-	connman_network_set_index(iwdn->network, index);
+	DBG("interface name %s index %d", iwdd->name,
+		connman_network_get_index(iwdn->network));
 	connman_network_set_connected(iwdn->network, true);
 }
 
@@ -912,6 +907,7 @@ static void add_network(const char *path, struct iwd_network *iwdn)
 {
 	struct iwd_device *iwdd;
 	char *identifier;
+	int index;
 
 	iwdd = g_hash_table_lookup(devices, iwdn->device);
 	if (!iwdd)
@@ -920,6 +916,11 @@ static void add_network(const char *path, struct iwd_network *iwdn)
 	identifier = create_identifier(path, iwdn->type);
 	iwdn->network = connman_network_create(identifier,
 					CONNMAN_NETWORK_TYPE_WIFI);
+
+	index = connman_inet_ifindex(iwdd->name);
+	if (index >= 0)
+		connman_network_set_index(iwdn->network, index);
+
 	connman_network_set_data(iwdn->network, iwdn);
 
 	connman_network_set_name(iwdn->network, iwdn->name);
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread