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=Yfg2wY9H; 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 C045D5A026F for ; Wed, 02 Apr 2025 19:24:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743614640; 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=bV0Iq+fkB8a/8bl6Dl1A6Rn6MAKsS0uFXDyhjuBpR2I=; b=Yfg2wY9HhQE6E2Ciyf+jacLoY64ATZetrWe1apR4uQ0uAmZBazGyiCzXOBX0LQ2pkT7N+Y MZ4agVCw8e8gPX2CritDL/G+osTmSWeXiNDO8uhTFCT2AYN3PffjQGfiG9QqAD3nG5E+RX /B1Fkwug6bnXPF2Ufu+TNzF4htEGpDY= 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-484-Z2quOGpbNKGJfYcqWQBUYQ-1; Wed, 02 Apr 2025 13:23:59 -0400 X-MC-Unique: Z2quOGpbNKGJfYcqWQBUYQ-1 X-Mimecast-MFC-AGG-ID: Z2quOGpbNKGJfYcqWQBUYQ_1743614638 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 5B11E1809CA6 for ; Wed, 2 Apr 2025 17:23:58 +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 4A2D019560AD; Wed, 2 Apr 2025 17:23:56 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 08/18] icmp: Convert to iov_tail Date: Wed, 2 Apr 2025 19:23:33 +0200 Message-ID: <20250402172343.858187-9-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: ldQ6TkC1kZqeKQoKXcihHWT5DpPG92eJLWrqH8vMlYk_1743614638 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: KRPEGSLWKO2IERSF4K2XR2OE4A3K4OBL X-Message-ID-Hash: KRPEGSLWKO2IERSF4K2XR2OE4A3K4OBL 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_PEEK_HEADER() rather than packet_get(). Signed-off-by: Laurent Vivier --- icmp.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/icmp.c b/icmp.c index 7e2b3423a8d1..119502c0c340 100644 --- a/icmp.c +++ b/icmp.c @@ -241,24 +241,25 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, struct icmp_ping_flow *pingf; const struct flowside *tgt; union sockaddr_inany sa; - size_t dlen, l4len; + struct iov_tail data; + struct msghdr msh; uint16_t id, seq; union flow *flow; uint8_t proto; - socklen_t sl; - void *pkt; (void)saddr; ASSERT(pif == PIF_TAP); + if (!packet_base(p, 0, &data)) + return -1; + if (af == AF_INET) { const struct icmphdr *ih; + struct icmphdr ihc; - if (!(pkt = packet_get(p, 0, 0, sizeof(*ih), &dlen))) - return 1; - - ih = (struct icmphdr *)pkt; - l4len = dlen + sizeof(*ih); + ih = IOV_PEEK_HEADER(&data, ihc); + if (!ih) + return -1; if (ih->type != ICMP_ECHO) return 1; @@ -268,12 +269,11 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, seq = ntohs(ih->un.echo.sequence); } else if (af == AF_INET6) { const struct icmp6hdr *ih; + struct icmp6hdr ihc; - if (!(pkt = packet_get(p, 0, 0, sizeof(*ih), &dlen))) - return 1; - - ih = (struct icmp6hdr *)pkt; - l4len = dlen + sizeof(*ih); + ih = IOV_PEEK_HEADER(&data, ihc); + if (!ih) + return -1; if (ih->icmp6_type != ICMPV6_ECHO_REQUEST) return 1; @@ -298,8 +298,16 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, ASSERT(flow_proto[pingf->f.type] == proto); pingf->ts = now->tv_sec; - pif_sockaddr(c, &sa, &sl, PIF_HOST, &tgt->eaddr, 0); - if (sendto(pingf->sock, pkt, l4len, MSG_NOSIGNAL, &sa.sa, sl) < 0) { + ASSERT(data.off == 0); + msh.msg_name = &sa; + msh.msg_iov = (struct iovec *)data.iov; + msh.msg_iovlen = data.cnt; + msh.msg_control = NULL; + msh.msg_controllen = 0; + msh.msg_flags = 0; + + pif_sockaddr(c, &sa, &msh.msg_namelen, PIF_HOST, &tgt->eaddr, 0); + if (sendmsg(pingf->sock, &msh, MSG_NOSIGNAL) < 0) { flow_dbg_perror(pingf, "failed to relay request to socket"); } else { flow_dbg(pingf, -- 2.49.0