summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorPatrik Flykt <patrik.flykt@linux.intel.com>2013-03-27 13:54:06 +0200
committerPatrik Flykt <patrik.flykt@linux.intel.com>2013-04-04 10:27:40 +0300
commite3558da95811df276bdcb1430e3a7adc4eac0059 (patch)
tree8383dd95235601c934e4fd51831868fdc5a90573 /client
parentf24d12fe64d321bb895601bc6b6d8395d7b08671 (diff)
downloadconnman-e3558da95811df276bdcb1430e3a7adc4eac0059.tar.gz
connman-e3558da95811df276bdcb1430e3a7adc4eac0059.tar.bz2
connman-e3558da95811df276bdcb1430e3a7adc4eac0059.zip
client: Use D-Bus helper functions when setting proxy
Append proxy server and exclude information in the callback functions.
Diffstat (limited to 'client')
-rw-r--r--client/commands.c117
1 files changed, 76 insertions, 41 deletions
diff --git a/client/commands.c b/client/commands.c
index 731a7b27..b6b02028 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -62,12 +62,6 @@ static char *ipv6[] = {
NULL
};
-static char *proxy_simple[] = {
- "Method",
- "URL",
- NULL
-};
-
static int cmd_help(char *args[], int num, struct option *options);
static int parse_args(char *arg, struct option *options)
@@ -540,6 +534,75 @@ static void config_append_str(DBusMessageIter *iter, void *user_data)
append->values = i;
}
+static void append_servers(DBusMessageIter *iter, void *user_data)
+{
+ struct config_append *append = user_data;
+ char **opts = append->opts;
+ int i = 1;
+
+ if (opts == NULL)
+ return;
+
+ while (opts[i] != NULL && g_strcmp0(opts[i], "--excludes") != 0) {
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+ &opts[i]);
+ i++;
+ }
+
+ append->values = i;
+}
+
+static void append_excludes(DBusMessageIter *iter, void *user_data)
+{
+ struct config_append *append = user_data;
+ char **opts = append->opts;
+ int i = append->values;
+
+ if (opts == NULL || opts[i] == NULL ||
+ g_strcmp0(opts[i], "--excludes") != 0)
+ return;
+
+ i++;
+ while (opts[i] != NULL) {
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+ &opts[i]);
+ i++;
+ }
+
+ append->values = i;
+}
+
+static void config_append_proxy(DBusMessageIter *iter, void *user_data)
+{
+ struct config_append *append = user_data;
+ char **opts = append->opts;
+
+ if (opts == NULL)
+ return;
+
+ if (g_strcmp0(opts[0], "manual") == 0) {
+ __connmanctl_dbus_append_dict_string_array(iter, "Servers",
+ append_servers, append);
+
+ __connmanctl_dbus_append_dict_string_array(iter, "Excludes",
+ append_excludes, append);
+
+ } else if (g_strcmp0(opts[0], "auto") == 0) {
+ if (opts[1] != NULL) {
+ __connmanctl_dbus_append_dict_entry(iter, "URL",
+ DBUS_TYPE_STRING, &opts[1]);
+ append->values++;
+ }
+
+ } else if (g_strcmp0(opts[0], "direct") != 0)
+ return;
+
+ __connmanctl_dbus_append_dict_entry(iter, "Method",DBUS_TYPE_STRING,
+ &opts[0]);
+
+ append->values++;
+}
+
static int cmd_config(char *args[], int num, struct option *options)
{
int result = 0, res = 0, index = 2, oldindex = 0;
@@ -643,41 +706,13 @@ static int cmd_config(char *args[], int num, struct option *options)
break;
case 'x':
- if (*opt_start == NULL) {
- res = -EINVAL;
- break;
- }
-
- if (strcmp(*opt_start, "direct") == 0) {
- res = set_service_property(connection, message,
- service_name,
- "Proxy.Configuration",
- proxy_simple, opt_start, 1);
- break;
- }
-
- if (strcmp(*opt_start, "auto") == 0) {
- res = set_service_property(connection, message,
- service_name,
- "Proxy.Configuration",
- proxy_simple, opt_start, 1);
- break;
- }
-
- if (strcmp(*opt_start, "manual") == 0) {
- char **url_start = &args[index + 2];
-
- if (*url_start != NULL &&
- strcmp(*url_start,
- "servers") == 0) {
- url_start = &args[index + 3];
- index++;
- }
- res = store_proxy_input(connection,
- message, service_name,
- 0, url_start);
- }
-
+ res = __connmanctl_dbus_set_property_dict(connection,
+ path, "net.connman.Service",
+ config_return, g_strdup(service_name),
+ "Proxy.Configuration",
+ DBUS_TYPE_STRING, config_append_proxy,
+ &append);
+ index += append.values;
break;
case 'r':
res = __connmanctl_dbus_method_call(connection,