File nm-opensuse-merge.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-opensuse-merge.patch of Package NetworkManager (Revision 2b2a1bccabba53317894f1e651af7360)

Currently displaying revision 2b2a1bccabba53317894f1e651af7360 , Show latest

diff --git a/system-settings/plugins/ifcfg-suse/Makefile.am b/system-settings/plugins/ifcfg-suse/Makefile.am
index 7f1043f..3b511df 100644
--- a/system-settings/plugins/ifcfg-suse/Makefile.am
+++ b/system-settings/plugins/ifcfg-suse/Makefile.am
@@ -39,3 +39,41 @@ libnm_settings_plugin_ifcfg_suse_la_LIBADD += \
 	$(GIO_LIBS)
 endif
 
+BUILT_SOURCES = \
+	writer.h \
+	writer.c \
+	sha1.h \
+	sha1.c
+
+writer.h: $(top_srcdir)/system-settings/plugins/keyfile/writer.h
+	ln -s $< $@
+writer.c: $(top_srcdir)/system-settings/plugins/keyfile/writer.c
+	ln -s $< $@
+sha1.h: $(top_srcdir)/system-settings/src/sha1.h
+	ln -s $< $@
+sha1.c: $(top_srcdir)/system-settings/src/sha1.c
+	ln -s $< $@
+
+libexec_PROGRAMS = nm-opensuse-sysconfig-merge
+nm_opensuse_sysconfig_merge_SOURCES = \
+	parser.h \
+	parser.c \
+	sha1.h \
+	sha1.c \
+	shvar.h \
+	shvar.c \
+	writer.h \
+	writer.c \
+	nm-opensuse-sysconfig-merge.c
+
+nm_opensuse_sysconfig_merge_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(HAL_CFLAGS) \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_srcdir)/libnm-glib \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DKEYFILE_DIR=\"$(sysconfdir)/NetworkManager/system-connections\"
+
+nm_opensuse_sysconfig_merge_LDADD = $(GLIB_LIBS) $(HAL_LIBS) $(DBUS_LIBS) $(top_builddir)/libnm-util/libnm-util.la
diff --git a/system-settings/plugins/ifcfg-suse/nm-opensuse-sysconfig-merge.c b/system-settings/plugins/ifcfg-suse/nm-opensuse-sysconfig-merge.c
new file mode 100644
index 0000000..9241c10
--- /dev/null
+++ b/system-settings/plugins/ifcfg-suse/nm-opensuse-sysconfig-merge.c
@@ -0,0 +1,243 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+#include <string.h>
+#include <glib.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <libhal.h>
+#include <NetworkManager.h>
+#include <nm-connection.h>
+
+#include "parser.h"
+#include "writer.h"
+
+#define CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf"
+#define CONF_DIR  SYSCONFDIR "/sysconfig/network"
+#define CONF_DHCP CONF_DIR "/dhcp"
+
+/* hostname */
+
+#define HOSTNAME_FILE SYSCONFDIR "/HOSTNAME"
+
+static gboolean
+hostname_is_dynamic (void)
+{
+    GIOChannel *channel;
+    const char *pattern = "DHCLIENT_SET_HOSTNAME=";
+    char *str = NULL;
+    int pattern_len;
+    gboolean dynamic = FALSE;
+
+    channel = g_io_channel_new_file (CONF_DHCP, "r", NULL);
+    if (!channel)
+        return dynamic;
+
+    pattern_len = strlen (pattern);
+
+    while (g_io_channel_read_line (channel, &str, NULL, NULL, NULL) != G_IO_STATUS_EOF) {
+        if (!strncmp (str, pattern, pattern_len)) {
+            if (!strncmp (str + pattern_len, "\"yes\"", 5))
+                dynamic = TRUE;
+            break;
+        }
+        g_free (str);
+    }
+
+    g_io_channel_shutdown (channel, FALSE, NULL);
+    g_io_channel_unref (channel);
+
+    return dynamic;
+}
+
+static char *
+hostname_read ()
+{
+    GIOChannel *channel;
+    char *hostname = NULL;
+
+    channel = g_io_channel_new_file (HOSTNAME_FILE, "r", NULL);
+    if (channel) {
+        g_io_channel_read_line (channel, &hostname, NULL, NULL, NULL);
+        g_io_channel_shutdown (channel, FALSE, NULL);
+        g_io_channel_unref (channel);
+
+        if (hostname) {
+            char *end_of_hostname;
+
+            end_of_hostname = strstr (hostname, ".");
+            if (end_of_hostname)
+                *end_of_hostname = '\0';
+            else
+                hostname = g_strchomp (hostname);
+        }
+    }
+
+    return hostname;
+}
+
+static void
+hostname_merge (GKeyFile *keyfile)
+{
+    gboolean merged;
+
+    merged = g_key_file_get_boolean (keyfile, "suse", "hostname-merged", NULL);
+    if (merged)
+        return;
+
+    if (!hostname_is_dynamic ()) {
+        char *hostname;
+
+        hostname = hostname_read ();
+        if (hostname) {
+            g_key_file_set_string (keyfile, "keyfile", "hostname", hostname);
+            g_free (hostname);
+        }
+    }
+
+    g_key_file_set_boolean (keyfile, "suse", "hostname-merged", TRUE);
+}
+
+/* Connections */
+
+static NMDeviceType
+get_device_type (const char *iface)
+{
+    DBusGConnection *bus;
+    LibHalContext *hal_ctx;
+    DBusError error;
+    NMDeviceType type = NM_DEVICE_TYPE_UNKNOWN;
+
+    bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
+    if (!bus) {
+        g_warning ("Could not connect to system bus.");
+        return type;
+    }
+
+    hal_ctx = libhal_ctx_new ();
+    libhal_ctx_set_dbus_connection (hal_ctx, dbus_g_connection_get_connection (bus));
+
+    dbus_error_init (&error);
+    if (libhal_ctx_init (hal_ctx, &error)) {
+        char **devices = NULL;
+        int num_devices = 0;
+
+        devices = libhal_manager_find_device_string_match (hal_ctx, "net.interface",
+                                                           iface, &num_devices, &error);
+
+        if (num_devices == 1) {
+            char *type_str;
+
+            type_str = libhal_device_get_property_string (hal_ctx, devices[0], "info.category", NULL);
+            if (type_str) {
+                if (!strcmp (type_str, "net.80203"))
+                    type = NM_DEVICE_TYPE_ETHERNET;
+                else if (!strcmp (type_str, "net.80211"))
+                    type = NM_DEVICE_TYPE_WIFI;
+                else
+                    g_warning ("Unsupported device type '%s'", type_str);
+
+                libhal_free_string (type_str);
+            }
+        } else
+            g_warning ("Device '%s' not found", iface);
+
+        if (devices)
+            libhal_free_string_array (devices);
+    } else
+        g_warning ("HAL initialization failed: %s", error.message);
+
+    if (dbus_error_is_set (&error))
+        dbus_error_free (&error);
+
+    libhal_ctx_shutdown (hal_ctx, NULL);
+    libhal_ctx_free (hal_ctx);
+
+    dbus_g_connection_unref (bus);
+
+    return type;
+}
+
+static void
+connections_merge (void)
+{
+    GDir *dir;
+
+    dir = g_dir_open (CONF_DIR, 0, NULL);
+    if (dir) {
+        const char *f;
+
+        while ((f = g_dir_read_name (dir)) != NULL) {
+            if (g_str_has_prefix (f, "ifcfg-") && 
+                strcmp (f, "ifcfg-lo") &&
+                !g_str_has_suffix (f, "~") &&
+                !g_str_has_suffix (f, ".bak")) {
+
+                const char *iface = f + 6;
+                NMDeviceType type = get_device_type (iface);
+
+                if (type != NM_DEVICE_TYPE_UNKNOWN) {
+                    NMConnection *connection;
+
+                    g_print ("Converting '%s' (interface: %s: type: %d)\n", f, iface, type);
+
+                    connection = parse_ifcfg (iface, type);
+                    if (connection) {
+                        char *path = NULL;
+                        GError *error = NULL;
+
+                        write_connection (connection, &path, &error);
+                        if (error) {
+                            g_warning ("%s", error->message);
+                            g_error_free (error);
+                        }
+
+                        g_free (path);
+                        g_object_unref (connection);
+                    }
+                }
+            }
+        }
+
+        g_dir_close (dir);
+    } else
+        g_warning ("Could not open " CONF_DIR " directory");
+}
+
+/* */
+
+int
+main (int argc, char *argv[])
+{
+    GKeyFile *key_file;
+    int i;
+
+    g_type_init ();
+    g_set_prgname (argv[0]);
+
+    for (i = 1; i < argc; i++) {
+        const char *a = argv[i];
+
+        if (a && !strcmp (a, "--connections"))
+            connections_merge ();
+    }
+
+    key_file = g_key_file_new ();
+    if (g_key_file_load_from_file (key_file, CONF_FILE, G_KEY_FILE_NONE, NULL)) {
+        char *data;
+        gsize len;
+
+        /* Merge stuff */
+        hostname_merge (key_file);
+
+        /* Write keyfile back to disk */
+        data = g_key_file_to_data (key_file, &len, NULL);
+        if (data) {
+            g_file_set_contents (CONF_FILE, data, len, NULL);
+            g_free (data);
+        }
+    }
+
+    g_key_file_free (key_file);
+
+    return 0;
+}
diff --git a/system-settings/plugins/ifcfg-suse/parser.c b/system-settings/plugins/ifcfg-suse/parser.c
index 9683c86..bff12e1 100644
--- a/system-settings/plugins/ifcfg-suse/parser.c
+++ b/system-settings/plugins/ifcfg-suse/parser.c
@@ -50,6 +50,17 @@
 
 /* Common */
 
+static GQuark
+ifcfg_plugin_error_quark (void)
+{
+	static GQuark error_quark = 0;
+
+	if (G_UNLIKELY (error_quark == 0))
+		error_quark = g_quark_from_static_string ("ifcfg-plugin-error-quark");
+
+	return error_quark;
+}
+
 static gboolean
 get_int (const char *str, int *value)
 {
diff --git a/system-settings/plugins/ifcfg-suse/plugin.c b/system-settings/plugins/ifcfg-suse/plugin.c
index e47f1da..25bff83 100644
--- a/system-settings/plugins/ifcfg-suse/plugin.c
+++ b/system-settings/plugins/ifcfg-suse/plugin.c
@@ -71,17 +71,6 @@ typedef struct {
 	guint default_gw_monitor_id;
 } SCPluginIfcfgPrivate;
 
-GQuark
-ifcfg_plugin_error_quark (void)
-{
-	static GQuark error_quark = 0;
-
-	if (G_UNLIKELY (error_quark == 0))
-		error_quark = g_quark_from_static_string ("ifcfg-plugin-error-quark");
-
-	return error_quark;
-}
-
 static void
 update_one_connection (gpointer key, gpointer val, gpointer user_data)
 {
diff --git a/system-settings/plugins/ifcfg-suse/plugin.h b/system-settings/plugins/ifcfg-suse/plugin.h
index 08ed440..4a9575d 100644
--- a/system-settings/plugins/ifcfg-suse/plugin.h
+++ b/system-settings/plugins/ifcfg-suse/plugin.h
@@ -46,7 +46,5 @@ struct _SCPluginIfcfgClass {
 
 GType sc_plugin_ifcfg_get_type (void);
 
-GQuark ifcfg_plugin_error_quark (void);
-
 #endif	/* _PLUGIN_H_ */
 
diff --git a/system-settings/plugins/keyfile/writer.c b/system-settings/plugins/keyfile/writer.c
index 34cc8af..2e13f8a 100644
--- a/system-settings/plugins/keyfile/writer.c
+++ b/system-settings/plugins/keyfile/writer.c
@@ -14,7 +14,8 @@
 
 #include "nm-dbus-glib-types.h"
 #include "writer.h"
-#include "reader.h"
+
+#define VPN_SECRETS_GROUP "vpn-secrets"
 
 static gboolean
 write_array_of_uint (GKeyFile *file,

Places

File nm-opensuse-merge.patch of Package NetworkManager (Revision 2b2a1bccabba53317894f1e651af7360)

Places