Fixed various memory leaks

[platform/upstream/connman.git] / gsupplicant / dbus.h

diff --git a/gsupplicant/dbus.h b/gsupplicant/dbus.h
old mode 100644 (file)
new mode 100755 (executable)
index 642e8b1..3a90406
--- a/gsupplicant/dbus.h
+++ b/gsupplicant/dbus.h
@@ -2,7 +2,7 @@
  *
  *  WPA supplicant library with GLib integration
  *
- *  Copyright (C) 2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-2013  Intel Corporation. All rights reserved.
  *
  *  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
@@ -37,6 +37,11 @@ typedef void (*supplicant_dbus_setup_function) (DBusMessageIter *iter,
 typedef void (*supplicant_dbus_result_function) (const char *error,
                                DBusMessageIter *iter, void *user_data);
 
+void supplicant_dbus_property_append_array(DBusMessageIter *iter,
+                               const char *key, int type,
+                               supplicant_dbus_array_function function,
+                               void *user_data);
+
 void supplicant_dbus_setup(DBusConnection *conn);
 
 void supplicant_dbus_array_foreach(DBusMessageIter *iter,
@@ -49,24 +54,29 @@ void supplicant_dbus_property_foreach(DBusMessageIter *iter,
 
 int supplicant_dbus_property_get_all(const char *path, const char *interface,
                                supplicant_dbus_property_function function,
-                                                       void *user_data);
+                               void *user_data, gpointer caller);
 
 int supplicant_dbus_property_get(const char *path, const char *interface,
                                const char *method,
                                supplicant_dbus_property_function function,
-                                                       void *user_data);
+                               void *user_data, gpointer caller);
 
 int supplicant_dbus_property_set(const char *path, const char *interface,
                                const char *key, const char *signature,
                                supplicant_dbus_setup_function setup,
                                supplicant_dbus_result_function function,
-                                                       void *user_data);
+                               void *user_data, gpointer caller);
+
+void supplicant_dbus_property_call_cancel_all(gpointer caller);
 
 int supplicant_dbus_method_call(const char *path,
                                const char *interface, const char *method,
                                supplicant_dbus_setup_function setup,
                                supplicant_dbus_result_function function,
-                                                       void *user_data);
+                               void *user_data,
+                               gpointer caller);
+
+void supplicant_dbus_method_call_cancel_all(gpointer caller);
 
 void supplicant_dbus_property_append_basic(DBusMessageIter *iter,
                                        const char *key, int type, void *val);
@@ -111,3 +121,18 @@ supplicant_dbus_dict_append_fixed_array(DBusMessageIter *dict,
        supplicant_dbus_property_append_fixed_array(&entry, key, type, val, len);
        dbus_message_iter_close_container(dict, &entry);
 }
+
+static inline void
+supplicant_dbus_dict_append_array(DBusMessageIter *dict,
+                               const char *key, int type,
+                               supplicant_dbus_array_function function,
+                               void *user_data)
+{
+       DBusMessageIter entry;
+
+       dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+                                                               NULL, &entry);
+       supplicant_dbus_property_append_array(&entry, key, type,
+                                               function, user_data);
+       dbus_message_iter_close_container(dict, &entry);
+}