Remove unneeded CONNMAN_NETWORK_INTERFACE

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

diff --git a/include/dbus.h b/include/dbus.h
index 5d12be7..47a8be0 100644 (file)
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2010  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
@@ -29,10 +29,12 @@ extern "C" {
 #endif
 
 #define CONNMAN_SERVICE                        "org.moblin.connman"
+#define CONNMAN_PATH                   "/org/moblin/connman"
 
 #define CONNMAN_DEBUG_INTERFACE                CONNMAN_SERVICE ".Debug"
 #define CONNMAN_ERROR_INTERFACE                CONNMAN_SERVICE ".Error"
 #define CONNMAN_AGENT_INTERFACE                CONNMAN_SERVICE ".Agent"
+#define CONNMAN_COUNTER_INTERFACE      CONNMAN_SERVICE ".Counter"
 
 #define CONNMAN_MANAGER_INTERFACE      CONNMAN_SERVICE ".Manager"
 #define CONNMAN_MANAGER_PATH           "/"
@@ -41,8 +43,11 @@ extern "C" {
 #define CONNMAN_PROFILE_INTERFACE      CONNMAN_SERVICE ".Profile"
 #define CONNMAN_SERVICE_INTERFACE      CONNMAN_SERVICE ".Service"
 #define CONNMAN_DEVICE_INTERFACE       CONNMAN_SERVICE ".Device"
-#define CONNMAN_NETWORK_INTERFACE      CONNMAN_SERVICE ".Network"
 #define CONNMAN_PROVIDER_INTERFACE     CONNMAN_SERVICE ".Provider"
+#define CONNMAN_TECHNOLOGY_INTERFACE   CONNMAN_SERVICE ".Technology"
+
+#define CONNMAN_PRIVILEGE_MODIFY       1
+#define CONNMAN_PRIVILEGE_SECRET       2
 
 typedef void (* connman_dbus_append_cb_t) (DBusMessageIter *iter,
                                                        void *user_data);
@@ -53,10 +58,11 @@ void connman_dbus_property_append_basic(DBusMessageIter *iter,
                                        const char *key, int type, void *val);
 void connman_dbus_property_append_dict(DBusMessageIter *iter, const char *key,
                        connman_dbus_append_cb_t function, void *user_data);
+void connman_dbus_property_append_array(DBusMessageIter *iter,
+                                               const char *key, int type,
+                       connman_dbus_append_cb_t function, void *user_data);
 void connman_dbus_property_append_fixed_array(DBusMessageIter *iter,
                                const char *key, int type, void *val, int len);
-void connman_dbus_property_append_variable_array(DBusMessageIter *dict,
-               const char *key, int type, connman_dbus_append_cb_t function);
 
 dbus_bool_t connman_dbus_property_changed_basic(const char *path,
                                const char *interface, const char *key,
@@ -64,6 +70,9 @@ dbus_bool_t connman_dbus_property_changed_basic(const char *path,
 dbus_bool_t connman_dbus_property_changed_dict(const char *path,
                                const char *interface, const char *key,
                        connman_dbus_append_cb_t function, void *user_data);
+dbus_bool_t connman_dbus_property_changed_array(const char *path,
+                       const char *interface, const char *key, int type,
+                       connman_dbus_append_cb_t function, void *user_data);
 
 static inline void connman_dbus_dict_open(DBusMessageIter *iter,
                                                        DBusMessageIter *dict)
@@ -80,7 +89,7 @@ static inline void connman_dbus_dict_close(DBusMessageIter *iter,
        dbus_message_iter_close_container(iter, dict);
 }
 
-static inline void connman_dbus_dict_append_variant(DBusMessageIter *dict,
+static inline void connman_dbus_dict_append_basic(DBusMessageIter *dict,
                                        const char *key, int type, void *val)
 {
        DBusMessageIter entry;
@@ -92,36 +101,38 @@ static inline void connman_dbus_dict_append_variant(DBusMessageIter *dict,
 }
 
 static inline void connman_dbus_dict_append_dict(DBusMessageIter *dict,
-                       const char *key, connman_dbus_append_cb_t function)
+                       const char *key, connman_dbus_append_cb_t function,
+                                                       void *user_data)
 {
        DBusMessageIter entry;
 
        dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
                                                                NULL, &entry);
-       connman_dbus_property_append_dict(&entry, key, function, NULL);
+       connman_dbus_property_append_dict(&entry, key, function, user_data);
        dbus_message_iter_close_container(dict, &entry);
 }
 
-static inline void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
-                               const char *key, int type, void *val, int len)
+static inline void connman_dbus_dict_append_array(DBusMessageIter *dict,
+               const char *key, int type, connman_dbus_append_cb_t function,
+                                                       void *user_data)
 {
        DBusMessageIter entry;
 
        dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
                                                                NULL, &entry);
-       connman_dbus_property_append_fixed_array(&entry, key, type, val, len);
+       connman_dbus_property_append_array(&entry, key,
+                                               type, function, user_data);
        dbus_message_iter_close_container(dict, &entry);
 }
 
-static inline void connman_dbus_dict_append_variable_array(DBusMessageIter *dict,
-               const char *key, int type, connman_dbus_append_cb_t function)
+static inline void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
+                               const char *key, int type, void *val, int len)
 {
        DBusMessageIter entry;
 
        dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
                                                                NULL, &entry);
-       connman_dbus_property_append_variable_array(&entry, key,
-                                                       type, function);
+       connman_dbus_property_append_fixed_array(&entry, key, type, val, len);
        dbus_message_iter_close_container(dict, &entry);
 }