From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=XvIBYWmn; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 6DB875A061E for ; Thu, 03 Apr 2025 07:38:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1743658684; bh=BvzeS+q3zkXMRe7eS5cfL4xDCbqCtpVmnO2et9MawuE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XvIBYWmn5lznS3hwS5VhtRadzJ4pLt+4LLO/6Qax+XgbtVU/R4Rt1zpmtfowe1iUT RNnJMqmjHasanKHQKCRkxHFJ+VEt9hofLHGmG1lmvA9SPj1UH2rXirlCLNPIO6RmGH 1ykhWGGOi4Lwc31kVMr5K9zZtPXhSBtf26pKC90gWyhmcEImGDBVsil1cYB3ZUTRb1 oCa3HN4zP10mTjqXSelAlbpEne74TVcwwBpIFZrDqlYcybeV+/2UjtoVMTioLjLMDW OfBV2qFwXqW1l8lF1a7oLFlhuLVA/DS1kC7PPu8B6DlwQ5OEptybDAFnC/lVJZLRb7 KSulnlbFJWV4A== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZSr9m5kWSz4xN8; Thu, 3 Apr 2025 16:38:04 +1100 (AEDT) Date: Thu, 3 Apr 2025 16:21:29 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH 12/18] dhcpv6: Convert to iov_tail Message-ID: References: <20250402172343.858187-1-lvivier@redhat.com> <20250402172343.858187-13-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="+F6nbTZOsw1ve15c" Content-Disposition: inline In-Reply-To: <20250402172343.858187-13-lvivier@redhat.com> Message-ID-Hash: GXFRBUQFNNPN74X7C3UP47AHBB5LJVYU X-Message-ID-Hash: GXFRBUQFNNPN74X7C3UP47AHBB5LJVYU X-MailFrom: dgibson@gandalf.ozlabs.org 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: passt-dev@passt.top 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: --+F6nbTZOsw1ve15c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 02, 2025 at 07:23:37PM +0200, Laurent Vivier wrote: > Use packet_base() and extract headers using IOV_REMOVE_HEADER() > and IOV_PEEK_HEADER() rather than packet_get(). >=20 > Signed-off-by: Laurent Vivier > --- > dhcpv6.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) >=20 > 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; > =20 > - uh =3D packet_get(p, 0, 0, sizeof(*uh), &mlen); > + if (!packet_base(p, 0, &data)) > + return -1; > + > + uh =3D IOV_REMOVE_HEADER(&data, uhc); > if (!uh) > return -1; > =20 > @@ -511,6 +517,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > if (!IN6_IS_ADDR_MULTICAST(daddr)) > return -1; > =20 > + mlen =3D iov_tail_size(&data); The total length is useful in enough cases that I wonder if it makes sense for packet_base() to return it. > if (mlen + sizeof(*uh) !=3D ntohs(uh->len) || mlen < sizeof(*mh)) > return -1; > =20 > @@ -518,7 +525,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > =20 > src =3D &c->ip6.our_tap_ll; > =20 > - mh =3D packet_get(p, 0, sizeof(*uh), sizeof(*mh), NULL); > + mh =3D IOV_PEEK_HEADER(&data, mhc); > if (!mh) > return -1; > =20 --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --+F6nbTZOsw1ve15c Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmfuGtgACgkQzQJF27ox 2GdN9xAAnO53l9+QPLye0QR+OtsB0GSjvgsKZGpLpREKJjrLTcKVmucvw22x7InY kbtiXiDMivzNrBKeutA3BDgP0psLNbXC5KkhBlpdaaJu1a8YGJyemav7FJs+NAso hXhK4h/bXtMGXgqgeTS+SVTrZ884HNtA6pQ/Q49EdQDUFZ93W89/48K7PZPLfrQL 6zaIiut1N0tvH/KqIyHWXKSWKC9Pydm8M4vCOmA2RVcOovCIJaR+vzP3SBVWBc9S z6ZgaIWqFA6TGOGjX6To02gkih/4qclD2HH7cljrpvIf80HW6dRWAZ72CjloXLYP oj3C1lC5W+x243CjtGp6Ncmec0EXdDmsSCq2w5VU6SU1f1Oo+oL7TAX6DAP1w3Vt Su1P/bBuYoJhD5WY8ntNmgBTU7Lzr3JOsnRjFRGvKYuZbepB8+ZwAn1tyNvMBBOm J1UpGBGVfGxnLLUrKfhp82iVRFZH10OS1kEGlEmLfiGxhQXztDJWyY4jZZQwKIAw Jnzvs7MGVnlrh0xLygTX8ae/Jf2ev2ny8EuHdq35bOmOuxcupqAJe1aiVy/5pvQ7 qcuPhI73oq0tcqpdxmAbTC+t+5ZnmEa18V20/HV1+NdotwXqQRvoYAVKxWpPB9bE xNrUr91udvhQfjacAW3By0PajdP5X0owz1aS6I4J3sYn//iY09U= =PIPJ -----END PGP SIGNATURE----- --+F6nbTZOsw1ve15c--