flimflam: add support for multiple profiles

src/manager.c

 /*
  *
  *  Connection Manager
  *
  *  Copyright (C) 2007-2009  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
  *  published by the Free Software Foundation.
  *
@@ skipping 155 matching lines @@
                 connman_bool_t offlinemode;
 
                 if (type != DBUS_TYPE_BOOLEAN)
                         return __connman_error_invalid_arguments(msg);
 
                 dbus_message_iter_get_basic(&value, &offlinemode);
 
                 __connman_profile_set_offlinemode(offlinemode);
 
                 __connman_profile_save_default();
-        } else if (g_str_equal(name, "ActiveProfile") == TRUE) {
-                const char *str;
-
-                dbus_message_iter_get_basic(&value, &str);
-
-                return __connman_error_not_supported(msg);
         } else
                 return __connman_error_invalid_property(msg);
 
         return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
 static DBusMessage *get_state(DBusConnection *conn,
                                         DBusMessage *msg, void *data)
 {
         const char *str;
@@ skipping 28 matching lines @@
         if (err < 0)
                 return __connman_error_failed(msg, -err);
 
         return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &path,
                                                         DBUS_TYPE_INVALID);
 }
 
 static DBusMessage *remove_profile(DBusConnection *conn,
                                         DBusMessage *msg, void *data)
 {
-        const char *path;
+        const char *ident;
         int err;
 
         _DBG_MANAGER("conn %p", conn);
 
-        dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+        dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ident,
                                                         DBUS_TYPE_INVALID);
 
         if (__connman_security_check_privilege(msg,
                                         CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
                 return __connman_error_permission_denied(msg);
 
-        err = __connman_profile_remove(path);
+        err = __connman_profile_remove(ident);
         if (err < 0)
                 return __connman_error_failed(msg, -err);
 
         return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
+static DBusMessage *push_profile(DBusConnection *conn,
+                                        DBusMessage *msg, void *data)
+{
+        const char *ident, *path;
+        int err;
+
+        _DBG_MANAGER("conn %p", conn);
+
+        dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ident,
+                                                        DBUS_TYPE_INVALID);
+
+        if (__connman_security_check_privilege(msg,
+                                        CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+                return __connman_error_permission_denied(msg);
+
+        err = __connman_profile_push(ident, NULL, &path);
+        if (err < 0)
+                return __connman_error_failed(msg, -err);
+
+        return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &path,
+                                                        DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *__pop_profile(DBusMessage *msg, const char *ident)
+{
+        int err;
+
+        if (__connman_security_check_privilege(msg,
+                                        CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+                return __connman_error_permission_denied(msg);
+
+        err = __connman_profile_pop(ident);
+        if (err < 0)
+                return __connman_error_failed(msg, -err);
+
+        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *pop_profile(DBusConnection *conn,
+                                        DBusMessage *msg, void *data)
+{
+        const char *ident;
+
+        dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ident,
+                                                        DBUS_TYPE_INVALID);
+
+        _DBG_MANAGER("ident %s", ident);
+
+        return __pop_profile(msg, ident);
+}
+
+static DBusMessage *pop_any_profile(DBusConnection *conn,
+                                        DBusMessage *msg, void *data)
+{
+        _DBG_MANAGER("");
+
+        return __pop_profile(msg, NULL);
+}
+
 static DBusMessage *request_scan(DBusConnection *conn,
                                         DBusMessage *msg, void *data)
 {
         enum connman_service_type type;
         const char *str;
         int err;
 
         _DBG_MANAGER("conn %p", conn);
 
         dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &str,
@@ skipping 392 matching lines @@
         /* TODO(sleffler) update state (e.g. routing) */
 
         return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
 static GDBusMethodTable manager_methods[] = {
         { "GetProperties",     "",      "a{sv}", get_properties     },
         { "SetProperty",       "sv",    "",      set_property       },
         { "GetState",          "",      "s",     get_state          },
         { "CreateProfile",     "s",     "o",     create_profile     },
-        { "RemoveProfile",     "o",     "",      remove_profile     },
+        { "RemoveProfile",     "s",     "",      remove_profile     },
+        { "PushProfile",       "s",     "o",     push_profile       },
+        { "PopProfile",        "s",     "",      pop_profile        },
+        { "PopAnyProfile",     "",      "",      pop_any_profile    },
         { "RequestScan",       "s",     "",      request_scan       },
         { "EnableTechnology",  "s",     "",      enable_technology,
                                                 G_DBUS_METHOD_FLAG_ASYNC },
         { "DisableTechnology", "s",     "",      disable_technology,
                                                 G_DBUS_METHOD_FLAG_ASYNC },
         { "GetService",        "a{sv}", "o",     get_wifi_service },
         { "GetWifiService",    "a{sv}", "o",     get_wifi_service },
         { "ConfigureWifiService","a{sv}","",     configure_wifi_service },
         { "GetVPNService",      "a{sv}","o",     get_vpn_service },
         { "RegisterAgent",     "o",     "",      register_agent     },
@@ skipping 178 matching lines @@
 
         g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
                                                 CONNMAN_MANAGER_INTERFACE);
 
         dbus_bus_remove_match(connection, powerman_rule, NULL);
         dbus_connection_flush(connection);
         dbus_connection_remove_filter(connection, powerman_filter, NULL);
 
         dbus_connection_unref(connection);
 }