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

Reworked the Rime/Chameleon interface so that packets now always hit Rime before Chameleon. Chameleon is now only called by Rime. This makes packet sniffing easier, and allows for sniffing packets after their header has been processed by Chameleon, thereby making per-packet power profiling much easier to implement

Browse source
This commit is contained in:
adamdunkels 2010-02-23 18:29:53 +00:00
parent d8cce42d28
commit b746b7fc06
4 changed files with 35 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/net/rime/chameleon.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: chameleon.c,v 1.8 2010/02/18 21:48:39 adamdunkels Exp $
* $Id: chameleon.c,v 1.9 2010/02/23 18:29:53 adamdunkels Exp $
*/
/**
@ -101,10 +101,10 @@ printhdr(uint8_t *hdr, int len)
}
#endif /* DEBUG */
/*---------------------------------------------------------------------------*/
void
chameleon_input(void)
struct channel *
chameleon_parse(void)
{
struct channel *c;
struct channel *c = NULL;
PRINTF("%d.%d: chameleon_input\n",
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1]);
#if DEBUG
@ -117,16 +117,16 @@ chameleon_input(void)
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1],
c->channelno);
packetbuf_set_attr(PACKETBUF_ATTR_CHANNEL, c->channelno);
abc_input(c);
} else {
PRINTF("%d.%d: chameleon_input channel not found for incoming packet\n",
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1]);
}
}
return c;
}
/*---------------------------------------------------------------------------*/
int
chameleon_output(struct channel *c)
chameleon_create(struct channel *c)
{
int ret;
@ -141,7 +141,6 @@ chameleon_output(struct channel *c)
printhdr(packetbuf_hdrptr(), packetbuf_hdrlen());
#endif /* DEBUG */
if(ret) {
rime_output();
return 1;
}
}