From e6b3691c9e158363c5cf7b211c4d5cc125fd0232 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 14 Aug 2018 13:35:23 -0500 Subject: [PATCH] knownnetworks: Expose known_network_get_path So that it can be used to implement Network.KnownNetwork property --- src/knownnetworks.c | 11 +++++------ src/knownnetworks.h | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/knownnetworks.c b/src/knownnetworks.c index 9a912f7d..b47ebb3e 100644 --- a/src/knownnetworks.c +++ b/src/knownnetworks.c @@ -66,8 +66,7 @@ static int timespec_compare(const void *a, const void *b, void *user_data) return 0; } -static const char *iwd_known_network_get_path( - const struct network_info *network) +const char *known_network_get_path(const struct network_info *network) { static char path[256]; unsigned int pos = 0, i; @@ -86,7 +85,7 @@ static const char *iwd_known_network_get_path( static void known_network_register_dbus(struct network_info *network) { - const char *path = iwd_known_network_get_path(network); + const char *path = known_network_get_path(network); if (!l_dbus_object_add_interface(dbus_get_bus(), path, IWD_KNOWN_NETWORK_INTERFACE, network)) @@ -116,7 +115,7 @@ static void known_network_update(struct network_info *orig_network, if (timespec_compare(&network->connected_time, connected_time, NULL) && orig_network) { l_dbus_property_changed(dbus_get_bus(), - iwd_known_network_get_path(network), + known_network_get_path(network), IWD_KNOWN_NETWORK_INTERFACE, "LastConnectedTime"); @@ -134,7 +133,7 @@ static void known_network_update(struct network_info *orig_network, if (network->is_hidden != is_hidden && orig_network) l_dbus_property_changed(dbus_get_bus(), - iwd_known_network_get_path(network), + known_network_get_path(network), IWD_KNOWN_NETWORK_INTERFACE, "Hidden"); @@ -280,7 +279,7 @@ static void known_network_removed(struct network_info *network) l_queue_remove(known_networks, network); l_dbus_unregister_object(dbus_get_bus(), - iwd_known_network_get_path(network)); + known_network_get_path(network)); /* * network_info_forget_known will either re-add the network_info to diff --git a/src/knownnetworks.h b/src/knownnetworks.h index e18b5a7f..cccef36c 100644 --- a/src/knownnetworks.h +++ b/src/knownnetworks.h @@ -32,5 +32,7 @@ bool known_networks_has_hidden(void); struct network_info *known_networks_find(const char *ssid, enum security security); +const char *known_network_get_path(const struct network_info *network); + bool known_networks_init(void); void known_networks_exit(void);