Disconnect service on removal if still connected

[connman] / src / connman.h

diff --git a/src/connman.h b/src/connman.h
index e13c3de..766058e 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -32,11 +32,16 @@
 int __connman_dbus_init(DBusConnection *conn);
 void __connman_dbus_cleanup(void);
 
-DBusMessage *__connman_error_failed(DBusMessage *msg);
+DBusMessage *__connman_error_failed(DBusMessage *msg, int errnum);
 DBusMessage *__connman_error_invalid_arguments(DBusMessage *msg);
 DBusMessage *__connman_error_permission_denied(DBusMessage *msg);
 DBusMessage *__connman_error_not_supported(DBusMessage *msg);
 DBusMessage *__connman_error_not_implemented(DBusMessage *msg);
+DBusMessage *__connman_error_no_carrier(DBusMessage *msg);
+DBusMessage *__connman_error_in_progress(DBusMessage *msg);
+DBusMessage *__connman_error_already_connected(DBusMessage *msg);
+DBusMessage *__connman_error_operation_aborted(DBusMessage *msg);
+DBusMessage *__connman_error_operation_timeout(DBusMessage *msg);
 
 int __connman_selftest(void);
 
@@ -53,7 +58,8 @@ int __connman_profile_init(DBusConnection *conn);
 void __connman_profile_cleanup(void);
 
 void __connman_profile_list(DBusMessageIter *iter);
-const char *__connman_profile_active(void);
+const char *__connman_profile_active_ident(void);
+const char *__connman_profile_active_path(void);
 
 void __connman_profile_changed(void);
 
@@ -97,9 +103,12 @@ void __connman_storage_cleanup(void);
 int __connman_storage_init_device();
 int __connman_storage_load_device(struct connman_device *device);
 int __connman_storage_save_device(struct connman_device *device);
-int __connman_storage_init_network();
+int __connman_storage_init_network(struct connman_device *device);
 int __connman_storage_load_network(struct connman_network *network);
 int __connman_storage_save_network(struct connman_network *network);
+int __connman_storage_init_service();
+int __connman_storage_load_service(struct connman_service *service);
+int __connman_storage_save_service(struct connman_service *service);
 
 #include <connman/driver.h>
 
@@ -187,6 +196,7 @@ int __connman_device_disconnect(struct connman_device *device);
 connman_bool_t __connman_device_has_driver(struct connman_device *device);
 
 const char *__connman_device_get_type(struct connman_device *device);
+const char *__connman_device_get_ident(struct connman_device *device);
 
 int __connman_device_set_offlinemode(connman_bool_t offlinemode);
 
@@ -207,6 +217,7 @@ connman_bool_t __connman_network_has_driver(struct connman_network *network);
 
 const char *__connman_network_get_type(struct connman_network *network);
 const char *__connman_network_get_group(struct connman_network *network);
+const char *__connman_network_get_ident(struct connman_network *network);
 
 int __connman_profile_add_network(struct connman_network *network);
 int __connman_profile_remove_network(struct connman_network *network);
@@ -218,6 +229,8 @@ void __connman_service_cleanup(void);
 
 void __connman_service_list(DBusMessageIter *iter);
 
+void __connman_service_put(struct connman_service *service);
+
 struct connman_service *__connman_service_lookup_from_device(struct connman_device *device);
 struct connman_service *__connman_service_create_from_device(struct connman_device *device);
 
@@ -226,9 +239,8 @@ struct connman_service *__connman_service_create_from_network(struct connman_net
 
 int __connman_service_set_carrier(struct connman_service *service,
                                                connman_bool_t carrier);
-int __connman_service_indicate_configuration(struct connman_service *service);
-int __connman_service_ready(struct connman_service *service);
-int __connman_service_disconnect(struct connman_service *service);
+int __connman_service_indicate_state(struct connman_service *service,
+                                       enum connman_service_state state);
 
 #include <connman/notifier.h>