diff --git a/src/network.c b/src/network.c index 8a8e9f50..26c7f586 100644 --- a/src/network.c +++ b/src/network.c @@ -30,9 +30,11 @@ #include "src/iwd.h" #include "src/common.h" -#include "src/network.h" #include "src/storage.h" #include "src/scan.h" +#include "src/dbus.h" +#include "src/device.h" +#include "src/network.h" struct network_info { char ssid[33]; @@ -208,6 +210,21 @@ enum security network_get_security(struct network *network) return network->security; } +bool __iwd_network_append_properties(const struct network *network, + struct l_dbus_message_builder *builder) +{ + bool connected; + + l_dbus_message_builder_enter_array(builder, "{sv}"); + dbus_dict_append_string(builder, "Name", network->ssid); + + connected = device_get_connected_network(network->netdev) == network; + dbus_dict_append_bool(builder, "Connected", connected); + l_dbus_message_builder_leave_array(builder); + + return true; +} + void network_init() { networks = l_queue_new(); diff --git a/src/network.h b/src/network.h index 78e792f3..d36af214 100644 --- a/src/network.h +++ b/src/network.h @@ -41,6 +41,9 @@ bool network_seen(uint32_t type, const char *ssid); bool network_connected(uint32_t type, const char *ssid); double network_rankmod(uint32_t type, const char *ssid); +bool __iwd_network_append_properties(const struct network *network, + struct l_dbus_message_builder *builder); + const char *network_get_ssid(struct network *network); struct netdev *network_get_netdev(struct network *network); const char *network_get_path(struct network *network); diff --git a/src/wiphy.c b/src/wiphy.c index 308dbd5d..7347a409 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -151,21 +151,6 @@ static const char *iwd_network_get_path(struct netdev *netdev, return path; } -static bool __iwd_network_append_properties(const struct network *network, - struct l_dbus_message_builder *builder) -{ - bool connected; - - l_dbus_message_builder_enter_array(builder, "{sv}"); - dbus_dict_append_string(builder, "Name", network->ssid); - - connected = network->netdev->connected_network == network; - dbus_dict_append_bool(builder, "Connected", connected); - l_dbus_message_builder_leave_array(builder); - - return true; -} - static const char *device_state_to_string(enum device_state state) { switch (state) {