2008-03-11 Dan Williams <dcbw@redhat.com>

	Fix address handling as a result of DHCP rebind/renew/reboot.

	* src/NetworkManagerSystem.c
		- (check_one_address): delete an address if it doesn't match a given
			one for the same interface
		- (nm_system_device_set_from_ip4_config): don't flush the default route,
			be smarter about flushing addresses (only flush ones that don't
			match the one we're about to apply)

	* src/backends/NetworkManagerDebian.c
	  src/backends/NetworkManagerSuSE.c
	  src/backends/NetworkManagerArch.c
	  src/backends/NetworkManagerSlackware.c
	  src/backends/NetworkManagerRedHat.c
	  src/backends/NetworkManagerPaldo.c
	  src/backends/NetworkManagerFrugalware.c
	  src/backends/NetworkManagerGentoo.c
		- (nm_system_delete_default_route): remove

	* src/backends/NetworkManagerGeneric.c
	  src/backends/NetworkManagerGeneric.h
		- (nm_generic_enable_loopback): fix the loopback device label
		- (nm_generic_delete_default_route): remove; no longer used



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

10 files changed, 1 insertions, 109 deletions

diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c
index e8550f59df..92027809f9 100644
--- a/src/backends/NetworkManagerArch.c
+++ b/src/backends/NetworkManagerArch.c
@@ -272,18 +272,6 @@ void nm_system_flush_loopback_routes (void)
 
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_generic_delete_default_route ();
-}
-
-
-/*
  * nm_system_flush_arp_cache
  *
  * Flush all entries in the arp cache.
diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
index a9acbe8cfe..8eb33553f8 100644
--- a/src/backends/NetworkManagerDebian.c
+++ b/src/backends/NetworkManagerDebian.c
@@ -150,18 +150,6 @@ void nm_system_flush_loopback_routes (void)
 
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_generic_delete_default_route ();
-}
-
-
-/*
  * nm_system_flush_arp_cache
  *
  * Flush all entries in the arp cache.
diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c
index 78d245690a..9342eacc37 100644
--- a/src/backends/NetworkManagerFrugalware.c
+++ b/src/backends/NetworkManagerFrugalware.c
@@ -142,18 +142,6 @@ void nm_system_enable_loopback (void)
 
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_spawn_process ("/usr/sbin/ip route del default");
-}
-
-
-/*
  * nm_system_kill_all_dhcp_daemons
  *
  * Kill all DHCP daemons currently running, done at startup.
diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c
index 50dd60f038..9d0d7fc265 100644
--- a/src/backends/NetworkManagerGeneric.c
+++ b/src/backends/NetworkManagerGeneric.c
@@ -173,7 +173,7 @@ void nm_generic_device_flush_addresses_with_iface (const char *iface)
 void nm_generic_enable_loopback (void)
 {
 	nm_spawn_process (IP_BINARY_PATH" link set dev lo up");
-	nm_spawn_process (IP_BINARY_PATH" addr add 127.0.0.1/8 brd 127.255.255.255 dev lo scope host label loopback");
+	nm_spawn_process (IP_BINARY_PATH" addr add 127.0.0.1/8 brd 127.255.255.255 dev lo scope host label lo");
 }
 
 
@@ -191,18 +191,6 @@ void nm_generic_flush_loopback_routes (void)
 
 
 /*
- * nm_generic_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_generic_delete_default_route (void)
-{
-	nm_spawn_process (IP_BINARY_PATH" route del default");
-}
-
-
-/*
  * nm_generic_flush_arp_cache
  *
  * Flush all entries in the arp cache.
diff --git a/src/backends/NetworkManagerGeneric.h b/src/backends/NetworkManagerGeneric.h
index f69b08c673..14c89d02ff 100644
--- a/src/backends/NetworkManagerGeneric.h
+++ b/src/backends/NetworkManagerGeneric.h
@@ -48,7 +48,6 @@ void			nm_generic_device_flush_addresses_with_iface	(const char *iface);
 
 void			nm_generic_enable_loopback				(void);
 void			nm_generic_flush_loopback_routes			(void);
-void			nm_generic_delete_default_route			(void);
 void			nm_generic_flush_arp_cache				(void);
 void			nm_generic_kill_all_dhcp_daemons			(void);
 void			nm_generic_update_dns					(void);
diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c
index 944bb8c575..23124add85 100644
--- a/src/backends/NetworkManagerGentoo.c
+++ b/src/backends/NetworkManagerGentoo.c
@@ -161,17 +161,6 @@ void nm_system_flush_loopback_routes (void)
 }
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_generic_delete_default_route ();
-}
-
-/*
  * nm_system_flush_arp_cache
  *
  * Flush all entries in the arp cache.
diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c
index 9e457df449..f2507882cf 100644
--- a/src/backends/NetworkManagerPaldo.c
+++ b/src/backends/NetworkManagerPaldo.c
@@ -165,18 +165,6 @@ void nm_system_flush_loopback_routes (void)
 
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_generic_delete_default_route ();
-}
-
-
-/*
  * nm_system_flush_arp_cache
  *
  * Flush all entries in the arp cache.
diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c
index 7e3ce249da..ab4ce22204 100644
--- a/src/backends/NetworkManagerRedHat.c
+++ b/src/backends/NetworkManagerRedHat.c
@@ -175,18 +175,6 @@ void nm_system_flush_loopback_routes (void)
 
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_generic_delete_default_route ();
-}
-
-
-/*
  * nm_system_flush_arp_cache
  *
  * Flush all entries in the arp cache.
diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c
index 599534d6f4..18229ae120 100644
--- a/src/backends/NetworkManagerSlackware.c
+++ b/src/backends/NetworkManagerSlackware.c
@@ -149,18 +149,6 @@ void nm_system_enable_loopback (void)
 
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_generic_delete_default_route ();
-}
-
-
-/*
  * nm_system_kill_all_dhcp_daemons
  *
  * Kill all DHCP daemons currently running, done at startup.
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
index eeefb66c7c..5fb0fd78ab 100644
--- a/src/backends/NetworkManagerSuSE.c
+++ b/src/backends/NetworkManagerSuSE.c
@@ -169,18 +169,6 @@ void nm_system_flush_loopback_routes (void)
 
 
 /*
- * nm_system_delete_default_route
- *
- * Remove the old default route in preparation for a new one
- *
- */
-void nm_system_delete_default_route (void)
-{
-	nm_generic_delete_default_route ();
-}
-
-
-/*
  * nm_system_flush_arp_cache
  *
  * Flush all entries in the arp cache.