system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-05-22 Dan Williams <dcbw@redhat.com>

Browse source 
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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3684 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-05-22 17:22:53 +00:00
parent 590610941e
commit 6cc399d126
15 changed files with 28 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ChangeLog
View file

@ -1,3 +1,31 @@
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
2008-05-22 Dan Williams <dcbw@redhat.com>
* configure.in

20
configure.in
View file

@ -115,26 +115,6 @@ AM_CONDITIONAL(TARGET_PALDO, test x"$with_distro" = xpaldo)
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

2
src/NetworkManagerPolicy.c
View file

@ -284,8 +284,6 @@ auto_activate_device (gpointer user_data)
static void
global_state_changed (NMManager *manager, NMState state, gpointer user_data)
{
if (state == NM_STATE_CONNECTED)
nm_system_restart_mdns_responder ();
}
static void

1
src/NetworkManagerSystem.h
View file

@ -52,7 +52,6 @@ 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);
void nm_system_restart_mdns_responder (void);
gboolean nm_system_device_set_from_ip4_config (const char *iface,
NMIP4Config *config,

17
src/backends/NetworkManagerArch.c
View file

@ -288,23 +288,6 @@ void nm_system_update_dns (void)
}
}
/*
* 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
*

13
src/backends/NetworkManagerDebian.c
View file

@ -163,19 +163,6 @@ void nm_system_update_dns (void)
}
/*
* 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
*

16
src/backends/NetworkManagerFrugalware.c
View file

@ -162,22 +162,6 @@ void nm_system_update_dns (void)
/* I'm not running nscd */
}
/*
* 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
*

12
src/backends/NetworkManagerGeneric.c
View file

@ -174,18 +174,6 @@ void nm_generic_update_dns (void)
{
}
/*
* 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
*

1
src/backends/NetworkManagerGeneric.h
View file

@ -47,7 +47,6 @@ 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);
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);

27
src/backends/NetworkManagerGentoo.c
View file

@ -192,33 +192,6 @@ void nm_system_update_dns (void)
#endif
}
/*
* 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
*

36
src/backends/NetworkManagerMandriva.c
View file

@ -189,42 +189,6 @@ void nm_system_update_dns (void)
}
}
/*
* 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
*

13
src/backends/NetworkManagerPaldo.c
View file

@ -175,19 +175,6 @@ void nm_system_update_dns (void)
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
*

25
src/backends/NetworkManagerRedHat.c
View file

@ -187,31 +187,6 @@ void nm_system_update_dns (void)
}
}
/*
* 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
*

11
src/backends/NetworkManagerSlackware.c
View file

@ -147,17 +147,6 @@ void nm_system_update_dns (void)
/* I'm not running nscd */
}
/*
* 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
*

28
src/backends/NetworkManagerSuSE.c
View file

@ -181,34 +181,6 @@ void nm_system_update_dns (void)
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
*