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

added powertrace to IPv6 including an example

Browse source
This commit is contained in:
Joakim Eriksson 2011-10-13 15:09:40 +02:00
parent d711887a1b
commit cf61e522a8
5 changed files with 736 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

58
core/net/sicslowpan.c
View file

@ -159,6 +159,7 @@ void uip_log(char *msg);
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLIPH_LEN])
#define UIP_TCP_BUF ((struct uip_tcp_hdr *)&uip_buf[UIP_LLIPH_LEN])
#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[UIP_LLIPH_LEN])
/** @} */
@ -258,6 +259,52 @@ static struct timer reass_timer;
#define sicslowpan_len uip_len
#endif /* SICSLOWPAN_CONF_FRAG */
/*-------------------------------------------------------------------------*/
/* Rime Sniffer support for one single listener to enable powertrace of IP */
/*-------------------------------------------------------------------------*/
static struct rime_sniffer *callback = NULL;
void
rime_sniffer_add(struct rime_sniffer *s) {
callback = s;
}
void
rime_sniffer_remove(struct rime_sniffer *s) {
callback = NULL;
}
static void
set_packet_attrs() {
int c = 0;
/* set protocol in NETWORK_ID */
packetbuf_set_attr(PACKETBUF_ATTR_NETWORK_ID, UIP_IP_BUF->proto);
/* assign values to the channel attribute (port or type + code) */
if(UIP_IP_BUF->proto == UIP_PROTO_UDP) {
c = UIP_UDP_BUF->srcport;
if(UIP_UDP_BUF->destport < c) {
c = UIP_UDP_BUF->destport;
}
} else if(UIP_IP_BUF->proto == UIP_PROTO_TCP) {
c = UIP_TCP_BUF->srcport;
if(UIP_TCP_BUF->destport < c) {
c = UIP_TCP_BUF->destport;
}
} else if(UIP_IP_BUF->proto == UIP_PROTO_ICMP6) {
c = UIP_ICMP_BUF->type << 8 | UIP_ICMP_BUF->icode;
}
packetbuf_set_attr(PACKETBUF_ATTR_CHANNEL, c);
/* if(uip_ds6_is_my_addr(&UIP_IP_BUF->srcipaddr)) { */
/* own = 1; */
/* } */
}
#if SICSLOWPAN_COMPRESSION == SICSLOWPAN_COMPRESSION_HC06
/** \name HC06 specific variables
* @{
@ -1301,6 +1348,11 @@ output(uip_lladdr_t *localdest)
/* The MAC address of the destination of the packet */
rimeaddr_t dest;
if (callback) {
set_packet_attrs();
callback->output_callback(0);
}
/* init */
uncomp_hdr_len = 0;
rime_hdr_len = 0;
@ -1686,6 +1738,12 @@ input(void)
neighbor_info_packet_received();
#endif /* SICSLOWPAN_CONF_NEIGHBOR_INFO */
/* if callback is set then set attributes and call */
if (callback) {
set_packet_attrs();
callback->input_callback();
}
tcpip_input();
#if SICSLOWPAN_CONF_FRAG
}