diff --git a/ChangeLog b/ChangeLog index 28e3417e8b..7277aa22e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-04-15 Dan Williams + + Patch from Benoit Boissinot + + * src/NetworkManagerSystem.h + src/backends/NetworkManagerArch.c + src/backends/NetworkManagerDebian.c + src/backends/NetworkManagerFrugalware.c + src/backends/NetworkManagerGeneric.c + src/backends/NetworkManagerGeneric.h + src/backends/NetworkManagerGentoo.c + src/backends/NetworkManagerMandriva.c + src/backends/NetworkManagerPaldo.c + src/backends/NetworkManagerRedHat.c + src/backends/NetworkManagerSlackware.c + src/backends/NetworkManagerSuSE.c + src/nm-device.c + - (nm_generic_device_add_ip6_link_address, + nm_system_device_add_ip6_link_address): remove + 2008-04-15 Dan Williams Patch from Benoit Boissinot diff --git a/src/NetworkManagerSystem.h b/src/NetworkManagerSystem.h index 1c569eb52c..1a64ccbf33 100644 --- a/src/NetworkManagerSystem.h +++ b/src/NetworkManagerSystem.h @@ -53,7 +53,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); -void nm_system_device_add_ip6_link_address (NMDevice *dev); gboolean nm_system_device_set_from_ip4_config (const char *iface, NMIP4Config *config, diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c index 95d9368025..d16252983b 100644 --- a/src/backends/NetworkManagerArch.c +++ b/src/backends/NetworkManagerArch.c @@ -331,18 +331,6 @@ void nm_system_restart_mdns_responder (void) } } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_activate_nis * diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c index 70b0824d8b..91c3d27a59 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -202,18 +202,6 @@ void nm_system_restart_mdns_responder (void) nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder"); } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_activate_nis * diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c index 76dc755d28..58c1451401 100644 --- a/src/backends/NetworkManagerFrugalware.c +++ b/src/backends/NetworkManagerFrugalware.c @@ -178,38 +178,6 @@ void nm_system_restart_mdns_responder (void) } } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - char *buf; - struct ether_addr hw_addr; - unsigned char eui[8]; - - if (NM_IS_DEVICE_802_3_ETHERNET (dev)) - nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr); - else if (NM_IS_DEVICE_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 ("/usr/sbin/ip -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_system_device_add_route_via_device_with_iface * diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c index 141344006f..f8d7fc7bc9 100644 --- a/src/backends/NetworkManagerGeneric.c +++ b/src/backends/NetworkManagerGeneric.c @@ -238,39 +238,6 @@ void nm_generic_restart_mdns_responder (void) { } - -/* - * nm_generic_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_generic_device_add_ip6_link_address (NMDevice *dev) -{ - char *buf; - struct ether_addr hw_addr; - unsigned char eui[8]; - - if (NM_IS_DEVICE_802_3_ETHERNET (dev)) - nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr); - else if (NM_IS_DEVICE_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_set_ip4_config_from_resolv_conf * diff --git a/src/backends/NetworkManagerGeneric.h b/src/backends/NetworkManagerGeneric.h index c44fb4273d..a04a30990f 100644 --- a/src/backends/NetworkManagerGeneric.h +++ b/src/backends/NetworkManagerGeneric.h @@ -52,7 +52,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_device_add_ip6_link_address (NMDevice *dev); void nm_generic_set_ip4_config_from_resolv_conf (const char *filename, NMIP4Config *ip4_config); void * nm_generic_device_get_system_config (NMDevice *dev); diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c index 03af181758..253fda6e1b 100644 --- a/src/backends/NetworkManagerGentoo.c +++ b/src/backends/NetworkManagerGentoo.c @@ -231,18 +231,6 @@ void nm_system_restart_mdns_responder (void) #endif } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_device_replace_default_route * diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c index 266e9779f4..a9a6ff32a0 100644 --- a/src/backends/NetworkManagerMandriva.c +++ b/src/backends/NetworkManagerMandriva.c @@ -253,18 +253,6 @@ void nm_system_restart_mdns_responder (void) #endif } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_activate_nis * diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c index ae466b2c3c..80a79953a8 100644 --- a/src/backends/NetworkManagerPaldo.c +++ b/src/backends/NetworkManagerPaldo.c @@ -216,18 +216,6 @@ void nm_system_restart_mdns_responder (void) nm_spawn_process("/etc/init.d/avahi-daemon try-restart"); } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_activate_nis * diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c index b509a602e1..15dcade052 100644 --- a/src/backends/NetworkManagerRedHat.c +++ b/src/backends/NetworkManagerRedHat.c @@ -240,18 +240,6 @@ void nm_system_restart_mdns_responder (void) } } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_activate_nis * diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c index d6224c3aec..d377bdc660 100644 --- a/src/backends/NetworkManagerSlackware.c +++ b/src/backends/NetworkManagerSlackware.c @@ -158,18 +158,6 @@ void nm_system_restart_mdns_responder (void) { } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_device_add_route_via_device_with_iface * diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index db6bfd6afb..a0274c76ae 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -237,18 +237,6 @@ void nm_system_restart_mdns_responder (void) fclose (fp); } - -/* - * nm_system_device_add_ip6_link_address - * - * Add a default link-local IPv6 address to a device. - * - */ -void nm_system_device_add_ip6_link_address (NMDevice *dev) -{ - nm_generic_device_add_ip6_link_address (dev); -} - /* * nm_system_activate_nis * diff --git a/src/nm-device.c b/src/nm-device.c index 39b12c68e4..0a5508c277 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -1400,7 +1400,6 @@ nm_device_set_ip4_config (NMDevice *self, NMIP4Config *config) success = nm_system_device_set_from_ip4_config (ip_iface, config, route_to_iface); if (success) { nm_device_update_ip4_address (self); - nm_system_device_add_ip6_link_address (self); nm_system_set_hostname (config); nm_system_activate_nis (config); }