2006-07-24 Dan Williams <dcbw@redhat.com>

Patch from Timothée Lecomte <timothee.lecomte@ens.fr>
	* src/backends/Makefile.am
	  src/backends/NetworkManagerArch.c
	  src/backends/NetworkManagerDebian.c
	  src/backends/NetworkManagerGeneric.c
	  src/backends/NetworkManagerGeneric.h
	  src/backends/NetworkManagerGentoo.c
	  src/backends/NetworkManagerPaldo.c
	  src/backends/NetworkManagerRedHat.c
	  src/backends/NetworkManagerSlackware.c
	  src/backends/NetworkManagerSuSE.c
		- Genericize common backend functions


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1894 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2006-07-24 05:49:14 +00:00
parent 0899079c0c
commit c1a97b29b4
11 changed files with 703 additions and 861 deletions

View File

@@ -27,6 +27,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <signal.h>
#include "NetworkManagerGeneric.h"
#include "NetworkManagerSystem.h"
#include "NetworkManagerUtils.h"
#include "nm-device.h"
@@ -46,7 +47,7 @@
*/
void nm_system_init (void)
{
nm_system_kill_all_dhcp_daemons();
nm_generic_init ();
}
/*
@@ -57,13 +58,7 @@ void nm_system_init (void)
*/
void nm_system_device_flush_routes (NMDevice *dev)
{
g_return_if_fail (dev != NULL);
/* Not really applicable for test devices */
if (nm_device_is_test_device (dev))
return;
nm_system_device_flush_routes_with_iface (nm_device_get_iface (dev));
nm_generic_device_flush_routes (dev);
}
/*
@@ -74,14 +69,7 @@ void nm_system_device_flush_routes (NMDevice *dev)
*/
void nm_system_device_flush_routes_with_iface (const char *iface)
{
char *buf;
g_return_if_fail (iface != NULL);
/* Remove routing table entries */
buf = g_strdup_printf (IP_BINARY_PATH " route flush dev %s", iface);
nm_spawn_process (buf);
g_free (buf);
nm_generic_device_flush_routes_with_iface (iface);
}
@@ -93,13 +81,7 @@ void nm_system_device_flush_routes_with_iface (const char *iface)
*/
void nm_system_device_flush_addresses (NMDevice *dev)
{
g_return_if_fail (dev != NULL);
/* Not really applicable for test devices */
if (nm_device_is_test_device (dev))
return;
nm_system_device_flush_addresses_with_iface (nm_device_get_iface (dev));
nm_generic_device_flush_addresses (dev);
}
/*
@@ -110,14 +92,7 @@ void nm_system_device_flush_addresses (NMDevice *dev)
*/
void nm_system_device_flush_addresses_with_iface (const char *iface)
{
char *buf;
g_return_if_fail (iface != NULL);
/* Remove all IP addresses for a device */
buf = g_strdup_printf (IP_BINARY_PATH " addr flush dev %s", iface);
nm_spawn_process (buf);
g_free (buf);
nm_generic_device_flush_addresses_with_iface (iface);
}
/*
@@ -169,8 +144,7 @@ gboolean nm_system_device_has_active_routes (NMDevice *dev)
*/
void nm_system_enable_loopback (void)
{
nm_system_device_set_up_down_with_iface ("lo", TRUE);
nm_spawn_process (IP_BINARY_PATH " addr add 127.0.0.1/8 brd 127.255.255.255 dev lo label loopback");
nm_generic_enable_loopback ();
}
@@ -182,7 +156,7 @@ void nm_system_enable_loopback (void)
*/
void nm_system_delete_default_route (void)
{
nm_spawn_process (IP_BINARY_PATH " route del default");
nm_generic_delete_default_route ();
}
@@ -230,27 +204,7 @@ void nm_system_restart_mdns_responder (void)
*/
void nm_system_device_add_ip6_link_address (NMDevice *dev)
{
char *buf;
struct ether_addr hw_addr;
unsigned char eui[8];
if (nm_device_is_802_3_ethernet (dev))
nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr);
else if (nm_device_is_802_11_wireless (dev))
nm_device_802_11_wireless_get_address (NM_DEVICE_802_11_WIRELESS (dev), &hw_addr);
memcpy (eui, &(hw_addr.ether_addr_octet), sizeof (hw_addr.ether_addr_octet));
memmove (eui+5, eui+3, 3);
eui[3] = 0xff;
eui[4] = 0xfe;
eui[0] ^= 2;
/* Add the default link-local IPv6 address to a device */
buf = g_strdup_printf (IP_BINARY_PATH " -6 addr add fe80::%x%02x:%x%02x:%x%02x:%x%02x/64 dev %s",
eui[0], eui[1], eui[2], eui[3], eui[4], eui[5],
eui[6], eui[7], nm_device_get_iface (dev));
nm_spawn_process (buf);
g_free (buf);
nm_generic_device_add_ip6_link_address (dev);
}
/*
@@ -261,14 +215,7 @@ void nm_system_device_add_ip6_link_address (NMDevice *dev)
*/
void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route)
{
char *buf;
g_return_if_fail (iface != NULL);
/* Add default gateway */
buf = g_strdup_printf (IP_BINARY_PATH " route add %s dev %s", route, iface);
nm_spawn_process (buf);
g_free (buf);
nm_generic_device_add_route_via_device_with_iface (iface, route);
}
/*
@@ -279,13 +226,7 @@ void nm_system_device_add_route_via_device_with_iface (const char *iface, const
*/
void nm_system_device_add_default_route_via_device (NMDevice *dev)
{
g_return_if_fail (dev != NULL);
/* Not really applicable for test devices */
if (nm_device_is_test_device (dev))
return;
nm_system_device_add_default_route_via_device_with_iface (nm_device_get_iface (dev));
nm_generic_device_add_default_route_via_device (dev);
}
/*
@@ -296,14 +237,7 @@ void nm_system_device_add_default_route_via_device (NMDevice *dev)
*/
void nm_system_device_add_default_route_via_device_with_iface (const char *iface)
{
char *buf;
g_return_if_fail (iface != NULL);
/* Add default gateway */
buf = g_strdup_printf (IP_BINARY_PATH " route add default dev %s", iface);
nm_spawn_process (buf);
g_free (buf);
nm_generic_device_add_default_route_via_device_with_iface (iface);
}
@@ -316,7 +250,7 @@ void nm_system_device_add_default_route_via_device_with_iface (const char *iface
*/
void nm_system_flush_loopback_routes (void)
{
nm_system_device_flush_routes_with_iface ("lo");
nm_generic_flush_loopback_routes ();
}
@@ -328,7 +262,7 @@ void nm_system_flush_loopback_routes (void)
*/
void nm_system_flush_arp_cache (void)
{
nm_spawn_process (IP_BINARY_PATH " neigh flush all");
nm_generic_flush_arp_cache ();
}
void nm_system_deactivate_all_dialup (GSList *list)