NetworkManager r3684 - in trunk: . src src/backends

[dcbw svn gnome org]

Author: dcbw
Date: Thu May 22 17:22:53 2008
New Revision: 3684
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3684&view=rev

Log:
2008-05-22  Dan Williams  <dcbw redhat com>

	Remove anything mDNS related.  This is better done from a distro-specific
	dispatcher script.  Plus, any distro using avahi doesn't need to restart
	avahi, since avahi can handle interface changes just fine using netlink.

	* configure.in
		- Remove --with-mdns-provider

	* src/NetworkManagerPolicy.c
		- (global_state_changed): don't restart the mdns provider

	* 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_restart_mdns_responder): remove

	* src/backends/NetworkManagerGeneric.c
	  src/backends/NetworkManagerGeneric.h
		- (nm_generic_restart_mdns_responder): remove



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/NetworkManagerPolicy.c
   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/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu May 22 17:22:53 2008
@@ -115,26 +115,6 @@
 AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
 AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
 
-if test x"$with_distro" = xgentoo -o x"$with_distro" = xmandriva ; then
-	AC_ARG_WITH([mdns_provider],
-		    AS_HELP_STRING([--with-mdns-provider=PROVIDER], [Specify the mDNS implementation: Avahi, Bonjour]),,
-		    [with_mdns_provider=avahi])
-
-	with_mdns_provider=`echo ${with_mdns_provider} | tr '[[:upper:]]' '[[:lower:]]'`
-
-	case $with_mdns_provider in
-		avahi)
-			AC_DEFINE([MDNS_PROVIDER_AVAHI], [], [Use avahi for mDNS provider])
-		;;
-		bonjour)
-			AC_DEFINE([MDNS_PROVIDER_BONJOUR], [], [Use Bonjour mDNSResponderPosix for mDNS provider])
-		;;
-		*)
-			AC_MSG_ERROR([invalid mdns implementation specified ($with_mdns_provider)])
-		;;
-	esac
-fi
-
 AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
 AC_TRY_COMPILE([#ifndef __user
                 #define __user

Modified: trunk/src/NetworkManagerPolicy.c
==============================================================================
--- trunk/src/NetworkManagerPolicy.c	(original)
+++ trunk/src/NetworkManagerPolicy.c	Thu May 22 17:22:53 2008
@@ -284,8 +284,6 @@
 static void
 global_state_changed (NMManager *manager, NMState state, gpointer user_data)
 {
-	if (state == NM_STATE_CONNECTED)
-		nm_system_restart_mdns_responder ();
 }
 
 static void

Modified: trunk/src/NetworkManagerSystem.h
==============================================================================
--- trunk/src/NetworkManagerSystem.h	(original)
+++ trunk/src/NetworkManagerSystem.h	Thu May 22 17:22:53 2008
@@ -52,7 +52,6 @@
 void			nm_system_flush_arp_cache				(void);
 void			nm_system_kill_all_dhcp_daemons			(void);
 void			nm_system_update_dns					(void);
-void			nm_system_restart_mdns_responder			(void);
 
 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	Thu May 22 17:22:53 2008
@@ -288,23 +288,6 @@
 	}
 }
 
-
-/*
- * 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)
-{
-	/* Check if the daemon was already running - do not start a new instance */
-	if (g_file_test("/var/run/daemons/avahi-daemon", G_FILE_TEST_EXISTS))
-	{
-		nm_spawn_process ("/etc/rc.d/avahi-daemon restart");
-	}	
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerDebian.c
==============================================================================
--- trunk/src/backends/NetworkManagerDebian.c	(original)
+++ trunk/src/backends/NetworkManagerDebian.c	Thu May 22 17:22:53 2008
@@ -163,19 +163,6 @@
 
 }
 
-
-/*
- * 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)
-{
-	nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerFrugalware.c
==============================================================================
--- trunk/src/backends/NetworkManagerFrugalware.c	(original)
+++ trunk/src/backends/NetworkManagerFrugalware.c	Thu May 22 17:22:53 2008
@@ -163,22 +163,6 @@
 }
 
 /*
- * 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)
-{
-	/* Check if the daemon was already running - do not start a new instance */
-	if (g_file_test("/var/run/avahi-daemon/pid", G_FILE_TEST_EXISTS))
-	{
-		nm_spawn_process ("/etc/rc.d/rc.avahi-daemon restart");
-	}
-}
-
-/*
  * nm_system_flush_loopback_routes
  *
  * Flush all routes associated with the loopback device, because it

Modified: trunk/src/backends/NetworkManagerGeneric.c
==============================================================================
--- trunk/src/backends/NetworkManagerGeneric.c	(original)
+++ trunk/src/backends/NetworkManagerGeneric.c	Thu May 22 17:22:53 2008
@@ -174,18 +174,6 @@
 {
 }
 
-
-/*
- * nm_generic_restart_mdns_responder
- *
- * Restart the multicast DNS responder so that it knows about new
- * network interfaces and IP addresses.
- *
- */
-void nm_generic_restart_mdns_responder (void)
-{
-}
-
 /*
  * 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	Thu May 22 17:22:53 2008
@@ -47,7 +47,6 @@
 void			nm_generic_flush_arp_cache				(void);
 void			nm_generic_kill_all_dhcp_daemons			(void);
 void			nm_generic_update_dns					(void);
-void			nm_generic_restart_mdns_responder			(void);
 
 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	Thu May 22 17:22:53 2008
@@ -193,33 +193,6 @@
 }
 
 /*
- * 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_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_activate_nis
  *
  * set up the nis domain and write a yp.conf

Modified: trunk/src/backends/NetworkManagerMandriva.c
==============================================================================
--- trunk/src/backends/NetworkManagerMandriva.c	(original)
+++ trunk/src/backends/NetworkManagerMandriva.c	Thu May 22 17:22:53 2008
@@ -189,42 +189,6 @@
 	}
 }
 
-
-/*
- * 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_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerPaldo.c
==============================================================================
--- trunk/src/backends/NetworkManagerPaldo.c	(original)
+++ trunk/src/backends/NetworkManagerPaldo.c	Thu May 22 17:22:53 2008
@@ -175,19 +175,6 @@
 	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)
-{
-	nm_spawn_process("/etc/init.d/avahi-daemon try-restart");
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerRedHat.c
==============================================================================
--- trunk/src/backends/NetworkManagerRedHat.c	(original)
+++ trunk/src/backends/NetworkManagerRedHat.c	Thu May 22 17:22:53 2008
@@ -187,31 +187,6 @@
 	}
 }
 
-
-/*
- * 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)
-{
-	FILE 		*fp  = NULL;
-
-	if ((fp = fopen ("/var/run/mDNSResponder.pid", "rt")))
-	{
-		int pid;
-		int res = fscanf (fp, "%d", &pid);
-		fclose (fp);
-		if (res == 1)
-		{
-			nm_info ("Restarting mDNSResponder.");
-			kill (pid, SIGUSR1);
-		}
-	}
-}
-
 /*
  * nm_system_activate_nis
  *

Modified: trunk/src/backends/NetworkManagerSlackware.c
==============================================================================
--- trunk/src/backends/NetworkManagerSlackware.c	(original)
+++ trunk/src/backends/NetworkManagerSlackware.c	Thu May 22 17:22:53 2008
@@ -148,17 +148,6 @@
 }
 
 /*
- * 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)
-{
-}
-
-/*
  * nm_system_flush_loopback_routes
  *
  * Flush all routes associated with the loopback device, because it

Modified: trunk/src/backends/NetworkManagerSuSE.c
==============================================================================
--- trunk/src/backends/NetworkManagerSuSE.c	(original)
+++ trunk/src/backends/NetworkManagerSuSE.c	Thu May 22 17:22:53 2008
@@ -181,34 +181,6 @@
 	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)
-{
-	pid_t pid;
-	FILE *fp;
-	int res;
-
-	fp = fopen ("/var/run/mdnsd.pid", "rt");
-	if (!fp)
-		return;
-
-	res = fscanf (fp, "%d", &pid);
-	if (res == 1)
-	{
-		nm_info ("Restarting mdnsd (pid=%d).", pid);
-		kill (pid, SIGUSR1);
-	}
-
-	fclose (fp);
-}
-
 /*
  * nm_system_activate_nis
  *