aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2024-01-16 16:16:08 +1100
committerStefano Brivio <sbrivio@redhat.com>2024-01-22 23:36:32 +0100
commit5dffb998925376440aa09ac48523b86fa96381ee (patch)
tree12025e193032e670b64c80784fd1dada2a3fb5b1
parent8981a720aac4ab22beb3375cd77062a8aed693e6 (diff)
downloadpasst-5dffb998925376440aa09ac48523b86fa96381ee.tar
passt-5dffb998925376440aa09ac48523b86fa96381ee.tar.gz
passt-5dffb998925376440aa09ac48523b86fa96381ee.tar.bz2
passt-5dffb998925376440aa09ac48523b86fa96381ee.tar.lz
passt-5dffb998925376440aa09ac48523b86fa96381ee.tar.xz
passt-5dffb998925376440aa09ac48523b86fa96381ee.tar.zst
passt-5dffb998925376440aa09ac48523b86fa96381ee.zip
icmp: Don't set "port" on destination sockaddr for ping sockets
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). For unclear reasons this change triggers cppcheck 2.13.0 to give new "variable could be const pointer" warnings, so make *ih const as well to fix that. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r--icmp.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/icmp.c b/icmp.c
index 325dfb0..ca039f0 100644
--- a/icmp.c
+++ b/icmp.c
@@ -172,7 +172,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
.sin_addr = IN4ADDR_ANY_INIT,
};
union icmp_epoll_ref iref;
- struct icmphdr *ih;
+ const struct icmphdr *ih;
int id, s;
ih = packet_get(p, 0, 0, sizeof(*ih), &plen);
@@ -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) {
@@ -219,7 +217,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
.sin6_scope_id = c->ifi6,
};
union icmp_epoll_ref iref;
- struct icmp6hdr *ih;
+ const struct icmp6hdr *ih;
int id, s;
ih = packet_get(p, 0, 0, sizeof(struct icmp6hdr), &plen);
@@ -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,