shell: add icmpv6_echo shell handler
This commit is contained in:
Martine Lenders
Martine Lenders
parent
86133b8404
commit
229f49ad5d
@ -64,6 +64,9 @@ endif
|
||||
ifneq (,$(filter ng_ipv6_nc,$(USEMODULE)))
|
||||
SRC += sc_ipv6_nc.c
|
||||
endif
|
||||
ifneq (,$(filter ng_icmpv6_echo vtimer,$(USEMODULE)))
|
||||
SRC += sc_icmpv6_echo.c
|
||||
endif
|
||||
|
||||
# TODO
|
||||
# Conditional building not possible at the moment due to
|
||||
|
||||
240
sys/shell/commands/sc_icmpv6_echo.c
Normal file
240
sys/shell/commands/sc_icmpv6_echo.c
Normal file
@ -0,0 +1,240 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Martine Lenders <mlenders@inf.fu-berlin.de>
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU Lesser General
|
||||
* Public License v2.1. See the file LICENSE in the top level directory for
|
||||
* more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup sys_shell_commands
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
*
|
||||
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef MODULE_NG_ICMPV6
|
||||
|
||||
#include "byteorder.h"
|
||||
#include "net/ng_icmpv6.h"
|
||||
#include "net/ng_ipv6/addr.h"
|
||||
#include "net/ng_ipv6/hdr.h"
|
||||
#include "net/ng_netbase.h"
|
||||
#include "thread.h"
|
||||
#include "utlist.h"
|
||||
#include "vtimer.h"
|
||||
|
||||
static uint16_t id = 0x53;
|
||||
static uint16_t seq = 1;
|
||||
static char ipv6_str[NG_IPV6_ADDR_MAX_STR_LEN];
|
||||
|
||||
static void usage(char **argv)
|
||||
{
|
||||
printf("%s [<n>] <ipv6 addr> [<payload_len>]\n", argv[0]);
|
||||
}
|
||||
|
||||
void _set_payload(ng_icmpv6_echo_t *hdr, size_t payload_len)
|
||||
{
|
||||
size_t i = 0;
|
||||
uint8_t *payload = (uint8_t *)(hdr + 1);
|
||||
|
||||
while (i < payload_len) {
|
||||
if (seq > 0xff) {
|
||||
payload[i] = (uint8_t)(seq >> 8);
|
||||
payload[i + 1] = (uint8_t)(seq & 0xff);
|
||||
i += 2;
|
||||
}
|
||||
else {
|
||||
payload[i++] = (uint8_t)(seq & 0xff);
|
||||
}
|
||||
}
|
||||
|
||||
if (i > payload_len) {
|
||||
payload[payload_len - 1] = seq >> 8;
|
||||
}
|
||||
}
|
||||
|
||||
int _handle_reply(ng_pktsnip_t *pkt, uint64_t time)
|
||||
{
|
||||
ng_pktsnip_t *ipv6, *icmpv6;
|
||||
ng_ipv6_hdr_t *ipv6_hdr;
|
||||
ng_icmpv6_echo_t *icmpv6_hdr;
|
||||
|
||||
LL_SEARCH_SCALAR(pkt, ipv6, type, NG_NETTYPE_IPV6);
|
||||
LL_SEARCH_SCALAR(pkt, icmpv6, type, NG_NETTYPE_ICMPV6);
|
||||
|
||||
if ((ipv6 == NULL) || (icmpv6 == NULL)) {
|
||||
puts("error: IPv6 header or ICMPv6 header not found in reply");
|
||||
return 0;
|
||||
}
|
||||
|
||||
ipv6_hdr = ipv6->data;
|
||||
icmpv6_hdr = icmpv6->data;
|
||||
|
||||
if ((byteorder_ntohs(icmpv6_hdr->id) == id) &&
|
||||
(byteorder_ntohs(icmpv6_hdr->seq) == seq)) {
|
||||
printf("%zu bytes from %s: id=%" PRIu16 " seq=%" PRIu16 " hop limit=%" PRIu8
|
||||
"time = %" PRIu64 ".%03" PRIu64 " ms\n", icmpv6->size,
|
||||
ng_ipv6_addr_to_str(ipv6_str, &(ipv6_hdr->src), sizeof(ipv6_str)),
|
||||
byteorder_ntohs(icmpv6_hdr->id), byteorder_ntohs(icmpv6_hdr->seq),
|
||||
ipv6_hdr->hl, time / MS_IN_USEC, time % MS_IN_USEC);
|
||||
}
|
||||
else {
|
||||
puts("error: unexpected parameters");
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int _icmpv6_ping(int argc, char **argv)
|
||||
{
|
||||
int n = 3, success = 0, count;
|
||||
size_t payload_len = 4;
|
||||
char *addr_str;
|
||||
ng_ipv6_addr_t addr;
|
||||
ng_netreg_entry_t *ipv6_entry, my_entry = { NULL, NG_ICMPV6_ECHO_REP,
|
||||
thread_getpid()
|
||||
};
|
||||
timex_t min_rtt = { UINT32_MAX, UINT32_MAX }, max_rtt = { 0, 0 };
|
||||
timex_t sum_rtt = { 0, 0 };
|
||||
|
||||
switch (argc) {
|
||||
case 1:
|
||||
usage(argv);
|
||||
return 1;
|
||||
|
||||
case 2:
|
||||
addr_str = argv[1];
|
||||
break;
|
||||
|
||||
case 3:
|
||||
n = atoi(argv[1]);
|
||||
addr_str = argv[2];
|
||||
break;
|
||||
|
||||
case 4:
|
||||
default:
|
||||
n = atoi(argv[1]);
|
||||
addr_str = argv[2];
|
||||
payload_len = atoi(argv[3]);
|
||||
break;
|
||||
}
|
||||
|
||||
if (ng_ipv6_addr_from_str(&addr, addr_str) == NULL) {
|
||||
usage(argv);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (ng_netreg_register(NG_NETTYPE_ICMPV6, &my_entry) < 0) {
|
||||
puts("error: network registry is full");
|
||||
return 1;
|
||||
}
|
||||
|
||||
ipv6_entry = ng_netreg_lookup(NG_NETTYPE_IPV6, NG_NETREG_DEMUX_CTX_ALL);
|
||||
|
||||
if (ipv6_entry == NULL) {
|
||||
puts("error: ipv6 thread missing");
|
||||
return 1;
|
||||
}
|
||||
|
||||
count = n;
|
||||
|
||||
while ((count--) > 0) {
|
||||
msg_t msg;
|
||||
ng_pktsnip_t *pkt;
|
||||
timex_t start, stop, timeout = { 5, 0 };
|
||||
|
||||
pkt = ng_icmpv6_echo_req_build(id, seq, NULL, payload_len);
|
||||
|
||||
if (pkt == NULL) {
|
||||
puts("error: packet buffer full");
|
||||
return 1;
|
||||
}
|
||||
|
||||
_set_payload(pkt->data, payload_len);
|
||||
|
||||
pkt = ng_netreg_hdr_build(NG_NETTYPE_IPV6, pkt, NULL, 0, addr.u8,
|
||||
sizeof(ng_ipv6_addr_t));
|
||||
|
||||
if (pkt == NULL) {
|
||||
puts("error: packet buffer full");
|
||||
return 1;
|
||||
}
|
||||
|
||||
vtimer_now(&start);
|
||||
ng_netapi_send(ipv6_entry->pid, pkt);
|
||||
|
||||
if (vtimer_msg_receive_timeout(&msg, timeout) >= 0) {
|
||||
switch (msg.type) {
|
||||
case NG_NETAPI_MSG_TYPE_RCV:
|
||||
vtimer_now(&stop);
|
||||
stop = timex_sub(stop, start);
|
||||
success += _handle_reply((ng_pktsnip_t *)msg.content.ptr,
|
||||
timex_uint64(stop));
|
||||
|
||||
if (timex_cmp(stop, max_rtt) > 0) {
|
||||
max_rtt = stop;
|
||||
}
|
||||
|
||||
if (timex_cmp(stop, min_rtt) < 1) {
|
||||
min_rtt = stop;
|
||||
}
|
||||
|
||||
sum_rtt = timex_add(sum_rtt, stop);
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
/* requeue wrong packets */
|
||||
msg_send(&msg, thread_getpid());
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
puts("ping timeout");
|
||||
}
|
||||
|
||||
seq++;
|
||||
}
|
||||
|
||||
seq = 1;
|
||||
id++;
|
||||
|
||||
ng_netreg_unregister(NG_NETTYPE_ICMPV6, &my_entry);
|
||||
|
||||
printf("--- %s ping statistics ---\n", addr_str);
|
||||
|
||||
if (success > 0) {
|
||||
printf("%d packets transmitted, %d received, %d%% packet loss, time %"
|
||||
PRIu64 " ms\n", n, success, (success - n) / n,
|
||||
timex_uint64(sum_rtt) / MS_IN_USEC);
|
||||
uint64_t avg_rtt = timex_uint64(sum_rtt) / n; /* get average */
|
||||
printf("rtt min/avg/max = "
|
||||
"%" PRIu64 ".%03" PRIu64 "/"
|
||||
"%" PRIu64 ".%03" PRIu64 "/"
|
||||
"%" PRIu64 ".%03" PRIu64 " ms\n",
|
||||
timex_uint64(min_rtt) / MS_IN_USEC,
|
||||
timex_uint64(min_rtt) % MS_IN_USEC,
|
||||
avg_rtt / MS_IN_USEC, avg_rtt % MS_IN_USEC, /* sum is now avg, see above */
|
||||
timex_uint64(max_rtt) / MS_IN_USEC,
|
||||
timex_uint64(max_rtt) % MS_IN_USEC);
|
||||
}
|
||||
else {
|
||||
printf("%d packets transmitted, 0 received, 100%% packet loss\n", n);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
@ -145,6 +145,12 @@ extern int _read_sector(int argc, char **argv);
|
||||
extern int _read_bytes(int argc, char **argv);
|
||||
#endif
|
||||
|
||||
#ifdef MODULE_NG_ICMPV6_ECHO
|
||||
#ifdef MODULE_VTIMER
|
||||
extern int _icmpv6_ping(int argc, char **argv);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef MODULE_RANDOM
|
||||
extern int _mersenne_init(int argc, char **argv);
|
||||
extern int _mersenne_get(int argc, char **argv);
|
||||
@ -250,6 +256,11 @@ const shell_command_t _shell_command_list[] = {
|
||||
{DISK_GET_SECTOR_COUNT, "Get the sector count of inserted memory card", _get_sectorcount},
|
||||
{DISK_GET_BLOCK_SIZE, "Get the block size of inserted memory card", _get_blocksize},
|
||||
#endif
|
||||
#ifdef MODULE_NG_ICMPV6_ECHO
|
||||
#ifdef MODULE_VTIMER
|
||||
{ "ping6", "Ping via ICMPv6", _icmpv6_ping },
|
||||
#endif
|
||||
#endif
|
||||
#ifdef MODULE_RANDOM
|
||||
{ "mersenne_init", "initializes the PRNG", _mersenne_init },
|
||||
{ "mersenne_get", "returns 32 bit of pseudo randomness", _mersenne_get },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user