[network-manager-openvpn/lr/libnm] fixup! service: port to libnm

[Lubomir Rintel <lkundrak src gnome org>]

commit 9829713e3f9f141aa1e1f873878aaca039f8830d
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sun Aug 16 12:35:16 2015 +0200

    fixup! service: port to libnm
    
    port to gdbus
    
    UNTESTED!

 configure.ac                            |    2 -
 src/Makefile.am                         |    2 -
 src/nm-openvpn-service-openvpn-helper.c |  109 ++++++++++++++-----------------
 3 files changed, 50 insertions(+), 63 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 97edd33..860ed55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,6 @@ AM_GLIB_GNU_GETTEXT
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
-PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
-
 if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
diff --git a/src/Makefile.am b/src/Makefile.am
index 43217bc..0c3c3a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
-       $(DBUS_CFLAGS) \
        $(LIBNM_CFLAGS) \
        -DBINDIR=\"$(bindir)\" \
        -DPREFIX=\""$(prefix)"\" \
@@ -28,7 +27,6 @@ nm_openvpn_service_openvpn_helper_SOURCES = \
        nm-openvpn-service-openvpn-helper.c
 
 nm_openvpn_service_openvpn_helper_LDADD = \
-       $(DBUS_LIBS) \
        $(LIBNM_LIBS)
 
 CLEANFILES = *~
diff --git a/src/nm-openvpn-service-openvpn-helper.c b/src/nm-openvpn-service-openvpn-helper.c
index eea5926..5a2cb39 100644
--- a/src/nm-openvpn-service-openvpn-helper.c
+++ b/src/nm-openvpn-service-openvpn-helper.c
@@ -39,9 +39,6 @@
 #include <ctype.h>
 #include <netdb.h>
 
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib.h>
 #include <NetworkManager.h>
 
 #include "nm-openvpn-service.h"
@@ -49,91 +46,69 @@
 
 extern char **environ;
 
-/* These are here because nm-dbus-glib-types.h isn't exported */
-#define DBUS_TYPE_G_ARRAY_OF_UINT          (dbus_g_type_get_collection ("GArray", G_TYPE_UINT))
-#define DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT (dbus_g_type_get_collection ("GPtrArray", 
DBUS_TYPE_G_ARRAY_OF_UINT))
-#define DBUS_TYPE_G_PTR_ARRAY_OF_STRING    (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRING))
-#define DBUS_TYPE_G_MAP_OF_VARIANT         (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
-#define DBUS_TYPE_G_IP6_ROUTE              (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, 
G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID))
-#define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE     (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE))
-
 static gboolean helper_debug = FALSE;
 
 static void
-helper_failed (DBusGConnection *connection, const char *reason)
+helper_failed (GDBusProxy *proxy, const char *reason)
 {
-       DBusGProxy *proxy;
        GError *err = NULL;
 
        g_warning ("nm-openvpn-service-openvpn-helper did not receive a valid %s from openvpn", reason);
 
-       proxy = dbus_g_proxy_new_for_name (connection,
-                                                               NM_DBUS_SERVICE_OPENVPN,
-                                                               NM_VPN_DBUS_PLUGIN_PATH,
-                                                               NM_VPN_DBUS_PLUGIN_INTERFACE);
-
-       dbus_g_proxy_call (proxy, "SetFailure", &err,
-                                   G_TYPE_STRING, reason,
-                                   G_TYPE_INVALID,
-                                   G_TYPE_INVALID);
-
-       if (err) {
+        if (!g_dbus_proxy_call_sync (proxy, "SetFailure",
+                                    g_variant_new_string (reason),
+                                     G_DBUS_CALL_FLAGS_NONE, -1,
+                                     NULL,
+                                    &err)) {
                g_warning ("Could not send failure information: %s", err->message);
                g_error_free (err);
        }
 
-       g_object_unref (proxy);
-
        exit (1);
 }
 
 static void
-send_config (DBusGConnection *connection, GHashTable *config,
-             GHashTable *ip4config, GHashTable *ip6config)
+send_config (GDBusProxy *proxy, GVariant *config,
+             GVariant *ip4config, GVariant *ip6config)
 {
-       DBusGProxy *proxy;
        GError *err = NULL;
 
-       proxy = dbus_g_proxy_new_for_name (connection,
-                                          NM_DBUS_SERVICE_OPENVPN,
-                                          NM_VPN_DBUS_PLUGIN_PATH,
-                                          NM_VPN_DBUS_PLUGIN_INTERFACE);
-
-       if (!dbus_g_proxy_call (proxy, "SetConfig", &err,
-                               DBUS_TYPE_G_MAP_OF_VARIANT,
-                               config,
-                               G_TYPE_INVALID,
-                               G_TYPE_INVALID) && err) {
+        if (!g_dbus_proxy_call_sync (proxy, "SetConfig",
+                                    config,
+                                     G_DBUS_CALL_FLAGS_NONE, -1,
+                                     NULL,
+                                    &err)) {
                g_warning ("Could not send configuration information: %s", err->message);
                g_error_free (err);
                err = NULL;
        }
+       g_variant_unref (config);
 
        if (ip4config) {
-               if (!dbus_g_proxy_call (proxy, "SetIp4Config", &err,
-                                       DBUS_TYPE_G_MAP_OF_VARIANT,
-                                       ip4config,
-                                       G_TYPE_INVALID,
-                                       G_TYPE_INVALID) && err) {
+               if (!g_dbus_proxy_call_sync (proxy, "SetIp4Config",
+                                            ip4config,
+                                            G_DBUS_CALL_FLAGS_NONE, -1,
+                                            NULL,
+                                            &err)) {
                        g_warning ("Could not send IPv4 configuration information: %s", err->message);
                        g_error_free (err);
                        err = NULL;
                }
+               g_variant_unref (ip4config);
        }
 
        if (ip6config) {
-               if (!dbus_g_proxy_call (proxy, "SetIp6Config", &err,
-                                       DBUS_TYPE_G_MAP_OF_VARIANT,
-                                       ip6config,
-                                       G_TYPE_INVALID,
-                                       G_TYPE_INVALID) && err) {
+               if (!g_dbus_proxy_call_sync (proxy, "SetIp6Config",
+                                            ip6config,
+                                            G_DBUS_CALL_FLAGS_NONE, -1,
+                                            NULL,
+                                            &err)) {
                        g_warning ("Could not send IPv6 configuration information: %s", err->message);
                        g_error_free (err);
                        err = NULL;
                }
+               g_variant_unref (ip6config);
        }
-
-       g_object_unref (proxy);
 }
 
 static GVariant *
@@ -455,7 +430,8 @@ trusted_remote_to_gvariant (void)
 int
 main (int argc, char *argv[])
 {
-       DBusGConnection *connection;
+       GDBusConnection *connection;
+       GDBusProxy *proxy;
        GVariantBuilder builder, ip4builder, ip6builder;
        GVariant *ip4config, *ip6config;
        char *tmp;
@@ -522,12 +498,25 @@ main (int argc, char *argv[])
 
        is_restart = argc >= 7 && !g_strcmp0 (argv[6], "restart");
 
-       connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err);
+       connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &err);
        if (!connection) {
                g_warning ("Could not get the system bus: %s", err->message);
+               g_error_free (err);
                exit (1);
        }
 
+        proxy = g_dbus_proxy_new_sync (connection, G_DBUS_CALL_FLAGS_NONE, NULL,
+                                      NM_DBUS_SERVICE_OPENVPN,
+                                      NM_VPN_DBUS_PLUGIN_PATH,
+                                      NM_VPN_DBUS_PLUGIN_INTERFACE,
+                                       NULL, &err);
+        g_object_unref (connection);
+        if (!proxy) {
+               g_warning ("Could not create a D-Bus proxy: %s", err->message);
+               g_error_free (err);
+               exit (1);
+        }
+
        g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
        g_variant_builder_init (&ip4builder, G_VARIANT_TYPE_VARDICT);
        g_variant_builder_init (&ip6builder, G_VARIANT_TYPE_VARDICT);
@@ -537,7 +526,7 @@ main (int argc, char *argv[])
        if (val)
                g_variant_builder_add (&builder, "{sv}", NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, val);
        else
-               helper_failed (connection, "VPN Gateway");
+               helper_failed (proxy, "VPN Gateway");
 
        /* Internal VPN subnet gateway */
        tmp = getenv ("route_vpn_gateway");
@@ -556,7 +545,7 @@ main (int argc, char *argv[])
        if (val)
                g_variant_builder_add (&builder, "{sv}", NM_VPN_PLUGIN_CONFIG_TUNDEV, val);
        else
-               helper_failed (connection, "Tunnel Device");
+               helper_failed (proxy, "Tunnel Device");
 
        if (tapdev == -1)
                tapdev = strncmp (tmp, "tap", 3) == 0;
@@ -570,7 +559,7 @@ main (int argc, char *argv[])
                if (val)
                        g_variant_builder_add (&ip4builder, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, val);
                else
-                       helper_failed (connection, "IP4 Address");
+                       helper_failed (proxy, "IP4 Address");
        }
 
        /* PTP address; for vpnc PTP address == internal IP4 address */
@@ -626,7 +615,7 @@ main (int argc, char *argv[])
                if (val)
                        g_variant_builder_add (&ip6builder, "{sv}", NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, val);
                else
-                       helper_failed (connection, "IP6 Address");
+                       helper_failed (proxy, "IP6 Address");
        }
 
        /* IPv6 remote address */
@@ -636,7 +625,7 @@ main (int argc, char *argv[])
                if (val)
                        g_variant_builder_add (&ip6builder, "{sv}", NM_VPN_PLUGIN_IP6_CONFIG_PTP, val);
                else
-                       helper_failed (connection, "IP6 PTP Address");
+                       helper_failed (proxy, "IP6 PTP Address");
        }
 
        /* IPv6 netbits */
@@ -741,7 +730,9 @@ main (int argc, char *argv[])
        }
 
        /* Send the config info to nm-openvpn-service */
-       send_config (connection, g_variant_builder_end (&builder), ip4config, ip6config);
+       send_config (proxy, g_variant_builder_end (&builder), ip4config, ip6config);
+
+       g_object_unref (proxy);
 
        return 0;
 }