Add skeleton for new RFKILL interface

[connman] / src / profile.c

diff --git a/src/profile.c b/src/profile.c
index eeb777f..8984872 100644 (file)
--- a/src/profile.c
+++ b/src/profile.c
@@ -28,15 +28,22 @@
 
 #include "connman.h"
 
-#define PROFILE_DEFAULT  "/profile/default"
+#define PROFILE_DEFAULT_IDENT  "default"
 
 static DBusConnection *connection = NULL;
 
-const char *__connman_profile_active(void)
+const char *__connman_profile_active_ident(void)
 {
        DBG("");
 
-       return PROFILE_DEFAULT;
+       return PROFILE_DEFAULT_IDENT;
+}
+
+const char *__connman_profile_active_path(void)
+{
+       DBG("");
+
+       return "/profile/" PROFILE_DEFAULT_IDENT;
 }
 
 static void append_services(DBusMessageIter *entry)
@@ -60,7 +67,7 @@ static void append_services(DBusMessageIter *entry)
 
 void __connman_profile_changed(void)
 {
-       const char *path = __connman_profile_active();
+       const char *path = __connman_profile_active_path();
        DBusMessage *signal;
        DBusMessageIter entry;
 
@@ -106,25 +113,11 @@ int __connman_profile_remove_device(struct connman_device *device)
        if (service == NULL)
                return -EINVAL;
 
-       connman_service_put(service);
+       __connman_service_put(service);
 
        return 0;
 }
 
-int __connman_profile_set_carrier(struct connman_device *device,
-                                               connman_bool_t carrier)
-{
-       struct connman_service *service;
-
-       DBG("device %p carrier %d", device, carrier);
-
-       service = __connman_service_lookup_from_device(device);
-       if (service == NULL)
-               return -EINVAL;
-
-       return connman_service_set_favorite(service, carrier);
-}
-
 int __connman_profile_add_network(struct connman_network *network)
 {
        struct connman_service *service;
@@ -148,14 +141,14 @@ int __connman_profile_remove_network(struct connman_network *network)
        if (service == NULL)
                return -EINVAL;
 
-       connman_service_put(service);
+       __connman_service_put(service);
 
        return 0;
 }
 
 void __connman_profile_list(DBusMessageIter *iter)
 {
-       const char *path = __connman_profile_active();
+       const char *path = __connman_profile_active_path();
 
        DBG("");
 
@@ -207,13 +200,15 @@ static GDBusSignalTable profile_signals[] = {
 
 int __connman_profile_init(DBusConnection *conn)
 {
+       const char *path = __connman_profile_active_path();
+
        DBG("conn %p", conn);
 
        connection = dbus_connection_ref(conn);
        if (connection == NULL)
                return -1;
 
-       g_dbus_register_interface(connection, PROFILE_DEFAULT,
+       g_dbus_register_interface(connection, path,
                                        CONNMAN_PROFILE_INTERFACE,
                                        profile_methods, profile_signals,
                                                        NULL, NULL, NULL);
@@ -223,9 +218,11 @@ int __connman_profile_init(DBusConnection *conn)
 
 void __connman_profile_cleanup(void)
 {
+       const char *path = __connman_profile_active_path();
+
        DBG("conn %p", connection);
 
-       g_dbus_unregister_interface(connection, PROFILE_DEFAULT,
+       g_dbus_unregister_interface(connection, path,
                                                CONNMAN_PROFILE_INTERFACE);
 
        if (connection == NULL)