mirror of
https://github.com/vanhoefm/fragattacks.git
synced 2024-11-25 08:48:31 -05:00
8fc2fb56e4
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)
252 lines
6.0 KiB
C
252 lines
6.0 KiB
C
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
#include "common.h"
|
|
#include "config.h"
|
|
#include "wpa_supplicant_i.h"
|
|
#include "wps_supplicant.h"
|
|
#include "ctrl_iface_dbus.h"
|
|
#include "ctrl_iface_dbus_new.h"
|
|
#include "notify.h"
|
|
|
|
int wpas_notify_supplicant_initialized(struct wpa_global *global)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
|
|
if (global->params.dbus_ctrl_interface) {
|
|
global->dbus_ctrl_iface =
|
|
wpa_supplicant_dbus_ctrl_iface_init(global);
|
|
if (global->dbus_ctrl_iface == NULL)
|
|
return -1;
|
|
|
|
if (cbs) {
|
|
global->dbus_new_ctrl_iface =
|
|
cbs->dbus_ctrl_init(global);
|
|
if (global->dbus_new_ctrl_iface == NULL)
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
void wpas_notify_supplicant_deinitialized(struct wpa_global *global)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
|
|
if (global->dbus_ctrl_iface)
|
|
wpa_supplicant_dbus_ctrl_iface_deinit(global->dbus_ctrl_iface);
|
|
|
|
if (cbs && global->dbus_new_ctrl_iface)
|
|
cbs->dbus_ctrl_deinit(global->dbus_new_ctrl_iface);
|
|
}
|
|
|
|
|
|
int wpas_notify_iface_added(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
|
|
if (wpas_dbus_register_iface(wpa_s))
|
|
return -1;
|
|
|
|
if (cbs && cbs->register_interface(wpa_s))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
|
|
void wpas_notify_iface_removed(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
|
|
/* unregister interface in old DBus ctrl iface */
|
|
wpas_dbus_unregister_iface(wpa_s);
|
|
|
|
/* unregister interface in new DBus ctrl iface */
|
|
if (cbs)
|
|
cbs->unregister_interface(wpa_s);
|
|
}
|
|
|
|
|
|
void wpas_notify_state_changed(struct wpa_supplicant *wpa_s,
|
|
wpa_states new_state, wpa_states old_state)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
|
|
/* notify the old DBus API */
|
|
wpa_supplicant_dbus_notify_state_change(wpa_s, new_state,
|
|
old_state);
|
|
|
|
/* notify the new DBus API */
|
|
if (cbs)
|
|
cbs->signal_state_changed(wpa_s, new_state, old_state);
|
|
}
|
|
|
|
|
|
void wpas_notify_network_changed(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_prop_changed(wpa_s,
|
|
WPAS_DBUS_PROP_CURRENT_NETWORK);
|
|
}
|
|
|
|
|
|
void wpas_notify_ap_scan_changed(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_prop_changed(wpa_s, WPAS_DBUS_PROP_AP_SCAN);
|
|
}
|
|
|
|
|
|
void wpas_notify_bssid_changed(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_prop_changed(wpa_s, WPAS_DBUS_PROP_CURRENT_BSS);
|
|
}
|
|
|
|
|
|
void wpas_notify_network_enabled_changed(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_network_enabled_changed(wpa_s, ssid);
|
|
}
|
|
|
|
|
|
void wpas_notify_network_selected(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_network_selected(wpa_s, ssid->id);
|
|
}
|
|
|
|
|
|
void wpas_notify_scanning(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
/* notify the old DBus API */
|
|
wpa_supplicant_dbus_notify_scanning(wpa_s);
|
|
/* notify the new DBus API */
|
|
if (cbs)
|
|
cbs->signal_prop_changed(wpa_s, WPAS_DBUS_PROP_SCANNING);
|
|
}
|
|
|
|
|
|
void wpas_notify_scan_done(struct wpa_supplicant *wpa_s, int success)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_scan_done(wpa_s, success);
|
|
}
|
|
|
|
|
|
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)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
|
|
/* notify the old DBus API */
|
|
wpa_supplicant_dbus_notify_wps_cred(wpa_s, cred);
|
|
/* notify the new DBus API */
|
|
if (cbs)
|
|
cbs->signal_wps_credentials(wpa_s, cred);
|
|
}
|
|
|
|
|
|
void wpas_notify_wps_event_m2d(struct wpa_supplicant *wpa_s,
|
|
struct wps_event_m2d *m2d)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_wps_event_m2d(wpa_s, m2d);
|
|
}
|
|
|
|
|
|
void wpas_notify_wps_event_fail(struct wpa_supplicant *wpa_s,
|
|
struct wps_event_fail *fail)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_wps_event_fail(wpa_s, fail);
|
|
}
|
|
|
|
|
|
void wpas_notify_wps_event_success(struct wpa_supplicant *wpa_s)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_wps_event_success(wpa_s);
|
|
}
|
|
|
|
|
|
void wpas_notify_network_added(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (wpa_s->global->dbus_new_ctrl_iface && cbs)
|
|
cbs->register_network(wpa_s, ssid);
|
|
}
|
|
|
|
|
|
void wpas_notify_network_removed(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (wpa_s->global->dbus_new_ctrl_iface && cbs)
|
|
cbs->unregister_network(wpa_s, ssid->id);
|
|
}
|
|
|
|
|
|
void wpas_notify_blob_added(struct wpa_supplicant *wpa_s, const char *name)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_blob_added(wpa_s, name);
|
|
}
|
|
|
|
|
|
void wpas_notify_blob_removed(struct wpa_supplicant *wpa_s, const char *name)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_blob_removed(wpa_s, name);
|
|
}
|
|
|
|
|
|
void wpas_notify_debug_params_changed(struct wpa_global *global)
|
|
{
|
|
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
|
|
if (cbs)
|
|
cbs->signal_debug_params_changed(global);
|
|
}
|