Skip to content
Snippets Groups Projects
Commit 80b771af authored by Lucas Jenß's avatar Lucas Jenß
Browse files

Merge pull request #4266 from A-Paul/shell_ping6_addrerr

ping6: dedicated message at address parsing error
parents 849f6905 46f37297
No related branches found
No related tags found
No related merge requests found
...@@ -150,8 +150,7 @@ int _icmpv6_ping(int argc, char **argv) ...@@ -150,8 +150,7 @@ int _icmpv6_ping(int argc, char **argv)
ipv6_addr_t addr; ipv6_addr_t addr;
msg_t msg; msg_t msg;
gnrc_netreg_entry_t *ipv6_entry, my_entry = { NULL, ICMPV6_ECHO_REP, gnrc_netreg_entry_t *ipv6_entry, my_entry = { NULL, ICMPV6_ECHO_REP,
thread_getpid() thread_getpid() };
};
uint32_t min_rtt = UINT32_MAX, max_rtt = 0; uint32_t min_rtt = UINT32_MAX, max_rtt = 0;
uint64_t sum_rtt = 0; uint64_t sum_rtt = 0;
uint64_t ping_start; uint64_t ping_start;
...@@ -182,11 +181,16 @@ int _icmpv6_ping(int argc, char **argv) ...@@ -182,11 +181,16 @@ int _icmpv6_ping(int argc, char **argv)
stat_interval = atoi(argv[4 + param_offset]); stat_interval = atoi(argv[4 + param_offset]);
} }
if ((ipv6_addr_from_str(&addr, addr_str) == NULL) || (((int)payload_len) < 0)) { if ((int)payload_len < 0) {
usage(argv); usage(argv);
return 1; return 1;
} }
if (ipv6_addr_from_str(&addr, addr_str) == NULL) {
puts("error: malformed address");
return 1;
}
if (gnrc_netreg_register(GNRC_NETTYPE_ICMPV6, &my_entry) < 0) { if (gnrc_netreg_register(GNRC_NETTYPE_ICMPV6, &my_entry) < 0) {
puts("error: network registry is full"); puts("error: network registry is full");
return 1; return 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment