From: Steven Barth Date: Thu, 1 Aug 2013 07:28:27 +0000 (+0200) Subject: Fix including PD in request X-Git-Tag: debian/1.1+git20160131-1~136 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7a0a5a7a6378b958f1dde4841504401d9bc0273c;p=odhcp6c.git Fix including PD in request --- diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 9742c39..3f5bc83 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -567,6 +567,13 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, struct dhcpv6_server_cand cand = {false, false, 0, 0, {0}, NULL, NULL, 0, 0}; dhcpv6_for_each_option(opt, end, otype, olen, odata) { + if (orig == DHCPV6_MSG_SOLICIT && + (otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA) && + olen > sizeof(struct dhcpv6_ia_hdr)) { + struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]); + dhcpv6_parse_ia(&ia_hdr[1], odata + olen); + } + if (otype == DHCPV6_OPT_SERVERID && olen <= 130) { memcpy(cand.duid, odata, olen); cand.duid_len = olen; @@ -598,13 +605,6 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, cand.preference -= 2000; } } - - if (orig == DHCPV6_MSG_SOLICIT && - (otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA) && - olen > sizeof(struct dhcpv6_ia_hdr)) { - struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]); - dhcpv6_parse_ia(&ia_hdr[1], odata + olen); - } } if (cand.duid_len > 0) {