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=isUEZcec; 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 9DCD95A061E for ; Wed, 02 Apr 2025 19:24:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743614651; 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=SYWnAch/+oraGTqSjuY8m8Hr+QSMJ9CI0OqLV62qlzk=; b=isUEZcecX8eJSSyd9mssWH/OEAdaVn7jvYcKnKLdB+Wm1HNLgQ02EuDsokZi30/Oa0Ft9v 6haKd0nIWWxsTDOzaKl2QLOzPx7yuLYummHq2sYVUa+t63uN/5TctMpXAy5ga7vkp0Tq/1 3sJ9uG7pUU/srJ5K0usjfMusRQwmNj4= 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-590-UoYJU6PvNK2rKiiUTZgZWw-1; Wed, 02 Apr 2025 13:24:10 -0400 X-MC-Unique: UoYJU6PvNK2rKiiUTZgZWw-1 X-Mimecast-MFC-AGG-ID: UoYJU6PvNK2rKiiUTZgZWw_1743614649 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 58F4C1800267 for ; Wed, 2 Apr 2025 17:24:09 +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 4763419560AD; Wed, 2 Apr 2025 17:24:08 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 15/18] dhcp: Convert to iov_tail Date: Wed, 2 Apr 2025 19:23:40 +0200 Message-ID: <20250402172343.858187-16-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: 8SecwiMC3JjFRDGj-En51hS_emUUJ0PbHvsmcAbUoXo_1743614649 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: 3Z5B5ADKWXCZZV7VUEQZW2J4C3Y6XOED X-Message-ID-Hash: 3Z5B5ADKWXCZZV7VUEQZW2J4C3Y6XOED 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 --- dhcp.c | 38 ++++++++++++++++++++++---------------- iov.c | 1 - 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dhcp.c b/dhcp.c index b0de04be6f27..f3167beb18b7 100644 --- a/dhcp.c +++ b/dhcp.c @@ -302,27 +302,32 @@ 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; + size_t mlen, dlen, opt_len, opt_off = 0; char macstr[ETH_ADDRSTRLEN]; struct in_addr mask, dst; const struct ethhdr *eh; const struct iphdr *iph; const struct udphdr *uh; + struct iov_tail data; struct msg const *m; + struct msg mc; + struct ethhdr ehc; + struct iphdr iphc; + struct udphdr uhc; struct msg reply; unsigned int i; - eh = packet_get(p, 0, offset, sizeof(*eh), NULL); - offset += sizeof(*eh); + if (!packet_base(p, 0, &data)) + return -1; - iph = packet_get(p, 0, offset, sizeof(*iph), NULL); + eh = IOV_REMOVE_HEADER(&data, ehc); + iph = IOV_PEEK_HEADER(&data, iphc); if (!eh || !iph) return -1; - offset += iph->ihl * 4UL; - uh = packet_get(p, 0, offset, sizeof(*uh), &mlen); - offset += sizeof(*uh); + data.off += iph->ihl * 4UL; + uh = IOV_REMOVE_HEADER(&data, uhc); if (!uh) return -1; @@ -332,7 +337,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,25 +362,24 @@ 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; + opt_len = iov_tail_size(&data); while (opt_off + 2 < opt_len) { - const uint8_t *olen, *val; + 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_tail_ptr(&data, opt_off, 1); + olen = iov_tail_ptr(&data, opt_off + 1, 1); if (!type || !olen) return -1; - val = packet_get(p, 0, offset + opt_off + 2, *olen, NULL); - if (!val) + if (iov_tail_size(&data) < opt_off + 2 + *olen) return -1; - memcpy(&opts[*type].c, val, *olen); + iov_to_buf(&data.iov[0], data.cnt, data.off + opt_off + 2, + &opts[*type].c, *olen); opts[*type].clen = *olen; opt_off += *olen + 2; } diff --git a/iov.c b/iov.c index 0c69379316aa..66f15585a61a 100644 --- a/iov.c +++ b/iov.c @@ -253,7 +253,6 @@ bool iov_drop(struct iov_tail *tail, size_t len) * Returns: pointer to the data in the tail, NULL if the * tail doesn't contains @len bytes. */ -/* cppcheck-suppress unusedFunction */ void *iov_tail_ptr(struct iov_tail *tail, size_t off, size_t len) { const struct iovec *iov; -- 2.49.0