DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
hostapd/wpa_supplicant/notify.c

276 lines
6.5 KiB
C
Raw Normal View History

Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
/*
* wpa_supplicant - Event notifications
* Copyright (c) 2009, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* Alternatively, this software may be distributed under the terms of BSD
* license.
*
* See README and COPYING for more details.
*/
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
#include "utils/includes.h"
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
#include "utils/common.h"
#include "common/wpa_ctrl.h"
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
#include "config.h"
#include "wpa_supplicant_i.h"
#include "wps_supplicant.h"
dbus: Share common initialization code for both old and new interface This was mostly identical code that had been copied for the new D-Bus API implementation and as such, should really have been shared from the beginning. In addition, the copied code ended up generating interesting stack traces since the actual D-Bus connection was being shared even though the pointer to it was stored in two distinct data structures. The old D-Bus code ended up dispatching some D-Bus callbacks which ended up running the new D-Bus code. Since the private context pointers were mostly identical, everything seemed to more or less work, but this design was just making things more complex and potentially very easy to break.
2009-12-30 23:15:56 +01:00
#include "dbus/dbus_common.h"
dbus: Rename old D-Bus API files to include "_old" This makes it easier to figure out which file is used by which D-Bus interface.
2009-12-31 20:55:32 +01:00
#include "dbus/dbus_old.h"
dbus: Fix build with "ctrl_iface_" prefix removed
2009-12-20 20:34:56 +01:00
#include "dbus/dbus_new.h"
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
#include "notify.h"
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
int wpas_notify_supplicant_initialized(struct wpa_global *global)
{
dbus: Share common initialization code for both old and new interface This was mostly identical code that had been copied for the new D-Bus API implementation and as such, should really have been shared from the beginning. In addition, the copied code ended up generating interesting stack traces since the actual D-Bus connection was being shared even though the pointer to it was stored in two distinct data structures. The old D-Bus code ended up dispatching some D-Bus callbacks which ended up running the new D-Bus code. Since the private context pointers were mostly identical, everything seemed to more or less work, but this design was just making things more complex and potentially very easy to break.
2009-12-30 23:15:56 +01:00
#ifdef CONFIG_DBUS
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
if (global->params.dbus_ctrl_interface) {
dbus: Share common initialization code for both old and new interface This was mostly identical code that had been copied for the new D-Bus API implementation and as such, should really have been shared from the beginning. In addition, the copied code ended up generating interesting stack traces since the actual D-Bus connection was being shared even though the pointer to it was stored in two distinct data structures. The old D-Bus code ended up dispatching some D-Bus callbacks which ended up running the new D-Bus code. Since the private context pointers were mostly identical, everything seemed to more or less work, but this design was just making things more complex and potentially very easy to break.
2009-12-30 23:15:56 +01:00
global->dbus = wpas_dbus_init(global);
if (global->dbus == NULL)
dbus: switch dbus APIs initialization order Initialize the new DBus API before the old one, so new applications which can use both, the old and the new API will be notified first that new API is available.
2009-12-03 20:17:49 +01:00
return -1;
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
}
dbus: Share common initialization code for both old and new interface This was mostly identical code that had been copied for the new D-Bus API implementation and as such, should really have been shared from the beginning. In addition, the copied code ended up generating interesting stack traces since the actual D-Bus connection was being shared even though the pointer to it was stored in two distinct data structures. The old D-Bus code ended up dispatching some D-Bus callbacks which ended up running the new D-Bus code. Since the private context pointers were mostly identical, everything seemed to more or less work, but this design was just making things more complex and potentially very easy to break.
2009-12-30 23:15:56 +01:00
#endif /* CONFIG_DBUS */
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
return 0;
}
void wpas_notify_supplicant_deinitialized(struct wpa_global *global)
{
dbus: Share common initialization code for both old and new interface This was mostly identical code that had been copied for the new D-Bus API implementation and as such, should really have been shared from the beginning. In addition, the copied code ended up generating interesting stack traces since the actual D-Bus connection was being shared even though the pointer to it was stored in two distinct data structures. The old D-Bus code ended up dispatching some D-Bus callbacks which ended up running the new D-Bus code. Since the private context pointers were mostly identical, everything seemed to more or less work, but this design was just making things more complex and potentially very easy to break.
2009-12-30 23:15:56 +01:00
#ifdef CONFIG_DBUS
if (global->dbus)
wpas_dbus_deinit(global->dbus);
#endif /* CONFIG_DBUS */
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
}
int wpas_notify_iface_added(struct wpa_supplicant *wpa_s)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
if (wpas_dbus_register_iface(wpa_s))
return -1;
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
if (cbs && cbs->register_interface(wpa_s))
return -1;
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
return 0;
}
void wpas_notify_iface_removed(struct wpa_supplicant *wpa_s)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
/* unregister interface in old DBus ctrl iface */
wpas_dbus_unregister_iface(wpa_s);
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
/* unregister interface in new DBus ctrl iface */
if (cbs)
cbs->unregister_interface(wpa_s);
wpa_supplicant and dbus code separation This patch completely separates supplicant's code from dbus. It introduces three new notifications which copes with all remaining dbus stuff. wpas_notify_unregister_interface() was renamed to wpas_notify_iface_removed().
2009-10-15 20:15:10 +02:00
}
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
void wpas_notify_state_changed(struct wpa_supplicant *wpa_s,
Get rid of unnecessary typedefs for enums.
2009-12-26 09:35:08 +01:00
enum wpa_states new_state,
enum wpa_states old_state)
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
/* notify the old DBus API */
wpa_supplicant_dbus_notify_state_change(wpa_s, new_state,
old_state);
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
/* notify the new DBus API */
if (cbs)
cbs->signal_state_changed(wpa_s, new_state, old_state);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_network_changed(struct wpa_supplicant *wpa_s)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_prop_changed(wpa_s,
WPAS_DBUS_PROP_CURRENT_NETWORK);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_ap_scan_changed(struct wpa_supplicant *wpa_s)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_prop_changed(wpa_s, WPAS_DBUS_PROP_AP_SCAN);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_bssid_changed(struct wpa_supplicant *wpa_s)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_prop_changed(wpa_s, WPAS_DBUS_PROP_CURRENT_BSS);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_network_enabled_changed(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_network_enabled_changed(wpa_s, ssid);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_network_selected(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_network_selected(wpa_s, ssid->id);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_scanning(struct wpa_supplicant *wpa_s)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
/* notify the old DBus API */
wpa_supplicant_dbus_notify_scanning(wpa_s);
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
/* notify the new DBus API */
if (cbs)
cbs->signal_prop_changed(wpa_s, WPAS_DBUS_PROP_SCANNING);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_scan_done(struct wpa_supplicant *wpa_s, int success)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_scan_done(wpa_s, success);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_scan_results(struct wpa_supplicant *wpa_s)
{
/* notify the old DBus API */
wpa_supplicant_dbus_notify_scan_results(wpa_s);
wpas_wps_notify_scan_results(wpa_s);
}
void wpas_notify_wps_credential(struct wpa_supplicant *wpa_s,
const struct wps_credential *cred)
{
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#ifdef CONFIG_WPS
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#endif /* CONFIG_WPS */
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
/* notify the old DBus API */
wpa_supplicant_dbus_notify_wps_cred(wpa_s, cred);
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
/* notify the new DBus API */
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#ifdef CONFIG_WPS
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
if (cbs)
cbs->signal_wps_credentials(wpa_s, cred);
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#endif /* CONFIG_WPS */
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_wps_event_m2d(struct wpa_supplicant *wpa_s,
struct wps_event_m2d *m2d)
{
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#ifdef CONFIG_WPS
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_wps_event_m2d(wpa_s, m2d);
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#endif /* CONFIG_WPS */
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_wps_event_fail(struct wpa_supplicant *wpa_s,
struct wps_event_fail *fail)
{
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#ifdef CONFIG_WPS
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_wps_event_fail(wpa_s, fail);
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#endif /* CONFIG_WPS */
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_wps_event_success(struct wpa_supplicant *wpa_s)
{
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#ifdef CONFIG_WPS
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_wps_event_success(wpa_s);
Fix non-WPS build
2009-11-10 10:35:25 +01:00
#endif /* CONFIG_WPS */
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_network_added(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
dbus: Share common initialization code for both old and new interface This was mostly identical code that had been copied for the new D-Bus API implementation and as such, should really have been shared from the beginning. In addition, the copied code ended up generating interesting stack traces since the actual D-Bus connection was being shared even though the pointer to it was stored in two distinct data structures. The old D-Bus code ended up dispatching some D-Bus callbacks which ended up running the new D-Bus code. Since the private context pointers were mostly identical, everything seemed to more or less work, but this design was just making things more complex and potentially very easy to break.
2009-12-30 23:15:56 +01:00
if (wpa_s->global->dbus && cbs)
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
cbs->register_network(wpa_s, ssid);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_network_removed(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
dbus: Share common initialization code for both old and new interface This was mostly identical code that had been copied for the new D-Bus API implementation and as such, should really have been shared from the beginning. In addition, the copied code ended up generating interesting stack traces since the actual D-Bus connection was being shared even though the pointer to it was stored in two distinct data structures. The old D-Bus code ended up dispatching some D-Bus callbacks which ended up running the new D-Bus code. Since the private context pointers were mostly identical, everything seemed to more or less work, but this design was just making things more complex and potentially very easy to break.
2009-12-30 23:15:56 +01:00
if (wpa_s->global->dbus && cbs)
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
cbs->unregister_network(wpa_s, ssid->id);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
Add notifications for scan result BSS changes (added/removed) If scan results introduce new BSSs or discards some previously known, new wpas_notify_bss_added or wpas_notify_bss_removed notifications are called.
2009-11-11 16:07:53 +01:00
void wpas_notify_bss_added(struct wpa_supplicant *wpa_s,
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
u8 bssid[], unsigned int id)
Add notifications for scan result BSS changes (added/removed) If scan results introduce new BSSs or discards some previously known, new wpas_notify_bss_added or wpas_notify_bss_removed notifications are called.
2009-11-11 16:07:53 +01:00
{
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
dbus: Use the new BSS table with the new D-Bus API Replace the scan results -based implementation with the use of information from the new BSS table maintained by wpa_supplicant to get a more stable source of BSS data. Change the use of BSSID as the key for the BSS object to use the BSS table unique identifier so that multi-SSID APs can be handled properly.
2009-12-28 00:10:07 +01:00
cbs->register_bss(wpa_s, bssid, id);
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_BSS_ADDED "%u " MACSTR,
id, MAC2STR(bssid));
Add notifications for scan result BSS changes (added/removed) If scan results introduce new BSSs or discards some previously known, new wpas_notify_bss_added or wpas_notify_bss_removed notifications are called.
2009-11-11 16:07:53 +01:00
}
void wpas_notify_bss_removed(struct wpa_supplicant *wpa_s,
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
u8 bssid[], unsigned int id)
Add notifications for scan result BSS changes (added/removed) If scan results introduce new BSSs or discards some previously known, new wpas_notify_bss_added or wpas_notify_bss_removed notifications are called.
2009-11-11 16:07:53 +01:00
{
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
dbus: Use the new BSS table with the new D-Bus API Replace the scan results -based implementation with the use of information from the new BSS table maintained by wpa_supplicant to get a more stable source of BSS data. Change the use of BSSID as the key for the BSS object to use the BSS table unique identifier so that multi-SSID APs can be handled properly.
2009-12-28 00:10:07 +01:00
cbs->unregister_bss(wpa_s, bssid, id);
Add ctrl_iface events for BSS added/removed
2009-12-27 23:42:51 +01:00
wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_BSS_REMOVED "%u " MACSTR,
id, MAC2STR(bssid));
Add notifications for scan result BSS changes (added/removed) If scan results introduce new BSSs or discards some previously known, new wpas_notify_bss_added or wpas_notify_bss_removed notifications are called.
2009-11-11 16:07:53 +01:00
}
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
void wpas_notify_blob_added(struct wpa_supplicant *wpa_s, const char *name)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_blob_added(wpa_s, name);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_blob_removed(struct wpa_supplicant *wpa_s, const char *name)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_blob_removed(wpa_s, name);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
void wpas_notify_debug_params_changed(struct wpa_global *global)
{
wpa_supplicant: new DBus API implementation This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)
2009-11-09 22:51:59 +01:00
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (cbs)
cbs->signal_debug_params_changed(global);
Add wpa_supplicant notification calls This introduces a new mechanism for collecting notification calls into a single place (notify.c). As a result of this, most of the wpa_supplicant code does not need to know about dbus (etc. mechanisms that could use the notifications). Some empty placeholder functions are also added in preparation of new dbus code that needs more event notifications.
2009-09-13 19:53:32 +02:00
}
Reference in a new issue Copy permalink