From 3ed3733d91b7d350c54cc3bf39e30248e1ba6320 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 25 Mar 2009 18:49:44 -0700 Subject: [PATCH] Add support for network address property --- src/network.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/network.c b/src/network.c index d77173b..fefc369 100644 --- a/src/network.c +++ b/src/network.c @@ -39,6 +39,7 @@ struct connman_network { connman_uint8_t priority; connman_uint8_t strength; char *identifier; + char *address; char *name; char *node; @@ -109,6 +110,10 @@ static DBusMessage *get_properties(DBusConnection *conn, DBUS_TYPE_OBJECT_PATH, &path); } + if (network->address != NULL) + connman_dbus_dict_append_variant(&dict, "Address", + DBUS_TYPE_STRING, &network->address); + if (network->name != NULL) connman_dbus_dict_append_variant(&dict, "Name", DBUS_TYPE_STRING, &network->name); @@ -430,6 +435,7 @@ static void network_destruct(struct connman_element *element) g_free(network->node); g_free(network->name); + g_free(network->address); g_free(network->identifier); } @@ -836,7 +842,10 @@ int connman_network_set_string(struct connman_network *network, { DBG("network %p key %s value %s", network, key, value); - if (g_str_equal(key, "Name") == TRUE) { + if (g_str_equal(key, "Address") == TRUE) { + g_free(network->address); + network->address = g_strdup(value); + } else if (g_str_equal(key, "Name") == TRUE) { g_free(network->name); network->name = g_strdup(value); } else if (g_str_equal(key, "Node") == TRUE) { @@ -868,7 +877,9 @@ const char *connman_network_get_string(struct connman_network *network, { DBG("network %p key %s", network, key); - if (g_str_equal(key, "Name") == TRUE) + if (g_str_equal(key, "Address") == TRUE) + return network->address; + else if (g_str_equal(key, "Name") == TRUE) return network->name; else if (g_str_equal(key, "Node") == TRUE) return network->node; -- 2.7.4