summaryrefslogtreecommitdiff
path: root/networking/udhcp/d6_dhcpc.c
diff options
context:
space:
mode:
authorDenys Vlasenko2017-03-27 22:10:15 +0200
committerDenys Vlasenko2017-03-27 22:41:59 +0200
commite09f5e3045fc90547be9ec49c63b633d103cfc45 (patch)
tree5044ae5060fec01909714eaab1da3567993cd222 /networking/udhcp/d6_dhcpc.c
parent8f3bf4f0d3605b50a8e4c48c89aeabc455f04884 (diff)
downloadbusybox-e09f5e3045fc90547be9ec49c63b633d103cfc45.zip
busybox-e09f5e3045fc90547be9ec49c63b633d103cfc45.tar.gz
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.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index bea589d..95f8939 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
return d6_send_raw_packet(
packet, (end - (uint8_t*) packet),
- /*src*/ NULL, CLIENT_PORT6,
+ /*src*/ &client6_data.ll_ip6, CLIENT_PORT6,
/*dst*/ (struct in6_addr*)FF02__1_2, SERVER_PORT6, MAC_BCAST_ADDR,
client_config.ifindex
);
@@ -1003,9 +1003,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
udhcp_str2optset(optstr, &client_config.options);
}
- if (udhcp_read_interface(client_config.interface,
+ if (d6_read_interface(client_config.interface,
&client_config.ifindex,
- NULL,
+ &client6_data.ll_ip6,
client_config.client_mac)
) {
return 1;
@@ -1106,13 +1106,14 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
* or if the status of the bridge changed).
* Refresh ifindex and client_mac:
*/
- if (udhcp_read_interface(client_config.interface,
+ if (d6_read_interface(client_config.interface,
&client_config.ifindex,
- NULL,
+ &client6_data.ll_ip6,
client_config.client_mac)
) {
goto ret0; /* iface is gone? */
}
+
memcpy(clientid_mac_ptr, client_config.client_mac, 6);
/* We will restart the wait in any case */