diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-03-27 22:10:15 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-03-27 22:41:59 +0200 |
commit | e09f5e3045fc90547be9ec49c63b633d103cfc45 (patch) | |
tree | 5044ae5060fec01909714eaab1da3567993cd222 /networking/udhcp/d6_dhcpc.c | |
parent | 8f3bf4f0d3605b50a8e4c48c89aeabc455f04884 (diff) | |
download | busybox-w32-e09f5e3045fc90547be9ec49c63b633d103cfc45.tar.gz busybox-w32-e09f5e3045fc90547be9ec49c63b633d103cfc45.tar.bz2 busybox-w32-e09f5e3045fc90547be9ec49c63b633d103cfc45.zip |
udhcp6: read_interface should save link-local ipv6 address
Patch is based on work by tiggerswelt.net. They say:
"Using this patch it was no problem to acquire an IPv6-Address via DHCPv6
using ISC DHCPD6 on server-side."
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp/d6_dhcpc.c')
-rw-r--r-- | networking/udhcp/d6_dhcpc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c index bea589d71..95f8939b4 100644 --- a/networking/udhcp/d6_dhcpc.c +++ b/networking/udhcp/d6_dhcpc.c | |||
@@ -311,7 +311,7 @@ static int d6_mcast_from_client_config_ifindex(struct d6_packet *packet, uint8_t | |||
311 | 311 | ||
312 | return d6_send_raw_packet( | 312 | return d6_send_raw_packet( |
313 | packet, (end - (uint8_t*) packet), | 313 | packet, (end - (uint8_t*) packet), |
314 | /*src*/ NULL, CLIENT_PORT6, | 314 | /*src*/ &client6_data.ll_ip6, CLIENT_PORT6, |
315 | /*dst*/ (struct in6_addr*)FF02__1_2, SERVER_PORT6, MAC_BCAST_ADDR, | 315 | /*dst*/ (struct in6_addr*)FF02__1_2, SERVER_PORT6, MAC_BCAST_ADDR, |
316 | client_config.ifindex | 316 | client_config.ifindex |
317 | ); | 317 | ); |
@@ -1003,9 +1003,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1003 | udhcp_str2optset(optstr, &client_config.options); | 1003 | udhcp_str2optset(optstr, &client_config.options); |
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | if (udhcp_read_interface(client_config.interface, | 1006 | if (d6_read_interface(client_config.interface, |
1007 | &client_config.ifindex, | 1007 | &client_config.ifindex, |
1008 | NULL, | 1008 | &client6_data.ll_ip6, |
1009 | client_config.client_mac) | 1009 | client_config.client_mac) |
1010 | ) { | 1010 | ) { |
1011 | return 1; | 1011 | return 1; |
@@ -1106,13 +1106,14 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv) | |||
1106 | * or if the status of the bridge changed). | 1106 | * or if the status of the bridge changed). |
1107 | * Refresh ifindex and client_mac: | 1107 | * Refresh ifindex and client_mac: |
1108 | */ | 1108 | */ |
1109 | if (udhcp_read_interface(client_config.interface, | 1109 | if (d6_read_interface(client_config.interface, |
1110 | &client_config.ifindex, | 1110 | &client_config.ifindex, |
1111 | NULL, | 1111 | &client6_data.ll_ip6, |
1112 | client_config.client_mac) | 1112 | client_config.client_mac) |
1113 | ) { | 1113 | ) { |
1114 | goto ret0; /* iface is gone? */ | 1114 | goto ret0; /* iface is gone? */ |
1115 | } | 1115 | } |
1116 | |||
1116 | memcpy(clientid_mac_ptr, client_config.client_mac, 6); | 1117 | memcpy(clientid_mac_ptr, client_config.client_mac, 6); |
1117 | 1118 | ||
1118 | /* We will restart the wait in any case */ | 1119 | /* We will restart the wait in any case */ |