mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
2008-04-15 Dan Williams <dcbw@redhat.com>
Patch from Benoit Boissinot <bboissin+networkmanager@gmail.com> * 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 git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3564 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
1c885c6aa1
commit
a993d446d5
20
ChangeLog
20
ChangeLog
|
@ -1,3 +1,23 @@
|
|||
2008-04-15 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
Patch from Benoit Boissinot <bboissin+networkmanager@gmail.com>
|
||||
|
||||
* 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 <dcbw@redhat.com>
|
||||
|
||||
Patch from Benoit Boissinot <bboissin+networkmanager@gmail.com>
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue