Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / src / wps / wps_upnp_ap.c

diff --git a/libeap/src/wps/wps_upnp_ap.c b/libeap/src/wps/wps_upnp_ap.c
index 501ecbc..cca3905 100644 (file)
--- a/libeap/src/wps/wps_upnp_ap.c
+++ b/libeap/src/wps/wps_upnp_ap.c
@@ -2,14 +2,8 @@
  * Wi-Fi Protected Setup - UPnP AP functionality
  * 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.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
@@ -25,9 +19,10 @@
 static void upnp_er_set_selected_timeout(void *eloop_ctx, void *timeout_ctx)
 {
        struct subscription *s = eloop_ctx;
+       struct wps_registrar *reg = timeout_ctx;
        wpa_printf(MSG_DEBUG, "WPS: SetSelectedRegistrar from ER timed out");
        s->selected_registrar = 0;
-       wps_registrar_selected_registrar_changed(s->reg);
+       wps_registrar_selected_registrar_changed(reg, 0);
 }
 
 
@@ -39,14 +34,12 @@ int upnp_er_set_selected_registrar(struct wps_registrar *reg,
 
        wpa_hexdump_buf(MSG_MSGDUMP, "WPS: SetSelectedRegistrar attributes",
                        msg);
-       if (wps_validate_upnp_set_selected_registrar(msg) < 0)
-               return -1;
-
-       if (wps_parse_msg(msg, &attr) < 0)
+       if (wps_validate_upnp_set_selected_registrar(msg) < 0 ||
+           wps_parse_msg(msg, &attr) < 0)
                return -1;
 
        s->reg = reg;
-       eloop_cancel_timeout(upnp_er_set_selected_timeout, s, NULL);
+       eloop_cancel_timeout(upnp_er_set_selected_timeout, s, reg);
 
        os_memset(s->authorized_macs, 0, sizeof(s->authorized_macs));
        if (attr.selected_registrar == NULL || *attr.selected_registrar == 0) {
@@ -66,26 +59,25 @@ int upnp_er_set_selected_registrar(struct wps_registrar *reg,
                        os_memcpy(s->authorized_macs, attr.authorized_macs,
                                  count * ETH_ALEN);
                } else if (!attr.version2) {
-#ifdef CONFIG_WPS2
                        wpa_printf(MSG_DEBUG, "WPS: Add broadcast "
                                   "AuthorizedMACs for WPS 1.0 ER");
                        os_memset(s->authorized_macs, 0xff, ETH_ALEN);
-#endif /* CONFIG_WPS2 */
                }
                eloop_register_timeout(WPS_PBC_WALK_TIME, 0,
-                                      upnp_er_set_selected_timeout, s, NULL);
+                                      upnp_er_set_selected_timeout, s, reg);
        }
 
-       wps_registrar_selected_registrar_changed(reg);
+       wps_registrar_selected_registrar_changed(reg, 0);
 
        return 0;
 }
 
 
-void upnp_er_remove_notification(struct subscription *s)
+void upnp_er_remove_notification(struct wps_registrar *reg,
+                                struct subscription *s)
 {
        s->selected_registrar = 0;
-       eloop_cancel_timeout(upnp_er_set_selected_timeout, s, NULL);
-       if (s->reg)
-               wps_registrar_selected_registrar_changed(s->reg);
+       eloop_cancel_timeout(upnp_er_set_selected_timeout, s, reg);
+       if (reg)
+               wps_registrar_selected_registrar_changed(reg, 0);
 }