Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

station: Move ConnectHiddenNetwork to station

Browse Source
This commit is contained in:
Denis Kenzior 2018-09-05 10:37:14 -05:00
parent f61747f011
commit b650a5d492
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/device.c
View File

@ -115,19 +115,6 @@ static struct l_dbus_message *device_get_networks(struct l_dbus *dbus,
return station_dbus_get_networks(dbus, message, station); return station_dbus_get_networks(dbus, message, station);
} }
static struct l_dbus_message *device_connect_hidden_network(struct l_dbus *dbus,
struct l_dbus_message *message,
void *user_data)
{
struct device *device = user_data;
struct station *station = device->station;
if (!device->powered || !device->station)
return dbus_error_not_available(message);
return station_dbus_connect_hidden_network(dbus, message, station);
}
static bool device_property_get_name(struct l_dbus *dbus, static bool device_property_get_name(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
struct l_dbus_message_builder *builder, struct l_dbus_message_builder *builder,
@ -464,8 +451,6 @@ static void setup_device_interface(struct l_dbus_interface *interface)
l_dbus_interface_method(interface, "GetOrderedNetworks", 0, l_dbus_interface_method(interface, "GetOrderedNetworks", 0,
device_get_networks, "a(osns)", "", device_get_networks, "a(osns)", "",
"networks"); "networks");
l_dbus_interface_method(interface, "ConnectHiddenNetwork", 0,
device_connect_hidden_network, "", "s", "name");
l_dbus_interface_property(interface, "Name", 0, "s", l_dbus_interface_property(interface, "Name", 0, "s",
device_property_get_name, NULL); device_property_get_name, NULL);
l_dbus_interface_property(interface, "Address", 0, "s", l_dbus_interface_property(interface, "Address", 0, "s",

5
src/station.c
View File

@ -1704,7 +1704,7 @@ next:
return true; return true;
} }
struct l_dbus_message *station_dbus_connect_hidden_network( static struct l_dbus_message *station_dbus_connect_hidden_network(
struct l_dbus *dbus, struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
void *user_data) void *user_data)
@ -2193,6 +2193,9 @@ void station_free(struct station *station)
static void station_setup_interface(struct l_dbus_interface *interface) static void station_setup_interface(struct l_dbus_interface *interface)
{ {
l_dbus_interface_method(interface, "ConnectHiddenNetwork", 0,
station_dbus_connect_hidden_network,
"", "s", "name");
l_dbus_interface_method(interface, "RegisterSignalLevelAgent", 0, l_dbus_interface_method(interface, "RegisterSignalLevelAgent", 0,
station_dbus_signal_agent_register, station_dbus_signal_agent_register,
"", "oan", "path", "levels"); "", "oan", "path", "levels");

4
src/station.h
View File

@ -99,10 +99,6 @@ void station_ap_directed_roam(struct station *station,
const struct mmpdu_header *hdr, const struct mmpdu_header *hdr,
const void *body, size_t body_len); const void *body, size_t body_len);
struct l_dbus_message *station_dbus_connect_hidden_network(
struct l_dbus *dbus,
struct l_dbus_message *message,
void *user_data);
struct l_dbus_message *station_dbus_disconnect(struct l_dbus *dbus, struct l_dbus_message *station_dbus_disconnect(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
void *user_data); void *user_data);