/*
* wpa_supplicant - Event notifications
- * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2009-2010, 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
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
+#include "common/wpa_ctrl.h"
#include "config.h"
#include "wpa_supplicant_i.h"
#include "wps_supplicant.h"
-#include "dbus/ctrl_iface_dbus.h"
-#include "dbus/ctrl_iface_dbus_new.h"
+#include "dbus/dbus_common.h"
+#include "dbus/dbus_old.h"
+#include "dbus/dbus_new.h"
+#include "driver_i.h"
+#include "scan.h"
+#include "p2p_supplicant.h"
#include "notify.h"
int wpas_notify_supplicant_initialized(struct wpa_global *global)
{
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
-
+#ifdef CONFIG_DBUS
if (global->params.dbus_ctrl_interface) {
- if (cbs) {
- global->dbus_new_ctrl_iface =
- cbs->dbus_ctrl_init(global);
- if (global->dbus_new_ctrl_iface == NULL)
- return -1;
- }
-
- global->dbus_ctrl_iface =
- wpa_supplicant_dbus_ctrl_iface_init(global);
- if (global->dbus_ctrl_iface == NULL)
+ global->dbus = wpas_dbus_init(global);
+ if (global->dbus == NULL)
return -1;
}
+#endif /* CONFIG_DBUS */
return 0;
}
void wpas_notify_supplicant_deinitialized(struct wpa_global *global)
{
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
-
- if (cbs && global->dbus_new_ctrl_iface)
- cbs->dbus_ctrl_deinit(global->dbus_new_ctrl_iface);
-
- if (global->dbus_ctrl_iface)
- wpa_supplicant_dbus_ctrl_iface_deinit(global->dbus_ctrl_iface);
+#ifdef CONFIG_DBUS
+ if (global->dbus)
+ wpas_dbus_deinit(global->dbus);
+#endif /* CONFIG_DBUS */
}
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))
+ if (wpas_dbus_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);
+ wpas_dbus_unregister_interface(wpa_s);
}
void wpas_notify_state_changed(struct wpa_supplicant *wpa_s,
- wpa_states new_state, wpa_states old_state)
+ enum wpa_states new_state,
+ enum 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);
+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_STATE);
+
+#ifdef CONFIG_P2P
+ if (new_state == WPA_COMPLETED)
+ wpas_p2p_notif_connected(wpa_s);
+ else if (new_state < WPA_ASSOCIATED)
+ wpas_p2p_notif_disconnected(wpa_s);
+#endif /* CONFIG_P2P */
}
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);
+ wpas_dbus_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);
+ wpas_dbus_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);
+ wpas_dbus_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);
+ wpas_dbus_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);
+ wpas_dbus_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);
+ wpas_dbus_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);
+ wpas_dbus_signal_scan_done(wpa_s, success);
}
const struct wps_credential *cred)
{
#ifdef CONFIG_WPS
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
-#endif /* CONFIG_WPS */
-
/* notify the old DBus API */
wpa_supplicant_dbus_notify_wps_cred(wpa_s, cred);
/* notify the new DBus API */
-#ifdef CONFIG_WPS
- if (cbs)
- cbs->signal_wps_credentials(wpa_s, cred);
+ wpas_dbus_signal_wps_cred(wpa_s, cred);
#endif /* CONFIG_WPS */
}
struct wps_event_m2d *m2d)
{
#ifdef CONFIG_WPS
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
- if (cbs)
- cbs->signal_wps_event_m2d(wpa_s, m2d);
+ wpas_dbus_signal_wps_event_m2d(wpa_s, m2d);
#endif /* CONFIG_WPS */
}
struct wps_event_fail *fail)
{
#ifdef CONFIG_WPS
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
- if (cbs)
- cbs->signal_wps_event_fail(wpa_s, fail);
+ wpas_dbus_signal_wps_event_fail(wpa_s, fail);
#endif /* CONFIG_WPS */
}
void wpas_notify_wps_event_success(struct wpa_supplicant *wpa_s)
{
#ifdef CONFIG_WPS
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
- if (cbs)
- cbs->signal_wps_event_success(wpa_s);
+ wpas_dbus_signal_wps_event_success(wpa_s);
#endif /* CONFIG_WPS */
}
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);
+ wpas_dbus_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);
+ wpas_dbus_unregister_network(wpa_s, ssid->id);
}
void wpas_notify_bss_added(struct wpa_supplicant *wpa_s,
- u8 bssid[])
+ u8 bssid[], unsigned int id)
{
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
- if (cbs)
- cbs->register_bss(wpa_s, bssid);
+ wpas_dbus_register_bss(wpa_s, bssid, id);
+ wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_BSS_ADDED "%u " MACSTR,
+ id, MAC2STR(bssid));
}
void wpas_notify_bss_removed(struct wpa_supplicant *wpa_s,
- u8 bssid[])
+ u8 bssid[], unsigned int id)
+{
+ wpas_dbus_unregister_bss(wpa_s, bssid, id);
+ wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_BSS_REMOVED "%u " MACSTR,
+ id, MAC2STR(bssid));
+}
+
+
+void wpas_notify_bss_freq_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_FREQ, id);
+}
+
+
+void wpas_notify_bss_signal_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
{
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
- if (cbs)
- cbs->unregister_bss(wpa_s, bssid);
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_SIGNAL,
+ id);
+}
+
+
+void wpas_notify_bss_privacy_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_PRIVACY,
+ id);
+}
+
+
+void wpas_notify_bss_mode_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_MODE, id);
+}
+
+
+void wpas_notify_bss_wpaie_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_WPA, id);
+}
+
+
+void wpas_notify_bss_rsnie_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_RSN, id);
+}
+
+
+void wpas_notify_bss_wps_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+}
+
+
+void wpas_notify_bss_ies_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_IES, id);
+}
+
+
+void wpas_notify_bss_rates_changed(struct wpa_supplicant *wpa_s,
+ unsigned int id)
+{
+ wpas_dbus_bss_signal_prop_changed(wpa_s, WPAS_DBUS_BSS_PROP_RATES, 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);
+ wpas_dbus_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);
+ wpas_dbus_signal_blob_removed(wpa_s, name);
+}
+
+
+void wpas_notify_debug_level_changed(struct wpa_global *global)
+{
+ wpas_dbus_signal_debug_level_changed(global);
}
-void wpas_notify_debug_params_changed(struct wpa_global *global)
+void wpas_notify_debug_timestamp_changed(struct wpa_global *global)
{
- struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
- if (cbs)
- cbs->signal_debug_params_changed(global);
+ wpas_dbus_signal_debug_timestamp_changed(global);
+}
+
+
+void wpas_notify_debug_show_keys_changed(struct wpa_global *global)
+{
+ wpas_dbus_signal_debug_show_keys_changed(global);
+}
+
+
+void wpas_notify_suspend(struct wpa_global *global)
+{
+ struct wpa_supplicant *wpa_s;
+
+ os_get_time(&global->suspend_time);
+ wpa_printf(MSG_DEBUG, "System suspend notification");
+ for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next)
+ wpa_drv_suspend(wpa_s);
+}
+
+
+void wpas_notify_resume(struct wpa_global *global)
+{
+ struct os_time now;
+ int slept;
+ struct wpa_supplicant *wpa_s;
+
+ if (global->suspend_time.sec == 0)
+ slept = -1;
+ else {
+ os_get_time(&now);
+ slept = now.sec - global->suspend_time.sec;
+ }
+ wpa_printf(MSG_DEBUG, "System resume notification (slept %d seconds)",
+ slept);
+
+ for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
+ wpa_drv_resume(wpa_s);
+ if (wpa_s->wpa_state == WPA_DISCONNECTED)
+ wpa_supplicant_req_scan(wpa_s, 0, 100000);
+ }
}
projects / libeap.git / blobdiff