mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-22 23:09:34 +01:00
knownnetworks: Drop the old KnownNetworks DBus interface
This commit is contained in:
parent
e7e6cc3064
commit
00a643f093
@ -30,14 +30,12 @@
|
|||||||
#define IWD_NETWORK_INTERFACE "net.connman.iwd.Network"
|
#define IWD_NETWORK_INTERFACE "net.connman.iwd.Network"
|
||||||
#define IWD_AGENT_INTERFACE "net.connman.iwd.Agent"
|
#define IWD_AGENT_INTERFACE "net.connman.iwd.Agent"
|
||||||
#define IWD_WSC_INTERFACE "net.connman.iwd.WiFiSimpleConfiguration"
|
#define IWD_WSC_INTERFACE "net.connman.iwd.WiFiSimpleConfiguration"
|
||||||
#define IWD_KNOWN_NETWORKS_INTERFACE "net.connman.iwd.KnownNetworks"
|
|
||||||
#define IWD_KNOWN_NETWORK_INTERFACE "net.connman.iwd.KnownNetwork"
|
#define IWD_KNOWN_NETWORK_INTERFACE "net.connman.iwd.KnownNetwork"
|
||||||
#define IWD_SIGNAL_AGENT_INTERFACE "net.connman.iwd.SignalLevelAgent"
|
#define IWD_SIGNAL_AGENT_INTERFACE "net.connman.iwd.SignalLevelAgent"
|
||||||
#define IWD_AP_INTERFACE "net.connman.iwd.AccessPoint"
|
#define IWD_AP_INTERFACE "net.connman.iwd.AccessPoint"
|
||||||
#define IWD_ADHOC_INTERFACE "net.connman.iwd.AdHoc"
|
#define IWD_ADHOC_INTERFACE "net.connman.iwd.AdHoc"
|
||||||
|
|
||||||
#define IWD_AGENT_MANAGER_PATH "/"
|
#define IWD_AGENT_MANAGER_PATH "/"
|
||||||
#define IWD_KNOWN_NETWORKS_PATH "/"
|
|
||||||
|
|
||||||
struct l_dbus;
|
struct l_dbus;
|
||||||
|
|
||||||
|
@ -179,10 +179,6 @@ void known_networks_connected(struct network_info *network)
|
|||||||
"LastConnectedTime");
|
"LastConnectedTime");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setup_known_networks_interface(struct l_dbus_interface *interface)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct l_dbus_message *known_network_forget(struct l_dbus *dbus,
|
static struct l_dbus_message *known_network_forget(struct l_dbus *dbus,
|
||||||
struct l_dbus_message *message,
|
struct l_dbus_message *message,
|
||||||
void *user_data)
|
void *user_data)
|
||||||
@ -275,23 +271,6 @@ bool known_networks_init(void)
|
|||||||
DIR *dir;
|
DIR *dir;
|
||||||
struct dirent *dirent;
|
struct dirent *dirent;
|
||||||
|
|
||||||
if (!l_dbus_register_interface(dbus, IWD_KNOWN_NETWORKS_INTERFACE,
|
|
||||||
setup_known_networks_interface,
|
|
||||||
NULL, false)) {
|
|
||||||
l_info("Unable to register %s interface",
|
|
||||||
IWD_KNOWN_NETWORKS_INTERFACE);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!l_dbus_object_add_interface(dbus, IWD_KNOWN_NETWORKS_PATH,
|
|
||||||
IWD_KNOWN_NETWORKS_INTERFACE,
|
|
||||||
NULL)) {
|
|
||||||
l_info("Unable to register the Known Networks object on '%s'",
|
|
||||||
IWD_KNOWN_NETWORKS_PATH);
|
|
||||||
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORKS_INTERFACE);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!l_dbus_register_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE,
|
if (!l_dbus_register_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE,
|
||||||
setup_known_network_interface,
|
setup_known_network_interface,
|
||||||
NULL, false)) {
|
NULL, false)) {
|
||||||
@ -303,8 +282,6 @@ bool known_networks_init(void)
|
|||||||
dir = opendir(STORAGEDIR);
|
dir = opendir(STORAGEDIR);
|
||||||
if (!dir) {
|
if (!dir) {
|
||||||
l_info("Unable to open %s: %s", STORAGEDIR, strerror(errno));
|
l_info("Unable to open %s: %s", STORAGEDIR, strerror(errno));
|
||||||
l_dbus_unregister_object(dbus, IWD_KNOWN_NETWORKS_PATH);
|
|
||||||
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORKS_INTERFACE);
|
|
||||||
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE);
|
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -338,7 +315,5 @@ void known_networks_exit(void)
|
|||||||
l_queue_destroy(known_networks, network_info_free);
|
l_queue_destroy(known_networks, network_info_free);
|
||||||
known_networks = NULL;
|
known_networks = NULL;
|
||||||
|
|
||||||
l_dbus_unregister_object(dbus, IWD_KNOWN_NETWORKS_PATH);
|
|
||||||
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORKS_INTERFACE);
|
|
||||||
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE);
|
l_dbus_unregister_interface(dbus, IWD_KNOWN_NETWORK_INTERFACE);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user