michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: shell: Process Echo Replies without a timestamp

Browse source 
In case Echo Request did not carry timestamp (i. e. requested payload
size was smaller than 4), there won't be a timestamp in the reply
either. Such replies should not be ignored. Instead, simply skip the
turnround time calculation if timestamp is missing.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2022-11-17 15:40:57 +01:00 • committed by Anas Nashif
commit 0e388e64fd
1 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

70
subsys/net/ip/net_shell.c
View file

@ -3865,6 +3865,7 @@ static enum net_verdict handle_ipv6_echo_reply(struct net_pkt *pkt,
struct net_icmpv6_echo_req); struct net_icmpv6_echo_req);
struct net_icmpv6_echo_req *icmp_echo; struct net_icmpv6_echo_req *icmp_echo;
uint32_t cycles; uint32_t cycles;
char time_buf[16] = { 0 };
icmp_echo = (struct net_icmpv6_echo_req *)net_pkt_get_data(pkt, icmp_echo = (struct net_icmpv6_echo_req *)net_pkt_get_data(pkt,
&icmp_access); &icmp_access);
@ -3873,21 +3874,30 @@ static enum net_verdict handle_ipv6_echo_reply(struct net_pkt *pkt,
} }
net_pkt_skip(pkt, sizeof(*icmp_echo)); net_pkt_skip(pkt, sizeof(*icmp_echo));
if (net_pkt_read_be32(pkt, &cycles)) {
return -NET_DROP;
}
cycles = k_cycle_get_32() - cycles; if (net_pkt_remaining_data(pkt) >= sizeof(uint32_t)) {
if (net_pkt_read_be32(pkt, &cycles)) {
return -NET_DROP;
}
cycles = k_cycle_get_32() - cycles;
snprintf(time_buf, sizeof(time_buf),
#ifdef CONFIG_FPU
"time=%.2f ms",
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f)
#else
"time=%d ms",
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000)
#endif
);
}
PR_SHELL(shell_for_ping, "%d bytes from %s to %s: icmp_seq=%d ttl=%d " PR_SHELL(shell_for_ping, "%d bytes from %s to %s: icmp_seq=%d ttl=%d "
#ifdef CONFIG_IEEE802154 #ifdef CONFIG_IEEE802154
"rssi=%d " "rssi=%d "
#endif #endif
#ifdef CONFIG_FPU "%s\n",
"time=%.2f ms\n",
#else
"time=%d ms\n",
#endif
ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) - ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) -
NET_ICMPH_LEN, NET_ICMPH_LEN,
net_sprint_ipv6_addr(&ip_hdr->src), net_sprint_ipv6_addr(&ip_hdr->src),
@ -3897,11 +3907,8 @@ static enum net_verdict handle_ipv6_echo_reply(struct net_pkt *pkt,
#ifdef CONFIG_IEEE802154 #ifdef CONFIG_IEEE802154
net_pkt_ieee802154_rssi(pkt), net_pkt_ieee802154_rssi(pkt),
#endif #endif
#ifdef CONFIG_FPU time_buf);
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f));
#else
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000));
#endif
k_sem_give(&ping_timeout); k_sem_give(&ping_timeout);
net_pkt_unref(pkt); net_pkt_unref(pkt);
@ -4001,6 +4008,7 @@ static enum net_verdict handle_ipv4_echo_reply(struct net_pkt *pkt,
struct net_icmpv4_echo_req); struct net_icmpv4_echo_req);
uint32_t cycles; uint32_t cycles;
struct net_icmpv4_echo_req *icmp_echo; struct net_icmpv4_echo_req *icmp_echo;
char time_buf[16] = { 0 };
icmp_echo = (struct net_icmpv4_echo_req *)net_pkt_get_data(pkt, icmp_echo = (struct net_icmpv4_echo_req *)net_pkt_get_data(pkt,
&icmp_access); &icmp_access);
@ -4009,29 +4017,35 @@ static enum net_verdict handle_ipv4_echo_reply(struct net_pkt *pkt,
} }
net_pkt_skip(pkt, sizeof(*icmp_echo)); net_pkt_skip(pkt, sizeof(*icmp_echo));
if (net_pkt_read_be32(pkt, &cycles)) {
return -NET_DROP; if (net_pkt_remaining_data(pkt) >= sizeof(uint32_t)) {
if (net_pkt_read_be32(pkt, &cycles)) {
return -NET_DROP;
}
cycles = k_cycle_get_32() - cycles;
snprintf(time_buf, sizeof(time_buf),
#ifdef CONFIG_FPU
"time=%.2f ms",
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f)
#else
"time=%d ms",
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000)
#endif
);
} }
cycles = k_cycle_get_32() - cycles;
PR_SHELL(shell_for_ping, "%d bytes from %s to %s: icmp_seq=%d ttl=%d " PR_SHELL(shell_for_ping, "%d bytes from %s to %s: icmp_seq=%d ttl=%d "
#ifdef CONFIG_FPU "%s\n",
"time=%.2f ms\n",
#else
"time=%d ms\n",
#endif
ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) - ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) -
NET_ICMPH_LEN, NET_ICMPH_LEN,
net_sprint_ipv4_addr(&ip_hdr->src), net_sprint_ipv4_addr(&ip_hdr->src),
net_sprint_ipv4_addr(&ip_hdr->dst), net_sprint_ipv4_addr(&ip_hdr->dst),
ntohs(icmp_echo->sequence), ntohs(icmp_echo->sequence),
ip_hdr->ttl, ip_hdr->ttl,
#ifdef CONFIG_FPU time_buf);
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f));
#else
((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000));
#endif
k_sem_give(&ping_timeout); k_sem_give(&ping_timeout);
net_pkt_unref(pkt); net_pkt_unref(pkt);