From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=B6051hrH; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id 67CD35A0627 for ; Tue, 25 Aug 2026 16:09:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787666964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=vbeTgxpRRqobzjE9EI/xFPljxYanmeeXJFdLJLnQL6s=; b=B6051hrHBv2K8Xle826pHQuOflxpQPauFIoxYkITwkhPLdiF0OrW1kvPotHky8iCIwqHna H521+OuEslAqFfjXMKiTvuRLkSFR+dkU/rlzGLAsDtax/RmHNX3LAkZkXC4Tew8z1+BT5x esjeBNCtLiAkiWGM3el/0+ZflvDC+jk= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-370-dyZ65fYePDSa6H16U5bfSg-1; Tue, 25 Aug 2026 10:09:22 -0400 X-MC-Unique: dyZ65fYePDSa6H16U5bfSg-1 X-Mimecast-MFC-AGG-ID: dyZ65fYePDSa6H16U5bfSg_1787666961 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-c1f472eaafbso91024566b.1 for ; Tue, 25 Aug 2026 07:09:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787666961; x=1788271761; h=content-transfer-encoding:content-type:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vbeTgxpRRqobzjE9EI/xFPljxYanmeeXJFdLJLnQL6s=; b=NTO3wpInee4cXd02oKJQl80CT86LWFfP6IkM102MiMSKbV8EpU4hPC0pCprkzk5QJl 25sZFlhsm6pvEYRB1E+8OOuvtFyroZPmBbVX1I1hBB0t3bKo7hripS4IVeSToVdpgISU Qdc3hgyOxltDJnVecoqSpsCMgzp/BIFVNqUCreuSPjvImOULvl0N9kv2VKXLAMabZVRj sPcK5eM21uIlW9osFdSSkPAH87VGuwSFGr/KwnBTaNZK6rQdXBqR8WVteMHsV1Zbrc9z vrEFFP3ehytqaTK1cj2LCRviwSijygLXez/Nj1cUXNBIlp1B0N9VYdViHEe3aQgUigPG pRYA== X-Forwarded-Encrypted: i=1; AHgh+Rq/zEHgOe99VNPrxOEGWyoDQU0TbyvW+7on6Ffqwxx0ITzeHC9aSk837ROSj0cfPkD+vBZeGeciwiE=@passt.top X-Gm-Message-State: AFuF++nv90R6qxWjFlK706M8BVU58F1+CYfrHc7X2/l093mJwya6gI33 fQ+4+GAKgpsMKMR1LmH2DTwerDr7h9dxcNWbTeFY+pAil3o5hwSj6c6vkyPEfv2suK20iW6a7Xh SmQsyt5awV1EgWxe1EZUj8KoKu031UWE9focPBgj6HGiZSB9bcGa6hA== X-Gm-Gg: AR+sD10epiaFPiNA3GxMbh5zWG1WXaaFW8lpPxc7x4XvA+nan0gPA8kM6ZVlwT73tAO JyBJS+C0FY23qLZhetP1COMSI4NGSVYkSbQ9+6miJ8uBLUDVCPb515iiYw8+3G+O/TLMDiEdqWs Q4XvGpK1nd9sQrM/1hW10VYuJmD+jb2YOFjaYrLwd0pZt9C2cf3SmUBpARbVHfpb6imIBHQ+Wx/ RbtCJTVxCAFd6WLwNLkKCcwo7OvvOFBl+7I9/ijl3QzUV2oT4lRouYer5YVDLbIcT1hvBZZ++Vm g/DHj3VDb1uaQQwb5Bdwt63+FlYAli+iLLLpYvHoxI/TSNs609rVo3Wlosthb1shN0rYnmyEqYO MG9k0WdUFIOSm9d+pfUeZ7gzsD4g4vs3IiFQQzSGHfSdN X-Received: by 2002:a17:907:1c0b:b0:c24:bf32:dc57 with SMTP id a640c23a62f3a-c24e2b3a5a7mr741063966b.7.1787666961192; Tue, 25 Aug 2026 07:09:21 -0700 (PDT) X-Received: by 2002:a17:907:1c0b:b0:c24:bf32:dc57 with SMTP id a640c23a62f3a-c24e2b3a5a7mr741058666b.7.1787666960722; Tue, 25 Aug 2026 07:09:20 -0700 (PDT) Received: from ?IPV6:2a01:e0a:e10:ef90:d92c:7e4a:47e6:1b23? ([2a01:e0a:e10:ef90:d92c:7e4a:47e6:1b23]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c249606b4f1sm1855693866b.3.2026.08.25.07.09.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Aug 2026 07:09:20 -0700 (PDT) Message-ID: <6fcca48c-a992-436f-a308-061ae0017d4f@redhat.com> Date: Tue, 25 Aug 2026 16:09:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 2/2] dhcpv6: Inject custom options into DHCPv6 replies To: Anshu Kumari , sbrivio@redhat.com, passt-dev@passt.top References: <20260824121352.244081-1-anskuma@redhat.com> <20260824121352.244081-3-anskuma@redhat.com> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20260824121352.244081-3-anskuma@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 0RPi5smOBC9m95bAbGLMKtLK55VRluD2JvEfyXSD7Yg_1787666961 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: P4WKGXT5LWTHK7YYSISVGIVATXDA4G4Z X-Message-ID-Hash: P4WKGXT5LWTHK7YYSISVGIVATXDA4G4Z X-MailFrom: lvivier@redhat.com 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.dropbear.id.au, jmaloy@redhat.com 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: On 8/24/26 14:13, Anshu Kumari wrote: > Append user-specified options from --dhcpv6-opt to DHCPv6 reply > messages. Options are read from the pre-parsed static storage > populated by dhcpv6_set_opt() at startup, and skipped with a > debug message if they exceed the available space. > > Link: https://bugs.passt.top/show_bug.cgi?id=192 > Signed-off-by: Anshu Kumari > --- > v3: > - rename dhcpv6_custom_opts_fill() to dhcpv6_user_opts_fill(). > - Iterate directly over the pre-parsed binary dhcpv6_user_opts[] > array instead of re-parsing string values at reply time. > > v2: > - Updated dhcpv6_custom_opts_fill() to parse str at reply time > using dhcpv6_opt_parse() instead of copying cached val/len. > --- > dhcpv6.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) Reviewed-by: Laurent Vivier but see below > > diff --git a/dhcpv6.c b/dhcpv6.c > index 3964dd9..041b589 100644 > --- a/dhcpv6.c > +++ b/dhcpv6.c > @@ -865,6 +865,43 @@ static size_t dhcpv6_client_fqdn_fill(const struct iov_tail *data, > return offset + sizeof(struct opt_hdr) + opt_len; > } > > +/** > + * dhcpv6_user_opts_fill() - Append user-specified options to reply > + * @buf: Response message buffer > + * @offset: Current offset in buffer > + * > + * Return: updated offset after appending user options > + */ > +static size_t dhcpv6_user_opts_fill(char *buf, size_t offset) > +{ > + unsigned int i; > + > + for (i = 0; i < ARRAY_SIZE(dhcpv6_user_opts); i++) { > + int vlen = dhcpv6_user_opts[i].len; > + struct opt_hdr *hdr; > + > + if (!vlen) > + continue; > + > + if (offset + sizeof(struct opt_hdr) + vlen > > + OPT_MAX_SIZE) { > + debug("DHCPv6: option %u doesn't fit," > + " skipping", i); Perhaps a warn() rather than a debug(), to inform user that something bad happens? > + continue; > + } > + > + hdr = (struct opt_hdr *)(buf + offset); > + hdr->t = htons(i); > + hdr->l = htons(vlen); > + offset += sizeof(struct opt_hdr); > + > + memcpy(buf + offset, dhcpv6_user_opts[i].val, vlen); > + offset += vlen; > + } > + > + return offset; > +} > + > /** > * dhcpv6() - Check if this is a DHCPv6 message, reply as needed > * @c: Execution context > @@ -1003,6 +1040,8 @@ int dhcpv6(struct ctx *c, struct iov_tail *data, > sizeof(struct opt_hdr) + ntohs(client_id->l); > n = dhcpv6_dns_fill(c, (char *)&resp, n); > n = dhcpv6_client_fqdn_fill(data, c, (char *)&resp, n); > + n = dhcpv6_user_opts_fill((char *)&resp, n); > + > resp.hdr.xid = mh->xid; > > tap_udp6_send(c, src, 547, saddr, 546, mh->xid, &resp, n);