Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Unified Diff: src/main.c

Issue 6659006: flimflam: add support for multiple profiles (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/flimflam.git@master
Patch Set: more ers comments Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ipconfig.c ('k') | src/manager.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/main.c
diff --git a/src/main.c b/src/main.c
index a4d2fea7a809ff3540c82028d53b0077de71327f..85bbbd4e5b9fe71890218eee4c050c2e635e09eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -56,6 +56,7 @@ static gchar **option_devices = NULL;
static gchar **option_plugins = NULL;
static gchar **option_nodevices = NULL;
static gchar **option_noplugins = NULL;
+static gchar **option_profiles = NULL;
static gchar *option_wifi = NULL;
static gchar *option_keymatter = NULL;
static gchar *option_modemmanagers = NULL;
@@ -94,6 +95,10 @@ static GOptionEntry options[] = {
"Specify plugins not to load"
" (can be repeated)",
"NAME" },
+ { "push", 'u', 0, G_OPTION_ARG_STRING_ARRAY, &option_profiles,
+ "Specify profiles to push"
+ " (can be repeated)",
+ "NAME" },
{ "keymatter", 'k', 0, G_OPTION_ARG_STRING, &option_keymatter,
"Specify file containing data to use when "
"generating cryptographic keys.", "FILENAME" },
@@ -264,10 +269,13 @@ int main(int argc, char *argv[])
__connman_element_start();
+ __connman_profile_push_batch(option_profiles);
+
g_strfreev(option_devices);
g_strfreev(option_plugins);
g_strfreev(option_nodevices);
g_strfreev(option_noplugins);
+ g_strfreev(option_profiles);
memset(&sa, 0, sizeof(sa));
sa.sa_handler = sig_term;
« no previous file with comments | « src/ipconfig.c ('k') | src/manager.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698