Updated to hostap_2_6

[mech_eap.git] / libeap / wpa_supplicant / dbus / dbus_new_helpers.h

diff --git a/libeap/wpa_supplicant/dbus/dbus_new_helpers.h b/libeap/wpa_supplicant/dbus/dbus_new_helpers.h
index 6e2c1f1..7b63b28 100644 (file)
--- a/libeap/wpa_supplicant/dbus/dbus_new_helpers.h
+++ b/libeap/wpa_supplicant/dbus/dbus_new_helpers.h
@@ -16,9 +16,13 @@ typedef DBusMessage * (*WPADBusMethodHandler)(DBusMessage *message,
                                              void *user_data);
 typedef void (*WPADBusArgumentFreeFunction)(void *handler_arg);
 
-typedef dbus_bool_t (*WPADBusPropertyAccessor)(DBusMessageIter *iter,
-                                              DBusError *error,
-                                              void *user_data);
+struct wpa_dbus_property_desc;
+typedef dbus_bool_t (*WPADBusPropertyAccessor)(
+       const struct wpa_dbus_property_desc *property_desc,
+       DBusMessageIter *iter, DBusError *error, void *user_data);
+#define DECLARE_ACCESSOR(f) \
+dbus_bool_t f(const struct wpa_dbus_property_desc *property_desc, \
+             DBusMessageIter *iter, DBusError *error, void *user_data)
 
 struct wpa_dbus_object_desc {
        DBusConnection *connection;
@@ -89,6 +93,8 @@ struct wpa_dbus_property_desc {
        WPADBusPropertyAccessor getter;
        /* property setter function */
        WPADBusPropertyAccessor setter;
+       /* other data */
+       const char *data;
 };