From: Laurent Vivier <lvivier@redhat.com>
To: passt-dev@passt.top
Cc: Laurent Vivier <lvivier@redhat.com>
Subject: [PATCH v6 17/30] dhcp: Convert to iov_tail
Date: Wed, 4 Jun 2025 15:08:21 +0200 [thread overview]
Message-ID: <20250604130834.3868010-18-lvivier@redhat.com> (raw)
In-Reply-To: <20250604130834.3868010-1-lvivier@redhat.com>
Use packet_data() and extract headers using IOV_REMOVE_HEADER()
and IOV_PEEK_HEADER() rather than packet_get().
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
dhcp.c | 45 +++++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/dhcp.c b/dhcp.c
index b0de04be6f27..7c92f30d0b39 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -302,27 +302,33 @@ static void opt_set_dns_search(const struct ctx *c, size_t max_len)
*/
int dhcp(const struct ctx *c, const struct pool *p)
{
- size_t mlen, dlen, offset = 0, opt_len, opt_off = 0;
char macstr[ETH_ADDRSTRLEN];
+ size_t mlen, dlen, opt_len;
struct in_addr mask, dst;
+ struct ethhdr eh_storage;
+ struct iphdr iph_storage;
+ struct udphdr uh_storage;
const struct ethhdr *eh;
const struct iphdr *iph;
const struct udphdr *uh;
+ struct iov_tail data;
struct msg const *m;
struct msg reply;
unsigned int i;
+ struct msg mc;
- eh = packet_get(p, 0, offset, sizeof(*eh), NULL);
- offset += sizeof(*eh);
+ if (!packet_data(p, 0, &data))
+ return -1;
- iph = packet_get(p, 0, offset, sizeof(*iph), NULL);
+ eh = IOV_REMOVE_HEADER(&data, eh_storage);
+ iph = IOV_PEEK_HEADER(&data, iph_storage);
if (!eh || !iph)
return -1;
- offset += iph->ihl * 4UL;
- uh = packet_get(p, 0, offset, sizeof(*uh), &mlen);
- offset += sizeof(*uh);
+ if (!iov_tail_drop(&data, iph->ihl * 4UL))
+ return -1;
+ uh = IOV_REMOVE_HEADER(&data, uh_storage);
if (!uh)
return -1;
@@ -332,7 +338,9 @@ int dhcp(const struct ctx *c, const struct pool *p)
if (c->no_dhcp)
return 1;
- m = packet_get(p, 0, offset, offsetof(struct msg, o), &opt_len);
+ mlen = iov_tail_size(&data);
+ m = (struct msg const *)iov_remove_header_(&data, &mc, offsetof(struct msg, o),
+ __alignof__(struct msg));
if (!m ||
mlen != ntohs(uh->len) - sizeof(*uh) ||
mlen < offsetof(struct msg, o) ||
@@ -355,27 +363,28 @@ int dhcp(const struct ctx *c, const struct pool *p)
memset(&reply.file, 0, sizeof(reply.file));
reply.magic = m->magic;
- offset += offsetof(struct msg, o);
-
for (i = 0; i < ARRAY_SIZE(opts); i++)
opts[i].clen = -1;
- while (opt_off + 2 < opt_len) {
- const uint8_t *olen, *val;
+ opt_len = iov_tail_size(&data);
+ while (opt_len >= 2) {
+ uint8_t olen_storage, type_storage;
+ const uint8_t *olen;
uint8_t *type;
- type = packet_get(p, 0, offset + opt_off, 1, NULL);
- olen = packet_get(p, 0, offset + opt_off + 1, 1, NULL);
+ type = IOV_REMOVE_HEADER(&data, type_storage);
+ olen = IOV_REMOVE_HEADER(&data, olen_storage);
if (!type || !olen)
return -1;
- val = packet_get(p, 0, offset + opt_off + 2, *olen, NULL);
- if (!val)
+ opt_len = iov_tail_size(&data);
+ if (opt_len < *olen)
return -1;
- memcpy(&opts[*type].c, val, *olen);
+ iov_to_buf(&data.iov[0], data.cnt, data.off, &opts[*type].c, *olen);
opts[*type].clen = *olen;
- opt_off += *olen + 2;
+ iov_tail_drop(&data, *olen);
+ opt_len -= *olen;
}
opts[80].slen = -1;
--
@@ -302,27 +302,33 @@ static void opt_set_dns_search(const struct ctx *c, size_t max_len)
*/
int dhcp(const struct ctx *c, const struct pool *p)
{
- size_t mlen, dlen, offset = 0, opt_len, opt_off = 0;
char macstr[ETH_ADDRSTRLEN];
+ size_t mlen, dlen, opt_len;
struct in_addr mask, dst;
+ struct ethhdr eh_storage;
+ struct iphdr iph_storage;
+ struct udphdr uh_storage;
const struct ethhdr *eh;
const struct iphdr *iph;
const struct udphdr *uh;
+ struct iov_tail data;
struct msg const *m;
struct msg reply;
unsigned int i;
+ struct msg mc;
- eh = packet_get(p, 0, offset, sizeof(*eh), NULL);
- offset += sizeof(*eh);
+ if (!packet_data(p, 0, &data))
+ return -1;
- iph = packet_get(p, 0, offset, sizeof(*iph), NULL);
+ eh = IOV_REMOVE_HEADER(&data, eh_storage);
+ iph = IOV_PEEK_HEADER(&data, iph_storage);
if (!eh || !iph)
return -1;
- offset += iph->ihl * 4UL;
- uh = packet_get(p, 0, offset, sizeof(*uh), &mlen);
- offset += sizeof(*uh);
+ if (!iov_tail_drop(&data, iph->ihl * 4UL))
+ return -1;
+ uh = IOV_REMOVE_HEADER(&data, uh_storage);
if (!uh)
return -1;
@@ -332,7 +338,9 @@ int dhcp(const struct ctx *c, const struct pool *p)
if (c->no_dhcp)
return 1;
- m = packet_get(p, 0, offset, offsetof(struct msg, o), &opt_len);
+ mlen = iov_tail_size(&data);
+ m = (struct msg const *)iov_remove_header_(&data, &mc, offsetof(struct msg, o),
+ __alignof__(struct msg));
if (!m ||
mlen != ntohs(uh->len) - sizeof(*uh) ||
mlen < offsetof(struct msg, o) ||
@@ -355,27 +363,28 @@ int dhcp(const struct ctx *c, const struct pool *p)
memset(&reply.file, 0, sizeof(reply.file));
reply.magic = m->magic;
- offset += offsetof(struct msg, o);
-
for (i = 0; i < ARRAY_SIZE(opts); i++)
opts[i].clen = -1;
- while (opt_off + 2 < opt_len) {
- const uint8_t *olen, *val;
+ opt_len = iov_tail_size(&data);
+ while (opt_len >= 2) {
+ uint8_t olen_storage, type_storage;
+ const uint8_t *olen;
uint8_t *type;
- type = packet_get(p, 0, offset + opt_off, 1, NULL);
- olen = packet_get(p, 0, offset + opt_off + 1, 1, NULL);
+ type = IOV_REMOVE_HEADER(&data, type_storage);
+ olen = IOV_REMOVE_HEADER(&data, olen_storage);
if (!type || !olen)
return -1;
- val = packet_get(p, 0, offset + opt_off + 2, *olen, NULL);
- if (!val)
+ opt_len = iov_tail_size(&data);
+ if (opt_len < *olen)
return -1;
- memcpy(&opts[*type].c, val, *olen);
+ iov_to_buf(&data.iov[0], data.cnt, data.off, &opts[*type].c, *olen);
opts[*type].clen = *olen;
- opt_off += *olen + 2;
+ iov_tail_drop(&data, *olen);
+ opt_len -= *olen;
}
opts[80].slen = -1;
--
2.49.0
next prev parent reply other threads:[~2025-06-04 13:09 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-04 13:08 [PATCH v6 00/30] Introduce discontiguous frames management Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 01/30] arp: Don't mix incoming and outgoing buffers Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 02/30] iov: Introduce iov_tail_clone() and iov_tail_drop() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 03/30] iov: Update IOV_REMOVE_HEADER() and IOV_PEEK_HEADER() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 04/30] tap: Use iov_tail with tap_add_packet() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 05/30] packet: Use iov_tail with packet_add() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 06/30] packet: Add packet_data() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 07/30] arp: Convert to iov_tail Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 08/30] ndp: " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 09/30] icmp: " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 10/30] udp: " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 11/30] tcp: Convert tcp_tap_handler() to use iov_tail Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 12/30] tcp: Convert tcp_data_from_tap() " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 13/30] dhcpv6: move offset initialization out of dhcpv6_opt() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 14/30] dhcpv6: Extract sending of NotOnLink status Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 15/30] dhcpv6: Convert to iov_tail Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 16/30] dhcpv6: Use iov_tail in dhcpv6_opt() Laurent Vivier
2025-06-04 13:08 ` Laurent Vivier [this message]
2025-06-04 13:08 ` [PATCH v6 18/30] ip: Use iov_tail in ipv6_l4hdr() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 19/30] tap: Convert tap4_handler() to iov_tail Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 20/30] tap: Convert tap6_handler() " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 21/30] packet: rename packet_data() to packet_get() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 22/30] arp: use iov_tail rather than pool Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 23/30] dhcp: " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 24/30] dhcpv6: " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 25/30] icmp: " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 26/30] ndp: " Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 27/30] packet: remove PACKET_POOL() and PACKET_POOL_P() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 28/30] packet: remove unused parameter from PACKET_POOL_DECL() Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 29/30] packet: add memory regions information into pool Laurent Vivier
2025-06-04 13:08 ` [PATCH v6 30/30] packet: use buf to store iovec array Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250604130834.3868010-18-lvivier@redhat.com \
--to=lvivier@redhat.com \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).