loic/net-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: edge case on multiple host

Browse source
This commit is contained in:
lohhiiccc 2026-03-19 01:11:49 +01:00
parent 896aa30726
commit 18432a527c
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/ping/core/callback.c
View file

@ -4,11 +4,11 @@
/* Forward declarations */ /* Forward declarations */
static int extract_our_echo(const icmp_reply_t *reply, uint16_t our_id, static int extract_our_echo(const icmp_reply_t *reply, uint16_t our_id,
uint16_t *seq_out); struct in_addr dest, uint16_t *seq_out);
static void handle_echo_reply(struct ping_state *state, static void handle_echo_reply(struct ping_state *state,
const icmp_reply_t *reply); const icmp_reply_t *reply);
static int extract_our_error(const icmp_reply_t *reply, uint16_t our_id, static int extract_our_error(const icmp_reply_t *reply, uint16_t our_id,
icmp_offending_packet_t *out, uint16_t *seq_out); struct in_addr dest, icmp_offending_packet_t *out, uint16_t *seq_out);
static void handle_icmp_error(struct ping_state *state, static void handle_icmp_error(struct ping_state *state,
const icmp_reply_t *reply); const icmp_reply_t *reply);
/* -------------------- */ /* -------------------- */
@ -28,14 +28,14 @@ ping_callback(const icmp_reply_t *reply, void *userdata)
static int static int
extract_our_echo(const icmp_reply_t *reply, uint16_t our_id, extract_our_echo(const icmp_reply_t *reply, uint16_t our_id,
uint16_t *seq_out) struct in_addr dest, uint16_t *seq_out)
{ {
uint16_t id; uint16_t id;
uint16_t seq; uint16_t seq;
if (0 > icmp_reply_id_seq(reply, &id, &seq)) if (0 > icmp_reply_id_seq(reply, &id, &seq))
return 0; return 0;
if (our_id != id) if (our_id != id || reply->from.s_addr != dest.s_addr)
return 0; return 0;
*seq_out = seq; *seq_out = seq;
return 1; return 1;
@ -47,7 +47,7 @@ handle_echo_reply(struct ping_state *state, const icmp_reply_t *reply)
uint16_t seq; uint16_t seq;
int64_t rtt; int64_t rtt;
if (0 == extract_our_echo(reply, state->id, &seq)) if (0 == extract_our_echo(reply, state->id, state->dest, &seq))
return; return;
rtt = ping_tracker_record_recv(state->tracker, seq, &reply->timestamp); rtt = ping_tracker_record_recv(state->tracker, seq, &reply->timestamp);
if (0 > rtt) if (0 > rtt)
@ -62,13 +62,11 @@ handle_echo_reply(struct ping_state *state, const icmp_reply_t *reply)
static int static int
extract_our_error(const icmp_reply_t *reply, uint16_t our_id, extract_our_error(const icmp_reply_t *reply, uint16_t our_id,
icmp_offending_packet_t *out, uint16_t *seq_out) struct in_addr dest, icmp_offending_packet_t *out, uint16_t *seq_out)
{ {
if (0 > icmp_error_extract_offending(reply, out)) if ((0 > icmp_error_extract_offending(reply, out))
return 0; || ICMP_TYPE_ECHO_REQUEST != out->icmp_type
if (ICMP_TYPE_ECHO_REQUEST != out->icmp_type) || our_id != out->rest.echo.id || out->dst.s_addr != dest.s_addr)
return 0;
if (our_id != out->rest.echo.id)
return 0; return 0;
*seq_out = out->rest.echo.seq; *seq_out = out->rest.echo.seq;
return 1; return 1;
@ -80,7 +78,7 @@ handle_icmp_error(struct ping_state *state, const icmp_reply_t *reply)
icmp_offending_packet_t offending; icmp_offending_packet_t offending;
uint16_t seq; uint16_t seq;
if (0 == extract_our_error(reply, state->id, &offending, &seq)) if (0 == extract_our_error(reply, state->id, state->dest, &offending, &seq))
return; return;
if (0 > ping_tracker_record_recv(state->tracker, seq, &reply->timestamp)) if (0 > ping_tracker_record_recv(state->tracker, seq, &reply->timestamp))
return; return;