public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 02/11] icmp: Don't set "port" on destination sockaddr for ping sockets
Date: Mon, 18 Dec 2023 18:40:08 +1100	[thread overview]
Message-ID: <20231218074017.985092-3-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20231218074017.985092-1-david@gibson.dropbear.id.au>

We set the port to the ICMP id on the sendto() address when using ICMP
ping sockets.  However, this has no effect: the ICMP id the kernel
uses is determined only by the "port" on the socket's *bound* address
(which is constructed inside sock_l4(), using the id we also pass to
it).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 icmp.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/icmp.c b/icmp.c
index 325dfb0..d3e5bc6 100644
--- a/icmp.c
+++ b/icmp.c
@@ -182,8 +182,6 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
 		if (ih->type != ICMP_ECHO && ih->type != ICMP_ECHOREPLY)
 			return 1;
 
-		sa.sin_port = ih->un.echo.id;
-
 		iref.id = id = ntohs(ih->un.echo.id);
 
 		if ((s = icmp_id_map[V4][id].sock) <= 0) {
@@ -229,8 +227,6 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
 		if (ih->icmp6_type != 128 && ih->icmp6_type != 129)
 			return 1;
 
-		sa.sin6_port = ih->icmp6_identifier;
-
 		iref.id = id = ntohs(ih->icmp6_identifier);
 		if ((s = icmp_id_map[V6][id].sock) <= 0) {
 			s = sock_l4(c, AF_INET6, IPPROTO_ICMPV6,
-- 
@@ -182,8 +182,6 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
 		if (ih->type != ICMP_ECHO && ih->type != ICMP_ECHOREPLY)
 			return 1;
 
-		sa.sin_port = ih->un.echo.id;
-
 		iref.id = id = ntohs(ih->un.echo.id);
 
 		if ((s = icmp_id_map[V4][id].sock) <= 0) {
@@ -229,8 +227,6 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
 		if (ih->icmp6_type != 128 && ih->icmp6_type != 129)
 			return 1;
 
-		sa.sin6_port = ih->icmp6_identifier;
-
 		iref.id = id = ntohs(ih->icmp6_identifier);
 		if ((s = icmp_id_map[V6][id].sock) <= 0) {
 			s = sock_l4(c, AF_INET6, IPPROTO_ICMPV6,
-- 
2.43.0


  parent reply	other threads:[~2023-12-18  7:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-18  7:40 [PATCH 00/11] RFC: ICMP reworks preliminary to flow table integration David Gibson
2023-12-18  7:40 ` [PATCH 01/11] checksum: Don't use linux/icmp.h when netinet/ip_icmp.h will do David Gibson
2023-12-18  7:40 ` David Gibson [this message]
2023-12-18  7:40 ` [PATCH 03/11] icmp: Remove redundant initialisation of sendto() address David Gibson
2023-12-18  7:40 ` [PATCH 04/11] icmp: Don't attempt to handle "wrong direction" ping socket traffic David Gibson
2023-12-18  7:40 ` [PATCH 05/11] icmp: Don't attempt to match host IDs to guest IDs David Gibson
2023-12-18  7:40 ` [PATCH 06/11] icmp: Use -1 to represent "missing" sockets David Gibson
2023-12-18  7:40 ` [PATCH 07/11] icmp: Simplify socket expiry scanning David Gibson
2023-12-18  7:40 ` [PATCH 08/11] icmp: Share more between IPv4 and IPv6 paths in icmp_tap_handler() David Gibson
2023-12-18  7:40 ` [PATCH 09/11] icmp: Consolidate icmp_sock_handler() with icmpv6_sock_handler() David Gibson
2023-12-18  7:40 ` [PATCH 10/11] icmp: Warn on receive errors from ping sockets David Gibson
2023-12-18  7:40 ` [PATCH 11/11] icmp: Validate packets received on " David Gibson

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=20231218074017.985092-3-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /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).