2008-04-01 Dan Williams <dcbw@redhat.com>

	Patch from Per Øyvind Karlsen <peroyvind@mandriva.org>

	* configure.in
	  initscript/Makefile.am
	  initscript/Mandriva/Makefile.am
	  initscript/Mandriva/networkmanager.in
	  initscript/Mandriva/networkmanagerdispatcher.in
	  src/backends/Makefile.am
	  src/backends/NetworkManagerMandriva.c
	  system-settings/plugins/Makefile.am
		- Add Mandriva support



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3523 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

2 files changed, 547 insertions, 0 deletions

diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
index 4536082b44..e988da56af 100644
--- a/src/backends/Makefile.am
+++ b/src/backends/Makefile.am
@@ -53,6 +53,12 @@ libnmbackend_la_SOURCES +=	NetworkManagerFrugalware.c
 libnmbackend_la_LIBADD += -lfwnetconfig -lfwutil
 endif
 
+if TARGET_MANDRIVA
+libnmbackend_la_SOURCES +=      NetworkManagerMandriva.c  \
+				shvar.c                         \
+				shvar.h
+endif
+
 libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS)
 libnmbackend_la_CPPFLAGS =	$(DBUS_CFLAGS)				\
 					$(GTHREAD_CFLAGS)				\
diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c
new file mode 100644
index 0000000000..ec9979d19e
--- /dev/null
+++ b/src/backends/NetworkManagerMandriva.c
@@ -0,0 +1,541 @@
+/* NetworkManager -- Network link manager
+ *
+ * Dan Williams <dcbw@redhat.com>
+ * Per Øyvind Karlsen <peroyvind@mandriva.org>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * (C) Copyright 2004 Red Hat, Inc.
+ * (C) Copyright 2008 Per Øyvind Karlsen
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <arpa/inet.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "NetworkManagerGeneric.h"
+#include "NetworkManagerSystem.h"
+#include "NetworkManagerUtils.h"
+#include "nm-device.h"
+#include "nm-device-802-3-ethernet.h"
+#include "nm-device-802-11-wireless.h"
+#include "nm-utils.h"
+#include "shvar.h"
+
+/*
+ * nm_system_init
+ *
+ * Initializes the distribution-specific system backend
+ *
+ */
+void nm_system_init (void)
+{
+	nm_generic_init ();
+}
+
+
+/*
+ * nm_system_device_flush_routes
+ *
+ * Flush all routes associated with a network device
+ *
+ */
+void nm_system_device_flush_routes (NMDevice *dev)
+{
+	nm_generic_device_flush_routes (dev);
+}
+
+
+/*
+ * nm_system_device_flush_routes_with_iface
+ *
+ * Flush all routes associated with a network device
+ *
+ */
+void nm_system_device_flush_routes_with_iface (const char *iface)
+{
+	nm_generic_device_flush_routes_with_iface (iface);
+}
+
+
+/*
+ * nm_system_device_replace_default_route
+ *
+ * Add default route to the given device
+ *
+ */
+void
+nm_system_device_replace_default_route (const char *iface,
+		guint32 gw,
+		guint32 mss)
+{
+	nm_generic_device_replace_default_route (iface, gw, mss);
+}
+
+
+/*
+ * nm_system_device_add_route_via_device_with_iface
+ *
+ * Add route to the given device
+ *
+ */
+void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route)
+{
+	nm_generic_device_add_route_via_device_with_iface (iface, route);
+}
+
+
+/*
+ * nm_system_device_has_active_routes
+ *
+ * Find out whether the specified device has any routes in the routing
+ * table.
+ *
+ */
+gboolean nm_system_device_has_active_routes (NMDevice *dev)
+{
+	return (FALSE);
+}
+
+
+/*
+ * nm_system_device_flush_addresses
+ *
+ * Flush all network addresses associated with a network device
+ *
+ */
+void nm_system_device_flush_addresses (NMDevice *dev)
+{
+	nm_generic_device_flush_addresses (dev);
+}
+
+
+/*
+ * nm_system_device_flush_addresses_with_iface
+ *
+ * Flush all network addresses associated with a network device
+ *
+ */
+void nm_system_device_flush_addresses_with_iface (const char *iface)
+{
+	nm_generic_device_flush_addresses_with_iface (iface);
+}
+
+
+#if 0
+	/* Alert other computers of our new address */
+	temp_addr.s_addr = addr;
+	buf = g_strdup_printf ("/sbin/arping -q -A -c 1 -I %s %s", iface, inet_ntoa (temp_addr));
+	nm_spawn_process (buf);
+	g_free (buf);
+	g_usleep (G_USEC_PER_SEC * 2);
+	buf = g_strdup_printf ("/sbin/arping -q -U -c 1 -I %s %s", iface, inet_ntoa (temp_addr));
+	nm_spawn_process (buf);
+	g_free (buf);
+#endif
+
+
+/*
+ * nm_system_enable_loopback
+ *
+ * Bring up the loopback interface
+ *
+ */
+void nm_system_enable_loopback (void)
+{
+	nm_generic_enable_loopback ();
+}
+
+
+/*
+ * nm_system_flush_loopback_routes
+ *
+ * Flush all routes associated with the loopback device, because it
+ * sometimes gets the first route for ZeroConf/Link-Local traffic.
+ *
+ */
+void nm_system_flush_loopback_routes (void)
+{
+	nm_generic_flush_loopback_routes ();
+}
+
+
+/*
+ * nm_system_flush_arp_cache
+ *
+ * Flush all entries in the arp cache.
+ *
+ */
+void nm_system_flush_arp_cache (void)
+{
+	nm_generic_flush_arp_cache ();
+}
+
+
+/*
+ * nm_system_kill_all_dhcp_daemons
+ *
+ * Kill all DHCP daemons currently running, done at startup.
+ *
+ */
+void nm_system_kill_all_dhcp_daemons (void)
+{
+}
+
+
+/*
+ * nm_system_update_dns
+ *
+ * Invalidate the nscd host cache, if it exists, since
+ * we changed resolv.conf.
+ *
+ */
+void nm_system_update_dns (void)
+{
+	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
+		nm_spawn_process ("/etc/init.d/nscd condrestart");
+		nm_spawn_process ("/usr/sbin/nscd -i hosts");
+	}
+}
+
+
+/*
+ * nm_system_restart_mdns_responder
+ *
+ * Restart the multicast DNS responder so that it knows about new
+ * network interfaces and IP addresses.
+ *
+ */
+void nm_system_restart_mdns_responder (void)
+{
+#if defined(MDNS_PROVIDER_AVAHI)
+	nm_info ("Restarting avahi-daemon");
+	if (g_file_test ("/var/run/avahi-daemon/pid", G_FILE_TEST_EXISTS))
+	{
+		nm_spawn_process ("/etc/init.d/avahi-daemon restart");
+	}
+#elif defined(MDNS_PROVIDER_HOWL)
+	if (g_file_text ("/var/run/mDNSResponder.pid", G_FILE_TEST_EXISTS))
+	{
+		nm_info ("Restarting mDNSResponder");
+		nm_spawn_process ("/etc/init.d/mDNSResponder stop");
+		nm_spawn_process ("/etc/init.d/mDNSResponder zap");
+		nm_spawn_process ("/etc/init.d/mDNSResponder start");
+	}
+#elif defined(MDNS_PROVIDER_BONJOUR)
+	if (g_file_test ("/var/run/mDNSResponderPosix.pid", G_FILE_TEST_EXISTS))
+	{
+		nm_info ("Restarting mDNSResponderPosix");
+		nm_spawn_process ("/etc/init.d/mDNSResponderPosix restart");
+	}
+#else
+	g_printerr("No mDNSResponder support enabled");
+	g_assert_not_reached();
+#endif
+}
+
+
+/*
+ * nm_system_device_add_ip6_link_address
+ *
+ * Add a default link-local IPv6 address to a device.
+ *
+ */
+void nm_system_device_add_ip6_link_address (NMDevice *dev)
+{
+	nm_generic_device_add_ip6_link_address (dev);
+}
+
+
+typedef struct MandrivaSystemConfigData
+{
+	NMIP4Config *	config;
+	gboolean		use_dhcp;
+	gboolean		system_disabled;
+} MandrivaSystemConfigData;
+
+
+/*
+ * get_current_profile_name
+ *
+ * Retrieve the current network profile, if any
+ *
+ */
+static char *get_current_profile_name (void)
+{
+	shvarFile *	file;
+	char *		buf;
+
+	if (!(file = svNewFile (SYSCONFDIR"/sysconfig/network")))
+		return NULL;
+
+	buf = svGetValue (file, "CURRENT_PROFILE");
+	if (!buf)
+		buf = strdup ("default");
+	svCloseFile (file);
+
+	return buf;
+}
+
+
+/*
+ * nm_system_device_get_system_config
+ *
+ * Read in the config file for a device.
+ *
+ */
+void *nm_system_device_get_system_config (NMDevice *dev)
+{
+	char *				cfg_file_path = NULL;
+	shvarFile *			file;
+	char *				buf = NULL;
+	MandrivaSystemConfigData *	sys_data = NULL;
+	gboolean				error = FALSE;
+
+	g_return_val_if_fail (dev != NULL, NULL);
+
+	/* Red Hat/Fedora Core systems store this information in
+	 * /etc/sysconfig/network-scripts/ifcfg-* where * is the interface
+	 * name.
+	 */
+
+	sys_data = g_malloc0 (sizeof (MandrivaSystemConfigData));
+	sys_data->use_dhcp = TRUE;
+
+	cfg_file_path = g_strdup_printf (SYSCONFDIR"/sysconfig/network-scripts/ifcfg-%s", nm_device_get_iface (dev));
+	if (!cfg_file_path)
+		return sys_data;
+
+	if (!(file = svNewFile (cfg_file_path)))
+	{
+		g_free (cfg_file_path);
+		return sys_data;
+	}
+	g_free (cfg_file_path);
+
+	/* Make sure this config file is for this device */
+	buf = svGetValue (file, "DEVICE");
+	if (!buf || strcmp (buf, nm_device_get_iface (dev)))
+	{
+		free (buf);
+		goto out;
+	}
+
+	if ((buf = svGetValue (file, "BOOTPROTO")))
+	{
+		if (strcasecmp (buf, "dhcp"))
+			sys_data->use_dhcp = FALSE;
+		free (buf);
+	}
+
+	if ((buf = svGetValue (file, "NM_CONTROLLED")))
+	{
+		nm_debug ("NM_CONTROLLED=%s", buf);
+		if (!strcasecmp (buf, "no"))
+		{
+			nm_info ("System configuration disables device %s", nm_device_get_iface (dev));
+			sys_data->system_disabled = TRUE;
+		}
+		free (buf);
+	}		
+
+	sys_data->config = nm_ip4_config_new ();
+
+	if (!(sys_data->use_dhcp))
+	{
+		if ((buf = svGetValue (file, "IPADDR")))
+		{
+			nm_ip4_config_set_address (sys_data->config, inet_addr (buf));
+			free (buf);
+		}
+		else
+		{
+			nm_warning ("Network configuration for device '%s' was invalid (non-DHCP configuration, "
+						"but no IP address specified.  Will use DHCP instead.", nm_device_get_iface (dev));
+			error = TRUE;
+			goto out;
+		}
+
+		if ((buf = svGetValue (file, "GATEWAY")))
+		{
+			nm_ip4_config_set_gateway (sys_data->config, inet_addr (buf));
+			free (buf);
+		}
+		else
+		{
+			nm_warning ("Network configuration for device '%s' was invalid (non-DHCP configuration, "
+						"but no gateway specified.  Will use DHCP instead.", nm_device_get_iface (dev));
+			error = TRUE;
+			goto out;
+		}
+
+		if ((buf = svGetValue (file, "NETMASK")))
+		{
+			nm_ip4_config_set_netmask (sys_data->config, inet_addr (buf));
+			free (buf);
+		}
+		else
+		{
+			guint32	addr = nm_ip4_config_get_address (sys_data->config);
+
+			/* Make a default netmask if we have an IP address */
+			if (((ntohl (addr) & 0xFF000000) >> 24) <= 127)
+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000));
+			else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191)
+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000));
+			else
+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00));
+		}
+
+		if ((buf = svGetValue (file, "BROADCAST")))
+		{
+			nm_ip4_config_set_broadcast (sys_data->config, inet_addr (buf));
+			free (buf);
+		}
+		else
+		{
+			guint32 broadcast = ((nm_ip4_config_get_address (sys_data->config) & nm_ip4_config_get_netmask (sys_data->config))
+									| ~nm_ip4_config_get_netmask (sys_data->config));
+			nm_ip4_config_set_broadcast (sys_data->config, broadcast);
+		}
+	}
+
+	/* If we're using Static IP, grab DNS servers from the profile's config file */
+	if (!sys_data->use_dhcp)
+	{
+		char * cur_profile_name = get_current_profile_name ();
+
+		if (cur_profile_name)
+		{
+			char *filename = g_strdup_printf (SYSCONFDIR"/sysconfig/networking/profiles/%s/resolv.conf", cur_profile_name);
+			
+			nm_generic_set_ip4_config_from_resolv_conf (filename, sys_data->config);
+			g_free (filename);
+			g_free (cur_profile_name);
+		}
+	}	
+
+#if 0
+	nm_debug ("------ Config (%s)", nm_device_get_iface (dev));
+	nm_debug ("    DHCP=%d\n", sys_data->use_dhcp);
+	nm_debug ("    ADDR=%d\n", nm_ip4_config_get_address (sys_data->config));
+	nm_debug ("    GW=%d\n", nm_ip4_config_get_gateway (sys_data->config));
+	nm_debug ("    NM=%d\n", nm_ip4_config_get_netmask (sys_data->config));
+	nm_debug ("---------------------\n");
+#endif
+
+out:
+	svCloseFile (file);
+
+	if (error)
+	{
+		sys_data->use_dhcp = TRUE;
+		/* Clear out the config */
+		g_object_unref (sys_data->config);
+		sys_data->config = NULL;
+	}
+
+	return (void *)sys_data;
+}
+
+
+/*
+ * nm_system_device_free_system_config
+ *
+ * Free stored system config data
+ *
+ */
+void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data)
+{
+	MandrivaSystemConfigData *sys_data = (MandrivaSystemConfigData *)system_config_data;
+
+	g_return_if_fail (dev != NULL);
+
+	if (!sys_data)
+		return;
+
+	if (sys_data->config)
+		g_object_unref (sys_data->config);
+}
+
+
+/*
+ * nm_system_device_get_disabled
+ *
+ * Return whether the distro-specific system config tells us to use
+ * dhcp for this device.
+ *
+ */
+gboolean nm_system_device_get_disabled (NMDevice *dev)
+{
+	MandrivaSystemConfigData *sys_data;
+
+	g_return_val_if_fail (dev != NULL, FALSE);
+
+	if ((sys_data = nm_device_get_system_config_data (dev)))
+		return sys_data->system_disabled;
+
+	return FALSE;
+}
+
+
+/*
+ * nm_system_activate_nis
+ *
+ * set up the nis domain and write a yp.conf
+ *
+ */
+void nm_system_activate_nis (NMIP4Config *config)
+{
+}
+
+/*
+ * nm_system_shutdown_nis
+ *
+ * shutdown ypbind
+ *
+ */
+void nm_system_shutdown_nis (void)
+{
+}
+
+/*
+ * nm_system_set_hostname
+ *
+ * set the hostname
+ *
+ */
+void nm_system_set_hostname (NMIP4Config *config)
+{
+}
+
+
+/*
+ * nm_system_should_modify_resolv_conf
+ *
+ * Can NM update resolv.conf, or is it locked down?
+ */
+gboolean nm_system_should_modify_resolv_conf (void)
+{
+	return TRUE;
+}
+