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=X6z3a5ka; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id 982805A026F for ; Wed, 02 Apr 2025 19:24:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743614646; 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; bh=kgpdLSbTRx5QChGU7QSj2Pf1qDfPsF4sUMPP+2XJ9+M=; b=X6z3a5kavrbmJraukUaZK20xP4uiPzLGFNFj36M/DHLlh2FjS8INKkmfQp2G8r5NhJn4O9 oHo3Sz5fLiIBzoaTlc+KO0YKFPHN7BTvl4rr/xqwm2+KRFlPme5EVGKHVow4sqZoZnc6J3 ZIYRMC/Kvcr2jUDABEIGv68UfsIulMU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-8KTDXC-aOfazQA63M9XVsg-1; Wed, 02 Apr 2025 13:24:05 -0400 X-MC-Unique: 8KTDXC-aOfazQA63M9XVsg-1 X-Mimecast-MFC-AGG-ID: 8KTDXC-aOfazQA63M9XVsg_1743614644 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A30071800349 for ; Wed, 2 Apr 2025 17:24:04 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.33.101]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 890831955BF2; Wed, 2 Apr 2025 17:24:03 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 12/18] dhcpv6: Convert to iov_tail Date: Wed, 2 Apr 2025 19:23:37 +0200 Message-ID: <20250402172343.858187-13-lvivier@redhat.com> In-Reply-To: <20250402172343.858187-1-lvivier@redhat.com> References: <20250402172343.858187-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: h6FTlGWsKpSQeSoyGVGavyKvHcwjozuku1s_UQbLU8I_1743614644 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: BYGJNPPUF4Y2QRZVI6RPCAWXLLGP4L7E X-Message-ID-Hash: BYGJNPPUF4Y2QRZVI6RPCAWXLLGP4L7E 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: Laurent Vivier 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: Use packet_base() and extract headers using IOV_REMOVE_HEADER() and IOV_PEEK_HEADER() rather than packet_get(). Signed-off-by: Laurent Vivier --- dhcpv6.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dhcpv6.c b/dhcpv6.c index 373a98869f9b..eb3f188af0b5 100644 --- a/dhcpv6.c +++ b/dhcpv6.c @@ -496,9 +496,15 @@ int dhcpv6(struct ctx *c, const struct pool *p, const struct msg_hdr *mh; const struct udphdr *uh; struct opt_hdr *bad_ia; + struct iov_tail data; + struct msg_hdr mhc; + struct udphdr uhc; size_t mlen, n; - uh = packet_get(p, 0, 0, sizeof(*uh), &mlen); + if (!packet_base(p, 0, &data)) + return -1; + + uh = IOV_REMOVE_HEADER(&data, uhc); if (!uh) return -1; @@ -511,6 +517,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, if (!IN6_IS_ADDR_MULTICAST(daddr)) return -1; + mlen = iov_tail_size(&data); if (mlen + sizeof(*uh) != ntohs(uh->len) || mlen < sizeof(*mh)) return -1; @@ -518,7 +525,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, src = &c->ip6.our_tap_ll; - mh = packet_get(p, 0, sizeof(*uh), sizeof(*mh), NULL); + mh = IOV_PEEK_HEADER(&data, mhc); if (!mh) return -1; -- 2.49.0