From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id 9AD195A061B; Tue, 26 Nov 2024 08:06:17 +0100 (CET) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH v5 2/3] dhcp: Introduce support for Rapid Commit (option 80, RFC 4039) Date: Tue, 26 Nov 2024 08:06:16 +0100 Message-ID: <20241126070617.2309047-3-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126070617.2309047-1-sbrivio@redhat.com> References: <20241126070617.2309047-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: DRS6B47EJ2KK7PFRTEKPW4AG44UQOH5H X-Message-ID-Hash: DRS6B47EJ2KK7PFRTEKPW4AG44UQOH5H X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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"); -- 2.43.0