5,12c5,6
< * 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.
119c113
< if (!wpa_dbus_dict_open_read(&iter, &iter_dict))
---
> if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
232c226
< if (!wpa_supplicant_remove_iface(global, wpa_s)) {
---
> if (!wpa_supplicant_remove_iface(global, wpa_s, 0)) {
340c334
< wpa_s->scan_req = 2;
---
> wpa_s->scan_req = MANUAL_SCAN_REQ;
925c919
< if (!wpa_dbus_dict_open_read(&iter, &iter_dict)) {
---
> if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL)) {
1205c1199
< if (!wpa_dbus_dict_open_read(&iter, &iter_dict))
---
> if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
1327c1321
< if (!wpa_dbus_dict_open_read(&iter, &iter_dict))
---
> if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
1436a1431,1462
>
>
> /**
> * wpas_dbus_iface_flush - Clear BSS of old or all inactive entries
> * @message: Pointer to incoming dbus message
> * @wpa_s: %wpa_supplicant data structure
> * Returns: a dbus message containing a UINT32 indicating success (1) or
> * failure (0), or returns a dbus error message with more information
> *
> * Handler function for "flush" method call. Handles requests for an
> * interface with an optional "age" parameter that specifies the minimum
> * age of a BSS to be flushed.
> */
> DBusMessage * wpas_dbus_iface_flush(DBusMessage *message,
> struct wpa_supplicant *wpa_s)
> {
> int flush_age = 0;
>
> if (os_strlen(dbus_message_get_signature(message)) != 0 &&
> !dbus_message_get_args(message, NULL,
> DBUS_TYPE_INT32, &flush_age,
> DBUS_TYPE_INVALID)) {
> return wpas_dbus_new_invalid_opts_error(message, NULL);
> }
>
> if (flush_age == 0)
> wpa_bss_flush(wpa_s);
> else
> wpa_bss_flush_by_age(wpa_s, flush_age);
>
> return wpas_dbus_new_success_reply(message);
> }