NetworkManager r3689 - in trunk: . src src/backends

[dcbw svn gnome org]

Author: dcbw
Date: Fri May 23 10:48:47 2008
New Revision: 3689
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3689&view=rev

Log:
2008-05-23  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/NetworkManagerGentoo.c
	  src/backends/NetworkManagerMandriva.c
	  src/backends/NetworkManagerPaldo.c
	  src/backends/NetworkManagerRedHat.c
	  src/backends/NetworkManagerSlackware.c
	  src/backends/NetworkManagerSuSE.c
		- (nm_system_device_has_active_routes, nm_system_flush_loopback_routes,
		   nm_system_flush_arp_cache): remove, unused

	* src/backends/NetworkManagerGeneric.c
	  src/backends/NetworkManagerGeneric.h
		- (nm_generic_device_has_active_routes, nm_generic_flush_loopback_routes,
		   nm_generic_flush_arp_cache): remove, unused



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

Modified: trunk/src/NetworkManagerSystem.h
==============================================================================
--- trunk/src/NetworkManagerSystem.h	(original)
+++ trunk/src/NetworkManagerSystem.h	Fri May 23 10:48:47 2008
@@ -33,7 +33,6 @@
  */
 
 void			nm_system_init (void);
-gboolean		nm_system_device_has_active_routes			(NMDevice *dev);
 
 void			nm_system_device_flush_ip4_routes				(NMDevice *dev);
 void			nm_system_device_flush_ip4_routes_with_iface	(const char *iface);
@@ -48,8 +47,6 @@
 void			nm_system_device_flush_ip4_addresses_with_iface	(const char *iface);
 
 void			nm_system_enable_loopback				(void);
-void			nm_system_flush_loopback_routes			(void);
-void			nm_system_flush_arp_cache				(void);
 void			nm_system_kill_all_dhcp_daemons			(void);
 void			nm_system_update_dns					(void);
 
@@ -72,8 +69,6 @@
 gboolean        nm_system_device_is_up (NMDevice *device);
 gboolean        nm_system_device_is_up_with_iface (const char *iface);
 
-gboolean		nm_system_device_update_resolv_conf		(void *data, int len, const char *domain_name);
-
 void			nm_system_set_hostname (NMIP4Config *config);
 void			nm_system_activate_nis (NMIP4Config *config);
 void			nm_system_shutdown_nis (void);

Modified: trunk/src/backends/NetworkManagerArch.c
==============================================================================
--- trunk/src/backends/NetworkManagerArch.c	(original)
+++ trunk/src/backends/NetworkManagerArch.c	Fri May 23 10:48:47 2008
@@ -211,32 +211,6 @@
 	nm_system_device_set_up_down_with_iface ("lo", TRUE);
 }
 
-
-/*
- * 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
  *

Modified: trunk/src/backends/NetworkManagerDebian.c
==============================================================================
--- trunk/src/backends/NetworkManagerDebian.c	(original)
+++ trunk/src/backends/NetworkManagerDebian.c	Fri May 23 10:48:47 2008
@@ -89,32 +89,6 @@
 	nm_spawn_process ("/sbin/ifup lo");
 }
 
-
-/*
- * 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
  *

Modified: trunk/src/backends/NetworkManagerFrugalware.c
==============================================================================
--- trunk/src/backends/NetworkManagerFrugalware.c	(original)
+++ trunk/src/backends/NetworkManagerFrugalware.c	Fri May 23 10:48:47 2008
@@ -82,19 +82,6 @@
 }
 
 /*
- * 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_enable_loopback
  *
  * Bring up the loopback interface
@@ -131,30 +118,6 @@
 }
 
 /*
- * 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_system_device_flush_ip4_routes_with_iface ("lo");
-}
-
- 
-/*
- * nm_system_flush_arp_cache
- *
- * Flush all entries in the arp cache.
- *
- */
-void nm_system_flush_arp_cache (void)
-{
-	nm_spawn_process ("/usr/sbin/ip neigh flush all");
-}
-
-/*
  * nm_system_activate_nis
  *
  * set up the nis domain and write a yp.conf

Modified: trunk/src/backends/NetworkManagerGeneric.c
==============================================================================
--- trunk/src/backends/NetworkManagerGeneric.c	(original)
+++ trunk/src/backends/NetworkManagerGeneric.c	Fri May 23 10:48:47 2008
@@ -94,32 +94,6 @@
 	nm_spawn_process (IP_BINARY_PATH" addr add 127.0.0.1/8 brd 127.255.255.255 dev lo scope host label lo");
 }
 
-
-/*
- * nm_generic_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_generic_flush_loopback_routes (void)
-{
-	nm_system_device_flush_ip4_routes_with_iface ("lo");
-}
-
-
-/*
- * nm_generic_flush_arp_cache
- *
- * Flush all entries in the arp cache.
- *
- */
-void nm_generic_flush_arp_cache (void)
-{
-	nm_spawn_process (IP_BINARY_PATH" neigh flush all");
-}
-
-
 /*
  * nm_generic_kill_all_dhcp_daemons
  *

Modified: trunk/src/backends/NetworkManagerGeneric.h
==============================================================================
--- trunk/src/backends/NetworkManagerGeneric.h	(original)
+++ trunk/src/backends/NetworkManagerGeneric.h	Fri May 23 10:48:47 2008
@@ -34,7 +34,6 @@
  */
 
 void			nm_generic_init (void);
-gboolean		nm_generic_device_has_active_routes			(NMDevice *dev);
 
 void			nm_generic_device_flush_ip4_routes				(NMDevice *dev);
 void			nm_generic_device_flush_ip4_routes_with_iface	(const char *iface);
@@ -43,8 +42,6 @@
 void			nm_generic_device_flush_ip4_addresses_with_iface	(const char *iface);
 
 void			nm_generic_enable_loopback				(void);
-void			nm_generic_flush_loopback_routes			(void);
-void			nm_generic_flush_arp_cache				(void);
 void			nm_generic_kill_all_dhcp_daemons			(void);
 void			nm_generic_update_dns					(void);
 
@@ -62,8 +59,6 @@
 gboolean		nm_generic_device_set_up_down				(NMDevice *dev, gboolean up);
 gboolean		nm_generic_device_set_up_down_with_iface		(NMDevice *dev, const char *iface, gboolean up);
 
-gboolean		nm_generic_device_update_resolv_conf		(void *data, int len, const char *domain_name);
-
 void			nm_generic_set_hostname (NMIP4Config *config);
 void			nm_generic_activate_nis (NMIP4Config *config);
 void			nm_generic_shutdown_nis (void);

Modified: trunk/src/backends/NetworkManagerGentoo.c
==============================================================================
--- trunk/src/backends/NetworkManagerGentoo.c	(original)
+++ trunk/src/backends/NetworkManagerGentoo.c	Fri May 23 10:48:47 2008
@@ -77,32 +77,6 @@
 }
 
 /*
- * 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)
-{
-        /* TODO */
-	return (FALSE);
-}
-
-
-#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
@@ -115,32 +89,6 @@
 		nm_spawn_process("/etc/init.d/net.lo start");
 }
 
-
-/*
- * 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
  *

Modified: trunk/src/backends/NetworkManagerMandriva.c
==============================================================================
--- trunk/src/backends/NetworkManagerMandriva.c	(original)
+++ trunk/src/backends/NetworkManagerMandriva.c	Fri May 23 10:48:47 2008
@@ -77,31 +77,6 @@
 }
 
 /*
- * 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);
-}
-
-#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
@@ -112,32 +87,6 @@
 	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
  *

Modified: trunk/src/backends/NetworkManagerPaldo.c
==============================================================================
--- trunk/src/backends/NetworkManagerPaldo.c	(original)
+++ trunk/src/backends/NetworkManagerPaldo.c	Fri May 23 10:48:47 2008
@@ -78,18 +78,6 @@
 }
 
 /*
- * 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_enable_loopback
  *
  * Bring up the loopback interface
@@ -100,32 +88,6 @@
 	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
  *

Modified: trunk/src/backends/NetworkManagerRedHat.c
==============================================================================
--- trunk/src/backends/NetworkManagerRedHat.c	(original)
+++ trunk/src/backends/NetworkManagerRedHat.c	Fri May 23 10:48:47 2008
@@ -75,32 +75,6 @@
 }
 
 /*
- * 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);
-}
-
-
-#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
@@ -111,32 +85,6 @@
 	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
  *

Modified: trunk/src/backends/NetworkManagerSlackware.c
==============================================================================
--- trunk/src/backends/NetworkManagerSlackware.c	(original)
+++ trunk/src/backends/NetworkManagerSlackware.c	Fri May 23 10:48:47 2008
@@ -76,19 +76,6 @@
 }
 
 /*
- * 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_enable_loopback
  *
  * Bring up the loopback interface
@@ -125,30 +112,6 @@
 }
 
 /*
- * 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_activate_nis
  *
  * set up the nis domain and write a yp.conf

Modified: trunk/src/backends/NetworkManagerSuSE.c
==============================================================================
--- trunk/src/backends/NetworkManagerSuSE.c	(original)
+++ trunk/src/backends/NetworkManagerSuSE.c	Fri May 23 10:48:47 2008
@@ -84,19 +84,6 @@
 }
 
 /*
- * 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_enable_loopback
  *
  * Bring up the loopback interface
@@ -107,32 +94,6 @@
 	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
  *