Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DHCPv6 options serialization to prevent extra bytes in replies #626

Closed
wants to merge 1 commit into from
+6 −2
Closed

Fix DHCPv6 options serialization to prevent extra bytes in replies #626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/nodes/dhcpv6_node.c
View file
Original file line number Diff line number Diff line change
@@ -247,8 +247,10 @@ static int generate_reply_options(struct rte_mbuf *m, uint8_t *options, int opti
memcpy(options, (void *)&reply_options.opt_iana, reply_options.opt_iana_len);
options += reply_options.opt_iana_len;
}
if (reply_options.opt_rapid_len)
if (reply_options.opt_rapid_len) {
memcpy(options, &reply_options.opt_rapid, reply_options.opt_rapid_len);
options += reply_options.opt_rapid_len;
}

// Add DNS server option
memcpy(options, &dns_opt.opt_code, sizeof(dns_opt.opt_code));
@@ -258,8 +260,10 @@ static int generate_reply_options(struct rte_mbuf *m, uint8_t *options, int opti
memcpy(options, dhcpv6_dns->array, dhcpv6_dns->len);
options += dhcpv6_dns->len;

if (reply_options.pxe_mode != DP_PXE_MODE_NONE)
if (reply_options.pxe_mode != DP_PXE_MODE_NONE) {
memcpy(options, &reply_options.boot_file_url, reply_options.opt_boot_file_len);
options += reply_options.opt_boot_file_len;
}

return reply_options_len;
}