colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied two patches from Valentine Sinitsyn <e_val@inbox.ru>

Browse Source 
- Explicitly check for DHCP configuration
- Check if daemons are running before starting them


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1861 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tor Krill
2006-07-04 19:22:49 +00:00
parent 0f4fc657ab
commit 642a1a181d
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2006-07-04 Tor Krill <tor@krill.nu>
Patch from Valentine Sinitsyn <e_val@inbox.ru>
* src/backends/NetworkManagerArch.c: (nm_system_update_dns),
(nm_system_restart_mdns_responder), (ArchReadConfig),
(nm_system_device_get_system_config):
- Explicitly check for DHCP configuration
- Check if daemons are running before starting them
2006-06-25 Dan Williams <dcbw@redhat.com> 2006-06-25 Dan Williams <dcbw@redhat.com>
* libnm-util/dbus-dict-helpers.[ch] * libnm-util/dbus-dict-helpers.[ch]

32
src/backends/NetworkManagerArch.c
View File

@@ -6,6 +6,8 @@
* *
* Updated by Wael Nasreddine <gandalf@siemens-mobiles.org> * Updated by Wael Nasreddine <gandalf@siemens-mobiles.org>
* *
* Updated by Valentine Sinitsyn <e_val@inbox.ru>
*
* Heavily based on NetworkManagerDebian.c by Matthew Garrett <mjg59@srcf.ucam.org> * Heavily based on NetworkManagerDebian.c by Matthew Garrett <mjg59@srcf.ucam.org>
* *
* Heavily based on NetworkManagerRedhat.c by Dan Williams <dcbw@redhat.com> * Heavily based on NetworkManagerRedhat.c by Dan Williams <dcbw@redhat.com>
@@ -35,6 +37,7 @@
#include <signal.h> #include <signal.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>
#include <glib/gfileutils.h>
#include "NetworkManagerSystem.h" #include "NetworkManagerSystem.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-device.h" #include "nm-device.h"
@@ -364,8 +367,11 @@ void nm_system_kill_all_dhcp_daemons (void)
*/ */
void nm_system_update_dns (void) void nm_system_update_dns (void)
{ {
nm_spawn_process ("/etc/rc.d/nscd restart"); /* Check if the daemon was already running - do not start a new instance */
if (g_file_test("/var/run/daemons/nscd", G_FILE_TEST_EXISTS))
{
nm_spawn_process ("/etc/rc.d/nscd restart");
}
} }
@@ -378,7 +384,11 @@ void nm_system_update_dns (void)
*/ */
void nm_system_restart_mdns_responder (void) void nm_system_restart_mdns_responder (void)
{ {
nm_spawn_process ("/etc/rc.d/avahi-daemon restart"); /* 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");
}
} }
@@ -581,6 +591,14 @@ static GHashTable * ArchReadConfig(const char* file, const char* dev)
} }
} }
else
{
/* This interface is probably using DHCP - check this */
if (!g_ascii_strcasecmp(splt[0],"dhcp"))
{
g_hash_table_insert(ifs,g_strdup("dhcp"),g_strdup("true"));
}
}
} }
} }
@@ -666,10 +684,10 @@ void* nm_system_device_get_system_config (NMDevice * dev, NMData *app_data)
g_free(sys_data); g_free(sys_data);
return NULL; return NULL;
} }
val=g_hash_table_lookup(ifh,nm_device_get_iface(dev));
if ((val=g_hash_table_lookup(ifh,nm_device_get_iface(dev)))) if (val && !g_hash_table_lookup(ifh, "dhcp"))
{ {
// We found an IP-nr and thus have a static configuration /* This device does not use DHCP */
sys_data->use_dhcp=FALSE; sys_data->use_dhcp=FALSE;
sys_data->config = nm_ip4_config_new(); sys_data->config = nm_ip4_config_new();
@@ -707,7 +725,7 @@ void* nm_system_device_get_system_config (NMDevice * dev, NMData *app_data)
} }
set_ip4_config_from_resolv_conf (SYSCONFDIR"/resolv.conf", sys_data->config); set_ip4_config_from_resolv_conf (SYSCONFDIR"/resolv.conf", sys_data->config);
#if 1 #if 0
{ {
int j; int j;
nm_debug ("------ Config (%s)", nm_device_get_iface (dev)); nm_debug ("------ Config (%s)", nm_device_get_iface (dev));