From 9da2038485c9334d28df34d2ebd5ba04a3c7662d Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Fri, 15 Nov 2024 18:18:22 +0100 Subject: dhcp: Introduce support for Rapid Commit (option 80, RFC 4039) I'm trying to speed up and simplify IP address acquisition in muvm. Signed-off-by: Stefano Brivio Reviewed-by: David Gibson --- dhcp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dhcp.c b/dhcp.c index 387aee3..a16cde8 100644 --- a/dhcp.c +++ b/dhcp.c @@ -342,9 +342,16 @@ int dhcp(const struct ctx *c, const struct pool *p) opt_off += *olen + 2; } + opts[80].slen = -1; if (opts[53].clen > 0 && opts[53].c[0] == DHCPDISCOVER) { - info("DHCP: offer to discover"); - opts[53].s[0] = DHCPOFFER; + if (opts[80].clen == -1) { + info("DHCP: offer to discover"); + opts[53].s[0] = DHCPOFFER; + } else { + info("DHCP: ack to discover (Rapid Commit)"); + opts[53].s[0] = DHCPACK; + opts[80].slen = 0; + } } else if (opts[53].clen <= 0 || opts[53].c[0] == DHCPREQUEST) { info("%s: ack to request", /* DHCP needs a valid message type */ (opts[53].clen <= 0) ? "BOOTP" : "DHCP"); -- cgit v1.2.3