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.
17a12,13
> #include "wpabuf.h"
>
77c73,79
< /* Manual construction and addition of string array elements */
---
> /* Manual construction and addition of array elements */
> dbus_bool_t wpa_dbus_dict_begin_array(DBusMessageIter *iter_dict,
> const char *key, const char *type,
> DBusMessageIter *iter_dict_entry,
> DBusMessageIter *iter_dict_val,
> DBusMessageIter *iter_array);
>
87,90c89,91
< dbus_bool_t wpa_dbus_dict_end_string_array(DBusMessageIter *iter_dict,
< DBusMessageIter *iter_dict_entry,
< DBusMessageIter *iter_dict_val,
< DBusMessageIter *iter_array);
---
> dbus_bool_t wpa_dbus_dict_bin_array_add_element(DBusMessageIter *iter_array,
> const u8 *value,
> size_t value_len);
91a93,107
> dbus_bool_t wpa_dbus_dict_end_array(DBusMessageIter *iter_dict,
> DBusMessageIter *iter_dict_entry,
> DBusMessageIter *iter_dict_val,
> DBusMessageIter *iter_array);
>
> static inline dbus_bool_t
> wpa_dbus_dict_end_string_array(DBusMessageIter *iter_dict,
> DBusMessageIter *iter_dict_entry,
> DBusMessageIter *iter_dict_val,
> DBusMessageIter *iter_array)
> {
> return wpa_dbus_dict_end_array(iter_dict, iter_dict_entry,
> iter_dict_val, iter_array);
> }
>
97a114,118
> dbus_bool_t wpa_dbus_dict_append_wpabuf_array(DBusMessageIter *iter_dict,
> const char *key,
> const struct wpabuf **items,
> const dbus_uint32_t num_items);
>
101a123,124
> #define WPAS_DBUS_TYPE_BINARRAY (DBUS_NUMBER_OF_TYPES + 100)
>
105c128,129
< entry value contains an array */
---
> entry value contains an array, or the special
> WPAS_DBUS_TYPE_BINARRAY */
121a146
> struct wpabuf **binarray_value;
128c153,154
< DBusMessageIter *iter_dict);
---
> DBusMessageIter *iter_dict,
> DBusError *error);