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=Fb5zfeim; 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 DFD7D5A061C for ; Wed, 16 Apr 2025 17:26:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744817212; 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=Robx4jGbOWQRkS3VDoc8dZai7gIQWvbRVIy+NKPzUaE=; b=Fb5zfeimFuyt12ZZzrBoUhFYOpVv6eXEY3jJA7S/k2I61LwnqobH9ii3VMWU4MLrNLYekJ snUJqfAwBDw89xzf4GmEw9D9wAs76B56Sce4OUASOnOW4cTeRLl8NEMbFqIaqo6uU8LR5g Yb+SO/KmwV/csDfS0N4PV/QlPykXmfI= Received: from mx-prod-mc-08.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-563-KBuxp6YMPhuYAL0rS9bdtQ-1; Wed, 16 Apr 2025 11:26:51 -0400 X-MC-Unique: KBuxp6YMPhuYAL0rS9bdtQ-1 X-Mimecast-MFC-AGG-ID: KBuxp6YMPhuYAL0rS9bdtQ_1744817210 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8268B18001EA for ; Wed, 16 Apr 2025 15:26:50 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.32.6]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6EB981956095; Wed, 16 Apr 2025 15:26:49 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v4 23/28] dhcpv6: use iov_tail rather than pool Date: Wed, 16 Apr 2025 17:26:00 +0200 Message-ID: <20250416152605.3947623-24-lvivier@redhat.com> In-Reply-To: <20250416152605.3947623-1-lvivier@redhat.com> References: <20250416152605.3947623-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ATJ3RjJkzge5Pz7MT11Y8ioN_zigWzARNb_wxRKSO5o_1744817210 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: 7D6NPFRQDLWS6K5U647KWGIKC3RXF45J X-Message-ID-Hash: 7D6NPFRQDLWS6K5U647KWGIKC3RXF45J 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: Signed-off-by: Laurent Vivier --- dhcpv6.c | 29 +++++++++++++---------------- dhcpv6.h | 2 +- tap.c | 6 ++---- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dhcpv6.c b/dhcpv6.c index 365b609addda..d02eb59a08fa 100644 --- a/dhcpv6.c +++ b/dhcpv6.c @@ -535,17 +535,17 @@ static size_t dhcpv6_client_fqdn_fill(const struct iov_tail *data, /** * dhcpv6() - Check if this is a DHCPv6 message, reply as needed * @c: Execution context - * @p: Packet pool, single packet starting from UDP header + * @data Single packet starting from UDP header * @saddr: Source IPv6 address of original message * @daddr: Destination IPv6 address of original message * * Return: 0 if it's not a DHCPv6 message, 1 if handled, -1 on failure */ -int dhcpv6(struct ctx *c, const struct pool *p, +int dhcpv6(struct ctx *c, struct iov_tail *data, const struct in6_addr *saddr, const struct in6_addr *daddr) { const struct opt_server_id *server_id = NULL; - struct iov_tail data, opt, client_id_base; + struct iov_tail opt, client_id_base; const struct opt_hdr *client_id = NULL; const struct opt_ia_na *ia = NULL; struct opt_server_id server_idc; @@ -558,10 +558,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, struct udphdr uhc; size_t mlen, n; - if (!packet_data(p, 0, &data)) - return -1; - - uh = IOV_REMOVE_HEADER(&data, uhc); + uh = IOV_REMOVE_HEADER(data, uhc); if (!uh) return -1; @@ -574,7 +571,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, if (!IN6_IS_ADDR_MULTICAST(daddr)) return -1; - mlen = iov_tail_size(&data); + mlen = iov_tail_size(data); if (mlen + sizeof(*uh) != ntohs(uh->len) || mlen < sizeof(*mh)) return -1; @@ -582,23 +579,23 @@ int dhcpv6(struct ctx *c, const struct pool *p, src = &c->ip6.our_tap_ll; - mh = IOV_REMOVE_HEADER(&data, mhc); + mh = IOV_REMOVE_HEADER(data, mhc); if (!mh) return -1; - client_id_base = data; + client_id_base = *data; if (dhcpv6_opt(&client_id_base, OPT_CLIENTID)) client_id = IOV_PEEK_HEADER(&client_id_base, client_idc); if (!client_id || ntohs(client_id->l) > OPT_VSIZE(client_id)) return -1; - opt = data; + opt = *data; if (dhcpv6_opt(&opt, OPT_SERVERID)) server_id = IOV_PEEK_HEADER(&opt, server_idc); if (server_id && ntohs(server_id->hdr.l) != OPT_VSIZE(server_id)) return -1; - opt = data; + opt = *data; if (dhcpv6_opt(&opt, OPT_IA_NA)) ia = IOV_PEEK_HEADER(&opt, iac); if (ia && ntohs(ia->hdr.l) < MIN(OPT_VSIZE(ia_na), OPT_VSIZE(ia_ta))) @@ -616,9 +613,9 @@ int dhcpv6(struct ctx *c, const struct pool *p, if (mh->type == TYPE_CONFIRM && server_id) return -1; - if (dhcpv6_ia_notonlink(&data, &c->ip6.addr)) { + if (dhcpv6_ia_notonlink(data, &c->ip6.addr)) { - dhcpv6_send_ia_notonlink(c, &data, &client_id_base, + dhcpv6_send_ia_notonlink(c, data, &client_id_base, ntohs(client_id->l), mh->xid); return 1; @@ -631,7 +628,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, memcmp(&resp.server_id, server_id, sizeof(resp.server_id))) return -1; - if (ia || dhcpv6_opt(&data, OPT_IA_TA)) + if (ia || dhcpv6_opt(data, OPT_IA_TA)) return -1; info("DHCPv6: received INFORMATION_REQUEST, sending REPLY"); @@ -664,7 +661,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, n = offsetof(struct resp_t, client_id) + 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_client_fqdn_fill(data, c, (char *)&resp, n); resp.hdr.xid = mh->xid; diff --git a/dhcpv6.h b/dhcpv6.h index 580998862227..c706dfdbb2ac 100644 --- a/dhcpv6.h +++ b/dhcpv6.h @@ -6,7 +6,7 @@ #ifndef DHCPV6_H #define DHCPV6_H -int dhcpv6(struct ctx *c, const struct pool *p, +int dhcpv6(struct ctx *c, struct iov_tail *data, struct in6_addr *saddr, struct in6_addr *daddr); void dhcpv6_init(const struct ctx *c); diff --git a/tap.c b/tap.c index 846d4b35dda7..5ab49935d318 100644 --- a/tap.c +++ b/tap.c @@ -971,11 +971,9 @@ resume: uh = IOV_PEEK_HEADER(&data, uhc); if (proto == IPPROTO_UDP) { - PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); - - packet_add(pkt, &data); + struct iov_tail uh_data = data; - if (dhcpv6(c, pkt, saddr, daddr)) + if (dhcpv6(c, &uh_data, saddr, daddr)) continue; } -- 2.49.0