deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added support for sniffing for packet attributes for both incoming and outgoing packets

Browse source
This commit is contained in:
adamdunkels 2009-03-02 21:58:16 +00:00
parent 78591a003f
commit d52a527752
1 changed files with 71 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
apps/shell/shell-rime-sniff.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: shell-rime-sniff.c,v 1.1 2008/02/04 23:42:17 adamdunkels Exp $ * $Id: shell-rime-sniff.c,v 1.2 2009/03/02 21:58:16 adamdunkels Exp $
*/ */
/** /**
@ -40,6 +40,9 @@
#include "shell.h" #include "shell.h"
#include "net/rime.h" #include "net/rime.h"
static uint8_t sniff_for_attributes;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(shell_sniff_process, "sniff"); PROCESS(shell_sniff_process, "sniff");
SHELL_COMMAND(sniff_command, SHELL_COMMAND(sniff_command,
@ -48,36 +51,76 @@ SHELL_COMMAND(sniff_command,
&shell_sniff_process); &shell_sniff_process);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
enum { enum {
SNIFFER_INPUT, SNIFFER_PACKET_INPUT,
SNIFFER_OUTPUT, SNIFFER_PACKET_OUTPUT,
SNIFFER_ATTRIBUTES_INPUT,
SNIFFER_ATTRIBUTES_OUTPUT,
};
/*---------------------------------------------------------------------------*/
struct sniff_attributes_blob {
uint16_t len;
uint16_t type;
uint16_t rssi;
uint16_t lqi;
uint16_t timestamp;
uint16_t listen_time;
uint16_t transmit_time;
uint16_t channel;
rimeaddr_t src, dest;
};
struct sniff_packet_blob {
uint16_t len;
uint16_t type;
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
input_sniffer(void) sniff_attributes_output(int type)
{ {
struct { struct sniff_attributes_blob msg;
uint16_t len; msg.len = 10;
uint16_t flags; msg.type = type;
} msg; msg.rssi = rimebuf_attr(RIMEBUF_ATTR_RSSI);
msg.lqi = rimebuf_attr(RIMEBUF_ATTR_LINK_QUALITY);
msg.timestamp = rimebuf_attr(RIMEBUF_ATTR_TIMESTAMP);
msg.listen_time = rimebuf_attr(RIMEBUF_ATTR_LISTEN_TIME);
msg.transmit_time = rimebuf_attr(RIMEBUF_ATTR_TRANSMIT_TIME);
msg.channel = rimebuf_attr(RIMEBUF_ATTR_CHANNEL);
rimeaddr_copy(&msg.src, rimebuf_addr(RIMEBUF_ADDR_SENDER));
rimeaddr_copy(&msg.dest, rimebuf_addr(RIMEBUF_ADDR_RECEIVER));
shell_output(&sniff_command, &msg, sizeof(msg), NULL, 0);
}
/*---------------------------------------------------------------------------*/
static void
sniff_packet_output(int type)
{
struct sniff_packet_blob msg;
msg.len = rimebuf_totlen() / 2 + 1; msg.len = rimebuf_totlen() / 2 + 1;
msg.flags = SNIFFER_INPUT; msg.type = type;
shell_output(&sniff_command, &msg, sizeof(msg), shell_output(&sniff_command, &msg, sizeof(msg),
rimebuf_dataptr(), (rimebuf_datalen() & 0xfffe) + rimebuf_dataptr(), (rimebuf_datalen() & 0xfffe) +
2 * (rimebuf_totlen() & 1)); 2 * (rimebuf_totlen() & 1));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
input_sniffer(void)
{
if(sniff_for_attributes) {
sniff_attributes_output(SNIFFER_ATTRIBUTES_INPUT);
} else {
sniff_packet_output(SNIFFER_PACKET_INPUT);
}
}
/*---------------------------------------------------------------------------*/
static void
output_sniffer(void) output_sniffer(void)
{ {
struct { if(sniff_for_attributes) {
uint16_t len; sniff_attributes_output(SNIFFER_ATTRIBUTES_OUTPUT);
uint16_t flags; } else {
} msg; sniff_packet_output(SNIFFER_PACKET_OUTPUT);
msg.len = rimebuf_totlen() / 2 + 1; }
msg.flags = SNIFFER_OUTPUT;
shell_output(&sniff_command, &msg, sizeof(msg),
rimebuf_hdrptr(), (rimebuf_totlen() & 0xfffe) +
2 * (rimebuf_totlen() & 1));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(shell_sniff_process, ev, data) PROCESS_THREAD(shell_sniff_process, ev, data)
@ -86,6 +129,16 @@ PROCESS_THREAD(shell_sniff_process, ev, data)
PROCESS_EXITHANDLER(goto exit;); PROCESS_EXITHANDLER(goto exit;);
PROCESS_BEGIN(); PROCESS_BEGIN();
sniff_for_attributes = 0;
if(data != NULL) {
char *arg = data;
if(arg[0] == '-' &&
arg[1] == 'a') {
sniff_for_attributes = 1;
}
}
rime_sniffer_add(&s); rime_sniffer_add(&s);
PROCESS_WAIT_EVENT_UNTIL(ev == shell_event_input); PROCESS_WAIT_EVENT_UNTIL(ev == shell_event_input);