mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

icmp: Remove redundant id field from flow table entry

Browse source 
struct icmp_ping_flow contains a field for the ICMP id of the ping, but
this is now redundant, since the id is also stored as the "port" in the
common flowsides.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-07-18 15:26:37 +10:00 committed by Stefano Brivio
parent 508adde342
commit 5cffb1bf64
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icmp.c
View file

@ -74,6 +74,7 @@ static struct icmp_ping_flow *ping_at_sidx(flow_sidx_t sidx)
void icmp_sock_handler(const struct ctx *c, union epoll_ref ref) void icmp_sock_handler(const struct ctx *c, union epoll_ref ref)
{ {
struct icmp_ping_flow *pingf = ping_at_sidx(ref.flowside); struct icmp_ping_flow *pingf = ping_at_sidx(ref.flowside);
const struct flowside *ini = &pingf->f.side[INISIDE];
union sockaddr_inany sr; union sockaddr_inany sr;
socklen_t sl = sizeof(sr); socklen_t sl = sizeof(sr);
char buf[USHRT_MAX]; char buf[USHRT_MAX];
@ -99,7 +100,7 @@ void icmp_sock_handler(const struct ctx *c, union epoll_ref ref)
goto unexpected; goto unexpected;
/* Adjust packet back to guest-side ID */ /* Adjust packet back to guest-side ID */
ih4->un.echo.id = htons(pingf->id); ih4->un.echo.id = htons(ini->eport);
seq = ntohs(ih4->un.echo.sequence); seq = ntohs(ih4->un.echo.sequence);
} else if (pingf->f.type == FLOW_PING6) { } else if (pingf->f.type == FLOW_PING6) {
struct icmp6hdr *ih6 = (struct icmp6hdr *)buf; struct icmp6hdr *ih6 = (struct icmp6hdr *)buf;
@ -109,7 +110,7 @@ void icmp_sock_handler(const struct ctx *c, union epoll_ref ref)
goto unexpected; goto unexpected;
/* Adjust packet back to guest-side ID */ /* Adjust packet back to guest-side ID */
ih6->icmp6_identifier = htons(pingf->id); ih6->icmp6_identifier = htons(ini->eport);
seq = ntohs(ih6->icmp6_sequence); seq = ntohs(ih6->icmp6_sequence);
} else { } else {
ASSERT(0); ASSERT(0);
@ -124,7 +125,7 @@ void icmp_sock_handler(const struct ctx *c, union epoll_ref ref)
} }
flow_dbg(pingf, "echo reply to tap, ID: %"PRIu16", seq: %"PRIu16, flow_dbg(pingf, "echo reply to tap, ID: %"PRIu16", seq: %"PRIu16,
pingf->id, seq); ini->eport, seq);
if (pingf->f.type == FLOW_PING4) if (pingf->f.type == FLOW_PING4)
tap_icmp4_send(c, sr.sa4.sin_addr, tap_ip4_daddr(c), buf, n); tap_icmp4_send(c, sr.sa4.sin_addr, tap_ip4_daddr(c), buf, n);
@ -145,7 +146,7 @@ unexpected:
static void icmp_ping_close(const struct ctx *c, static void icmp_ping_close(const struct ctx *c,
const struct icmp_ping_flow *pingf) const struct icmp_ping_flow *pingf)
{ {
uint16_t id = pingf->id; uint16_t id = pingf->f.side[INISIDE].eport;
epoll_ctl(c->epollfd, EPOLL_CTL_DEL, pingf->sock, NULL); epoll_ctl(c->epollfd, EPOLL_CTL_DEL, pingf->sock, NULL);
close(pingf->sock); close(pingf->sock);
@ -188,7 +189,6 @@ static struct icmp_ping_flow *icmp_ping_new(const struct ctx *c,
pingf = FLOW_SET_TYPE(flow, flowtype, ping); pingf = FLOW_SET_TYPE(flow, flowtype, ping);
pingf->seq = -1; pingf->seq = -1;
pingf->id = id;
if (af == AF_INET) { if (af == AF_INET) {
bind_addr = &c->ip4.addr_out; bind_addr = &c->ip4.addr_out;

2
icmp_flow.h
View file

@ -13,7 +13,6 @@
* @seq: Last sequence number sent to tap, host order, -1: not sent yet * @seq: Last sequence number sent to tap, host order, -1: not sent yet
* @sock: "ping" socket * @sock: "ping" socket
* @ts: Last associated activity from tap, seconds * @ts: Last associated activity from tap, seconds
* @id: ICMP id for the flow as seen by the guest
*/ */
struct icmp_ping_flow { struct icmp_ping_flow {
/* Must be first element */ /* Must be first element */
@ -22,7 +21,6 @@ struct icmp_ping_flow {
int seq; int seq;
int sock; int sock;
time_t ts; time_t ts;
uint16_t id;
}; };
bool icmp_ping_timer(const struct ctx *c, const struct icmp_ping_flow *pingf, bool icmp_ping_timer(const struct ctx *c, const struct icmp_ping_flow *pingf,