NetworkManager r3564 - in trunk: . src src/backends

[dcbw svn gnome org]

Author: dcbw
Date: Tue Apr 15 22:01:47 2008
New Revision: 3564
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3564&view=rev

Log:
2008-04-15  Dan Williams  <dcbw redhat com>

	Patch from Benoit Boissinot <bboissin+networkmanager gmail com>

	* src/NetworkManagerSystem.h
	  src/backends/NetworkManagerArch.c
	  src/backends/NetworkManagerDebian.c
	  src/backends/NetworkManagerFrugalware.c
	  src/backends/NetworkManagerGeneric.c
	  src/backends/NetworkManagerGeneric.h
	  src/backends/NetworkManagerGentoo.c
	  src/backends/NetworkManagerMandriva.c
	  src/backends/NetworkManagerPaldo.c
	  src/backends/NetworkManagerRedHat.c
	  src/backends/NetworkManagerSlackware.c
	  src/backends/NetworkManagerSuSE.c
	  src/nm-device.c
		- (nm_generic_device_add_ip6_link_address,
		   nm_system_device_add_ip6_link_address): remove



Modified:
   trunk/ChangeLog
   trunk/src/NetworkManagerSystem.h
   trunk/src/backends/NetworkManagerArch.c
   trunk/src/backends/NetworkManagerDebian.c
   trunk/src/backends/NetworkManagerFrugalware.c
   trunk/src/backends/NetworkManagerGeneric.c
   trunk/src/backends/NetworkManagerGeneric.h
   trunk/src/backends/NetworkManagerGentoo.c
   trunk/src/backends/NetworkManagerMandriva.c
   trunk/src/backends/NetworkManagerPaldo.c
   trunk/src/backends/NetworkManagerRedHat.c
   trunk/src/backends/NetworkManagerSlackware.c
   trunk/src/backends/NetworkManagerSuSE.c
   trunk/src/nm-device.c

Modified: trunk/src/NetworkManagerSystem.h
==============================================================================
--- trunk/src/NetworkManagerSystem.h	(original)
+++ trunk/src/NetworkManagerSystem.h	Tue Apr 15 22:01:47 2008
@@ -53,7 +53,6 @@
 void			nm_system_kill_all_dhcp_daemons			(void);
 void			nm_system_update_dns					(void);
 void			nm_system_restart_mdns_responder			(void);
-void			nm_system_device_add_ip6_link_address 		(NMDevice *dev);
 
 gboolean		nm_system_device_set_from_ip4_config		(const char *iface,
 												 NMIP4Config *config,

Modified: trunk/src/backends/NetworkManagerArch.c
==============================================================================
--- trunk/src/backends/NetworkManagerArch.c	(original)
+++ trunk/src/backends/NetworkManagerArch.c	Tue Apr 15 22:01:47 2008
@@ -331,18 +331,6 @@
 	}	
 }
 
-
-/*
- * 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);
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerDebian.c
==============================================================================
--- trunk/src/backends/NetworkManagerDebian.c	(original)
+++ trunk/src/backends/NetworkManagerDebian.c	Tue Apr 15 22:01:47 2008
@@ -202,18 +202,6 @@
 	nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
 }
 
-
-/*
- * 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);
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerFrugalware.c
==============================================================================
--- trunk/src/backends/NetworkManagerFrugalware.c	(original)
+++ trunk/src/backends/NetworkManagerFrugalware.c	Tue Apr 15 22:01:47 2008
@@ -178,38 +178,6 @@
 	}
 }
 
-
-/*
- * 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)
-{
-	char *buf;
-	struct ether_addr hw_addr;
-	unsigned char eui[8];
-
-	if (NM_IS_DEVICE_802_3_ETHERNET (dev))
-		nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr);
-	else if (NM_IS_DEVICE_802_11_WIRELESS (dev))
-		nm_device_802_11_wireless_get_address (NM_DEVICE_802_11_WIRELESS (dev), &hw_addr);
-
-	memcpy (eui, &(hw_addr.ether_addr_octet), sizeof (hw_addr.ether_addr_octet));
-	memmove (eui+5, eui+3, 3);
-	eui[3] = 0xff;
-	eui[4] = 0xfe;
-	eui[0] ^= 2;
-
-	/* Add the default link-local IPv6 address to a device */
-	buf = g_strdup_printf ("/usr/sbin/ip -6 addr add fe80::%x%02x:%x%02x:%x%02x:%x%02x/64 dev %s",
-	                       eui[0], eui[1], eui[2], eui[3], eui[4], eui[5],
-	                       eui[6], eui[7], nm_device_get_iface (dev));
-	nm_spawn_process (buf);
-	g_free (buf);
-}
-
 /*
  * nm_system_device_add_route_via_device_with_iface
  *

Modified: trunk/src/backends/NetworkManagerGeneric.c
==============================================================================
--- trunk/src/backends/NetworkManagerGeneric.c	(original)
+++ trunk/src/backends/NetworkManagerGeneric.c	Tue Apr 15 22:01:47 2008
@@ -238,39 +238,6 @@
 {
 }
 
-
-/*
- * nm_generic_device_add_ip6_link_address
- *
- * Add a default link-local IPv6 address to a device.
- *
- */
-void nm_generic_device_add_ip6_link_address (NMDevice *dev)
-{
-	char *buf;
-	struct ether_addr hw_addr;
-	unsigned char eui[8];
-
-	if (NM_IS_DEVICE_802_3_ETHERNET (dev))
-		nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr);
-	else if (NM_IS_DEVICE_802_11_WIRELESS (dev))
-		nm_device_802_11_wireless_get_address (NM_DEVICE_802_11_WIRELESS (dev), &hw_addr);
-
-	memcpy (eui, &(hw_addr.ether_addr_octet), sizeof (hw_addr.ether_addr_octet));
-	memmove(eui+5, eui+3, 3);
-	eui[3] = 0xff;
-	eui[4] = 0xfe;
-	eui[0] ^= 2;
-
-	/* Add the default link-local IPv6 address to a device */
-	buf = g_strdup_printf (IP_BINARY_PATH" -6 addr add fe80::%x%02x:%x%02x:%x%02x:%x%02x/64 dev %s",
-			 eui[0], eui[1], eui[2], eui[3],
-			 eui[4], eui[5],
-			 eui[6], eui[7], nm_device_get_iface (dev));
-	nm_spawn_process (buf);
-	g_free (buf);
-}
-
 /*
  * nm_generic_set_ip4_config_from_resolv_conf
  *

Modified: trunk/src/backends/NetworkManagerGeneric.h
==============================================================================
--- trunk/src/backends/NetworkManagerGeneric.h	(original)
+++ trunk/src/backends/NetworkManagerGeneric.h	Tue Apr 15 22:01:47 2008
@@ -52,7 +52,6 @@
 void			nm_generic_kill_all_dhcp_daemons			(void);
 void			nm_generic_update_dns					(void);
 void			nm_generic_restart_mdns_responder			(void);
-void			nm_generic_device_add_ip6_link_address 		(NMDevice *dev);
 
 void			nm_generic_set_ip4_config_from_resolv_conf (const char *filename, NMIP4Config *ip4_config);
 void *		nm_generic_device_get_system_config			(NMDevice *dev);

Modified: trunk/src/backends/NetworkManagerGentoo.c
==============================================================================
--- trunk/src/backends/NetworkManagerGentoo.c	(original)
+++ trunk/src/backends/NetworkManagerGentoo.c	Tue Apr 15 22:01:47 2008
@@ -231,18 +231,6 @@
 #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);
-}
-
 /*
  * nm_system_device_replace_default_route
  *

Modified: trunk/src/backends/NetworkManagerMandriva.c
==============================================================================
--- trunk/src/backends/NetworkManagerMandriva.c	(original)
+++ trunk/src/backends/NetworkManagerMandriva.c	Tue Apr 15 22:01:47 2008
@@ -253,18 +253,6 @@
 #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);
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerPaldo.c
==============================================================================
--- trunk/src/backends/NetworkManagerPaldo.c	(original)
+++ trunk/src/backends/NetworkManagerPaldo.c	Tue Apr 15 22:01:47 2008
@@ -216,18 +216,6 @@
 	nm_spawn_process("/etc/init.d/avahi-daemon try-restart");
 }
 
-
-/*
- * 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);
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerRedHat.c
==============================================================================
--- trunk/src/backends/NetworkManagerRedHat.c	(original)
+++ trunk/src/backends/NetworkManagerRedHat.c	Tue Apr 15 22:01:47 2008
@@ -240,18 +240,6 @@
 	}
 }
 
-
-/*
- * 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);
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerSlackware.c
==============================================================================
--- trunk/src/backends/NetworkManagerSlackware.c	(original)
+++ trunk/src/backends/NetworkManagerSlackware.c	Tue Apr 15 22:01:47 2008
@@ -158,18 +158,6 @@
 {
 }
 
-
-/*
- * 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);
-}
-
 /*
  * nm_system_device_add_route_via_device_with_iface
  *

Modified: trunk/src/backends/NetworkManagerSuSE.c
==============================================================================
--- trunk/src/backends/NetworkManagerSuSE.c	(original)
+++ trunk/src/backends/NetworkManagerSuSE.c	Tue Apr 15 22:01:47 2008
@@ -237,18 +237,6 @@
 	fclose (fp);
 }
 
-
-/*
- * 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);
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/nm-device.c
==============================================================================
--- trunk/src/nm-device.c	(original)
+++ trunk/src/nm-device.c	Tue Apr 15 22:01:47 2008
@@ -1400,7 +1400,6 @@
 	success = nm_system_device_set_from_ip4_config (ip_iface, config, route_to_iface);
 	if (success) {
 		nm_device_update_ip4_address (self);
-		nm_system_device_add_ip6_link_address (self);
 		nm_system_set_hostname (config);
 		nm_system_activate_nis (config);
 	}