RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #3514 from authmillenon/shell/fix/icmpv6-stupid

Browse Source 
shell: sc_icmpv6_echo: prepare for stupid users
This commit is contained in:
Martine Lenders 2015-07-28 23:58:27 +02:00
commit 9aff73b4a9
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/shell/commands/sc_icmpv6_echo.c
View File

@ -118,6 +118,17 @@ int _handle_reply(ng_pktsnip_t *pkt, uint64_t time)
return 1;
}
static inline void _a_to_timex(timex_t *delay, const char *a)
{
int ms = atoi(a);
if (ms >= 0) {
delay->seconds = 0;
delay->microseconds = ms * 1000;
timex_normalize(delay);
}
}
int _icmpv6_ping(int argc, char **argv)
{
int count = 3, success = 0, remaining;
@ -165,9 +176,7 @@ int _icmpv6_ping(int argc, char **argv)
count = 3;
addr_str = argv[1];
payload_len = atoi(argv[2]);
delay.seconds = 0;
delay.microseconds = atoi(argv[3]) * 1000;
timex_normalize(&delay);
_a_to_timex(&delay, argv[3]);
}
break;
@ -176,13 +185,11 @@ int _icmpv6_ping(int argc, char **argv)
count = atoi(argv[1]);
addr_str = argv[2];
payload_len = atoi(argv[3]);
delay.seconds = 0;
delay.microseconds = atoi(argv[4]) * 1000;
timex_normalize(&delay);
_a_to_timex(&delay, argv[4]);
break;
}
if (ng_ipv6_addr_from_str(&addr, addr_str) == NULL) {
if ((ng_ipv6_addr_from_str(&addr, addr_str) == NULL) || (((int)payload_len) < 0)) {
usage(argv);
return 1;
}