summaryrefslogtreecommitdiff
path: root/client/services.c
diff options
context:
space:
mode:
authorPatrik Flykt <patrik.flykt@linux.intel.com>2013-03-27 13:53:48 +0200
committerPatrik Flykt <patrik.flykt@linux.intel.com>2013-04-04 10:20:50 +0300
commit4f21d25e38219c3b909674327d66c2d6219e99c2 (patch)
tree87817f7efb034f0b95b31ff79cf4888009dab963 /client/services.c
parentcb5f603b695ca5f462801150cb42b5fae8ec5d30 (diff)
downloadconnman-4f21d25e38219c3b909674327d66c2d6219e99c2.tar.gz
connman-4f21d25e38219c3b909674327d66c2d6219e99c2.tar.bz2
connman-4f21d25e38219c3b909674327d66c2d6219e99c2.zip
client: Add pretty-printing for ServicesChanged signal
Create a set of helper functions for pretty-printing both the added and the removed services dictionaries in the ServicesChanged signal.
Diffstat (limited to 'client/services.c')
-rw-r--r--client/services.c120
1 files changed, 119 insertions, 1 deletions
diff --git a/client/services.c b/client/services.c
index 56d26111..bdf24da7 100644
--- a/client/services.c
+++ b/client/services.c
@@ -2,7 +2,7 @@
*
* Connection Manager
*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2012-2013 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 as published by
@@ -62,6 +62,124 @@ int parse_boolean(char *arg)
return -1;
}
+static void print_service(char *path, DBusMessageIter *iter)
+{
+ char *name = "", *str = NULL;
+ int autoconn = 0, favorite = 0, count = 0;
+ char *property;
+ char state = ' ';
+ DBusMessageIter entry, val;
+
+ while (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) {
+
+ dbus_message_iter_recurse(iter, &entry);
+ dbus_message_iter_get_basic(&entry, &property);
+ if (strcmp(property, "Name") == 0) {
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &val);
+ dbus_message_iter_get_basic(&val, &name);
+
+ } else if (strcmp(property, "State") == 0) {
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &val);
+ dbus_message_iter_get_basic(&val, &str);
+
+ if (str != NULL) {
+ if (strcmp(str, "online") == 0)
+ state = 'O';
+ else if (strcmp(str, "ready") == 0)
+ state = 'R';
+ }
+
+ } else if (strcmp(property, "AutoConnect") == 0) {
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &val);
+ dbus_message_iter_get_basic(&val, &autoconn);
+
+ } else if (strcmp(property, "Favorite") == 0) {
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &val);
+ dbus_message_iter_get_basic(&val, &favorite);
+ }
+
+ count++;
+ dbus_message_iter_next(iter);
+ }
+
+ str = strrchr(path, '/');
+ if (str != NULL)
+ str++;
+ else
+ str = path;
+
+ if (count > 0) {
+ if (*name == '\0')
+ name = "<hidden>";
+
+ fprintf(stdout, "%c%c%c %-20s %s", favorite != 0 ? '*' : ' ',
+ autoconn != 0 ? 'A' : ' ', state, name, str);
+ } else
+ fprintf(stdout, "%-24s %s", "unchanged", str);
+
+}
+
+static void list_service_array(DBusMessageIter *iter)
+{
+ DBusMessageIter array, dict;
+ char *path = NULL;
+
+ while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_STRUCT) {
+
+ dbus_message_iter_recurse(iter, &array);
+ if (dbus_message_iter_get_arg_type(&array)
+ != DBUS_TYPE_OBJECT_PATH)
+ return;
+
+ dbus_message_iter_get_basic(&array, &path);
+
+ dbus_message_iter_next(&array);
+ if (dbus_message_iter_get_arg_type(&array)
+ == DBUS_TYPE_ARRAY) {
+ dbus_message_iter_recurse(&array, &dict);
+ print_service(path, &dict);
+ }
+
+ if (dbus_message_iter_has_next(iter) == TRUE)
+ fprintf(stdout, "\n");
+
+ dbus_message_iter_next(iter);
+ }
+}
+
+void __connmanctl_services_list(DBusMessageIter *iter)
+{
+ DBusMessageIter array;
+ char *path;
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
+ return;
+
+ dbus_message_iter_recurse(iter, &array);
+ list_service_array(&array);
+
+ dbus_message_iter_next(iter);
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
+ return;
+
+ fprintf(stdout, "\n}, {");
+
+ dbus_message_iter_recurse(iter, &array);
+ while (dbus_message_iter_get_arg_type(&array)
+ == DBUS_TYPE_OBJECT_PATH) {
+ dbus_message_iter_get_basic(&array, &path);
+ fprintf(stdout, "\n%-24s %s", "removed", path);
+
+ dbus_message_iter_next(&array);
+ }
+
+}
+
+
static int append_property_array(DBusMessageIter *iter, char *property,
char **data, int num_args)
{