From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 16 Jan 2018 15:00:13 +0000 (+0100)
Subject: udhcpc6: fix ipv6prefix[_lease] envvar value in script invocation
X-Git-Tag: 1_29_0~359
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=688cb3bc1979bad4236315517a7c7bb3a51289f1;p=oweals%2Fbusybox.git

udhcpc6: fix ipv6prefix[_lease] envvar value in script invocation

Based on a patch by DannyAAM <danny@saru.moe>.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 37ffd064d..65ff5deab 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -277,11 +277,11 @@ static void option_to_env(uint8_t *option, uint8_t *option_end)
  * |               |
  * +-+-+-+-+-+-+-+-+
  */
-			//move_from_unaligned32(v32, option + 4 + 4);
-			//*new_env() = xasprintf("lease=%u", (unsigned)v32);
+			move_from_unaligned32(v32, option + 4 + 4);
+			*new_env() = xasprintf("ipv6prefix_lease=%u", (unsigned)v32);
 
-			sprint_nip6(ipv6str, option + 4 + 4 + 1);
-			*new_env() = xasprintf("ipv6prefix=%s/%u", ipv6str, (unsigned)(option[4 + 4]));
+			sprint_nip6(ipv6str, option + 4 + 4 + 4 + 1);
+			*new_env() = xasprintf("ipv6prefix=%s/%u", ipv6str, (unsigned)(option[4 + 4 + 4]));
 			break;
 #if ENABLE_FEATURE_UDHCPC6_RFC3646
 		case D6_OPT_DNS_SERVERS: {