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=MilD1ZQZ; 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 A892C5A0292 for ; Wed, 04 Jun 2025 15:09:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749042560; 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=Z7vF4sUG/UKRQUIzrh95yk/0Y4IDorYDsGCdhBh1erk=; b=MilD1ZQZC0Npi7LwnX7XLbK9lKCWJKHYcVVEN5Fz+hxnVBFdX/85kD1alr4jvsK/gbB2Vz vZwywJe61/IzQR5yFJtFZVKdHz0iOs2nqfvLkQS4l/Q7iOu/PvBV9uk2lMXAQiT76mCPRF CSoH8QawYNvYqsZCF7P7FktolFV/AL8= 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-692-0YT9LLFoMtuH-6cFyGVf4A-1; Wed, 04 Jun 2025 09:09:19 -0400 X-MC-Unique: 0YT9LLFoMtuH-6cFyGVf4A-1 X-Mimecast-MFC-AGG-ID: 0YT9LLFoMtuH-6cFyGVf4A_1749042558 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 43D551801BC9 for ; Wed, 4 Jun 2025 13:09:18 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.225.52]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2FD5E19560AD; Wed, 4 Jun 2025 13:09:16 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v6 21/30] packet: rename packet_data() to packet_get() Date: Wed, 4 Jun 2025 15:08:25 +0200 Message-ID: <20250604130834.3868010-22-lvivier@redhat.com> In-Reply-To: <20250604130834.3868010-1-lvivier@redhat.com> References: <20250604130834.3868010-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: lVZFDBDcyGQdr9TcYsX2Rgcrv8-ZkN_NIiN98Ci-mAI_1749042558 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: X24PVSKFEW6BRLPJE2CZXSJH4CAQXWFY X-Message-ID-Hash: X24PVSKFEW6BRLPJE2CZXSJH4CAQXWFY 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: As we have removed packet_get(), we can rename packet_data() to packet_get() as the name is clearer. Signed-off-by: Laurent Vivier --- arp.c | 2 +- dhcp.c | 2 +- dhcpv6.c | 2 +- icmp.c | 2 +- ndp.c | 2 +- packet.c | 8 ++++---- packet.h | 9 ++++----- tap.c | 6 +++--- tcp.c | 4 ++-- udp.c | 4 ++-- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/arp.c b/arp.c index 6617698f125b..65f0f2627db6 100644 --- a/arp.c +++ b/arp.c @@ -82,7 +82,7 @@ int arp(const struct ctx *c, const struct pool *p) const struct arpmsg *am; struct iov_tail data; - if (!packet_data(p, 0, &data)) + if (!packet_get(p, 0, &data)) return -1; eh = IOV_REMOVE_HEADER(&data, eh_storage); diff --git a/dhcp.c b/dhcp.c index 7c92f30d0b39..4fdf9a7d0264 100644 --- a/dhcp.c +++ b/dhcp.c @@ -317,7 +317,7 @@ int dhcp(const struct ctx *c, const struct pool *p) unsigned int i; struct msg mc; - if (!packet_data(p, 0, &data)) + if (!packet_get(p, 0, &data)) return -1; eh = IOV_REMOVE_HEADER(&data, eh_storage); diff --git a/dhcpv6.c b/dhcpv6.c index bd6268804d95..f73aa68a298e 100644 --- a/dhcpv6.c +++ b/dhcpv6.c @@ -559,7 +559,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, const struct udphdr *uh; size_t mlen, n; - if (!packet_data(p, 0, &data)) + if (!packet_get(p, 0, &data)) return -1; uh = IOV_REMOVE_HEADER(&data, uh_storage); diff --git a/icmp.c b/icmp.c index 37edf6c81b89..393675d44f0e 100644 --- a/icmp.c +++ b/icmp.c @@ -251,7 +251,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, (void)saddr; ASSERT(pif == PIF_TAP); - if (!packet_data(p, 0, &data)) + if (!packet_get(p, 0, &data)) return -1; if (af == AF_INET) { diff --git a/ndp.c b/ndp.c index 77722353be7b..fb2bf1161b66 100644 --- a/ndp.c +++ b/ndp.c @@ -355,7 +355,7 @@ int ndp(const struct ctx *c, const struct icmp6hdr *ih, const struct ndp_ns *ns; struct iov_tail data; - if (!packet_data(p, 0, &data)) + if (!packet_get(p, 0, &data)) return -1; ns = IOV_REMOVE_HEADER(&data, ns_storage); diff --git a/packet.c b/packet.c index 5da18bafa576..cbc43c2fc22d 100644 --- a/packet.c +++ b/packet.c @@ -122,7 +122,7 @@ void packet_add_do(struct pool *p, struct iov_tail *data, } /** - * packet_data_do() - Get data range from packet descriptor from given pool + * packet_get_do() - Get data range from packet descriptor from given pool * @p: Packet pool * @idx: Index of packet descriptor in pool * @data: IOV tail to store the address of the data (output) @@ -132,9 +132,9 @@ void packet_add_do(struct pool *p, struct iov_tail *data, * Return: false if packet index is invalid, true otherwise. * If something wrong with @data, don't return at all (assert). */ -bool packet_data_do(const struct pool *p, size_t idx, - struct iov_tail *data, - const char *func, int line) +bool packet_get_do(const struct pool *p, size_t idx, + struct iov_tail *data, + const char *func, int line) { size_t i; diff --git a/packet.h b/packet.h index dab8274fa5c5..7afe80ef3fcf 100644 --- a/packet.h +++ b/packet.h @@ -33,16 +33,15 @@ struct pool { int vu_packet_check_range(void *buf, const char *ptr, size_t len); void packet_add_do(struct pool *p, struct iov_tail *data, const char *func, int line); -bool packet_data_do(const struct pool *p, const size_t idx, - struct iov_tail *data, - const char *func, int line); +bool packet_get_do(const struct pool *p, const size_t idx, + struct iov_tail *data, const char *func, int line); bool pool_full(const struct pool *p); void pool_flush(struct pool *p); #define packet_add(p, data) \ packet_add_do(p, data, __func__, __LINE__) -#define packet_data(p, idx, data) \ - packet_data_do(p, idx, data, __func__, __LINE__) +#define packet_get(p, idx, data) \ + packet_get_do(p, idx, data, __func__, __LINE__) #define PACKET_POOL_DECL(_name, _size, _buf) \ struct _name ## _t { \ diff --git a/tap.c b/tap.c index 7cf807149879..09da76ea23bc 100644 --- a/tap.c +++ b/tap.c @@ -713,7 +713,7 @@ resume: struct iov_tail data; struct iphdr *iph; - if (!packet_data(in, i, &data)) + if (!packet_get(in, i, &data)) continue; eh = IOV_PEEK_HEADER(&data, eh_storage); @@ -788,7 +788,7 @@ resume: PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); - packet_data(in, i, &eh_data); + packet_get(in, i, &eh_data); packet_add(pkt, &eh_data); if (dhcp(c, pkt)) continue; @@ -903,7 +903,7 @@ resume: struct ipv6hdr *ip6h; uint8_t proto; - if (!packet_data(in, i, &data)) + if (!packet_get(in, i, &data)) return -1; eh = IOV_REMOVE_HEADER(&data, eh_storage); diff --git a/tcp.c b/tcp.c index be1d3e0c0d32..bfc1c38f573d 100644 --- a/tcp.c +++ b/tcp.c @@ -1655,7 +1655,7 @@ static int tcp_data_from_tap(const struct ctx *c, struct tcp_tap_conn *conn, size_t off, size; int count; - if (!packet_data(p, i, &data)) + if (!packet_get(p, i, &data)) return -1; th = IOV_PEEK_HEADER(&data, th_storage); @@ -1986,7 +1986,7 @@ int tcp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, (void)pif; - if (!packet_data(p, idx, &data)) + if (!packet_get(p, idx, &data)) return 1; l4len = iov_tail_size(&data); diff --git a/udp.c b/udp.c index cfa653508d9c..0b0a88ad0d1c 100644 --- a/udp.c +++ b/udp.c @@ -990,7 +990,7 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif, ASSERT(!c->no_udp); - if (!packet_data(p, idx, &data)) + if (!packet_get(p, idx, &data)) return 1; uh = IOV_PEEK_HEADER(&data, uh_storage); @@ -1033,7 +1033,7 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif, for (i = 0, j = 0; i < (int)p->count - idx && j < UIO_MAXIOV; i++) { const struct udphdr *uh_send; - if (!packet_data(p, idx + i, &data)) + if (!packet_get(p, idx + i, &data)) return p->count - idx; uh_send = IOV_REMOVE_HEADER(&data, uh_storage); -- 2.49.0