Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...

[libeap.git] / wpa_supplicant / notify.c

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 970ba9b..c9a1b4b 100644 (file)
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -22,6 +22,9 @@
 #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)
@@ -79,6 +82,13 @@ void wpas_notify_state_changed(struct wpa_supplicant *wpa_s,
 
        /* notify the new DBus API */
        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 */
 }
 
 
@@ -209,6 +219,70 @@ void wpas_notify_bss_removed(struct wpa_supplicant *wpa_s,
 }
 
 
+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)
+{
+       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)
 {
        wpas_dbus_signal_blob_added(wpa_s, name);
@@ -237,3 +311,37 @@ 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);
+       }
+}