client: Add VPN connection helper function

Add helper function for printing VPN connections. Show also configuration
and failure states using 'C' and 'F' as configuration might take some
time and failure conveys practical information to the user.

diff --git a/Makefile.am b/Makefile.am
index d1a4c48..a51c64f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -234,6 +234,7 @@ client_connmanctl_SOURCES =  $(gdbus_sources) \
                        client/commands.h client/commands.c \
                        client/input.h client/input.c \
                        client/agent.h client/agent.c \
+                       client/vpnconnections.h client/vpnconnections.c \
                        client/main.c
 
 client_connmanctl_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ -lreadline -ldl

diff --git a/client/vpnconnections.c b/client/vpnconnections.c
new file mode 100644 (file)
index 0000000..f4b8d3c
--- /dev/null
+++ b/client/vpnconnections.c
@@ -0,0 +1,111 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "vpnconnections.h"
+
+static void print_connection(char *path, DBusMessageIter *iter)
+{
+       char *name = "";
+       char state = ' ';
+       char *str;
+       char *property;
+       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, "ready") == 0)
+                                       state = 'R';
+                               else if (strcmp(str, "configuration") == 0)
+                                       state = 'C';
+                               else if (strcmp(str, "failure") == 0)
+                                       state = 'F';
+                       }
+               }
+
+               dbus_message_iter_next(iter);
+       }
+
+       str = strrchr(path, '/');
+       if (str != NULL)
+               str++;
+       else
+               str = path;
+
+       fprintf(stdout, "  %c %-20s %s", state, name, str);
+}
+
+void __connmanctl_vpnconnections_list(DBusMessageIter *iter)
+{
+       DBusMessageIter array, entry, dict;
+       char *path = NULL;
+
+       if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
+               return;
+
+       dbus_message_iter_recurse(iter, &array);
+
+       while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_STRUCT) {
+
+               dbus_message_iter_recurse(&array, &entry);
+               if (dbus_message_iter_get_arg_type(&entry)
+                               != DBUS_TYPE_OBJECT_PATH)
+                       return;
+
+               dbus_message_iter_get_basic(&entry, &path);
+
+               dbus_message_iter_next(&entry);
+               if (dbus_message_iter_get_arg_type(&entry)
+                               == DBUS_TYPE_ARRAY) {
+                       dbus_message_iter_recurse(&entry, &dict);
+                       print_connection(path, &dict);
+               }
+
+               if (dbus_message_iter_has_next(&array) == TRUE)
+                       fprintf(stdout, "\n");
+
+               dbus_message_iter_next(&array);
+       }
+
+       fprintf(stdout, "\n");
+}

diff --git a/client/vpnconnections.h b/client/vpnconnections.h
new file mode 100644 (file)
index 0000000..a915c84
--- /dev/null
+++ b/client/vpnconnections.h
@@ -0,0 +1,38 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __CONNMANCTL_VPNCONNECTIONS_H
+#define __CONNMANCTL_VPNCONNECTIONS_H
+
+#include <dbus/dbus.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void __connmanctl_vpnconnections_list(DBusMessageIter *iter);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CONNMANCTL_VPNCONNECTIONS_H */