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

This is an initial commit of an implementation of the Chameleon

Browse source 
architecture for the Rime stack for Contiki. The Chameleon
architecture separates the header processing from the Rime protocol
logic. Instead of having each protocol create its own part of the
packet header, protocols use packet attributes. Before sending a
packet, a special Chameleon header processing module creates a packet
header from the packet attributes. The same Chameleon module parses
incoming packets and creates packet attributes from the header.

The details are in our SenSys 2007 paper:

Adam Dunkels, Fredrik Osterlind, Zhitao He. An Adaptive Communication
Architecture for Wireless Sensor Networks. In Proceedings of the Fifth
ACM Conference on Networked Embedded Sensor Systems (SenSys 2007),
Sydney, Australia, November 2007.

http://www.sics.se/~adam/dunkels07adaptive.pdf

This is a rewrite of the code that was developed for the paper.
This commit is contained in:
adamdunkels 2008-02-25 02:14:34 +00:00
parent 39abed8672
commit 412facb831
29 changed files with 1357 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

35
core/net/rime/uc.c
View file

@ -34,7 +34,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: uc.c,v 1.13 2008/02/24 22:05:27 adamdunkels Exp $
* $Id: uc.c,v 1.14 2008/02/25 02:14:35 adamdunkels Exp $
*/
/**
@ -48,13 +48,11 @@
#include "net/rime/uc.h"
#include <string.h>
/* XXX This is a hack: MAC protocols may use this address as the
receiver address of packets. */
rimeaddr_t uc_receiver;
struct uc_hdr {
rimeaddr_t receiver;
};
static const struct rimebuf_attrlist attributes[] =
{
UC_ATTRIBUTES
RIMEBUF_ATTR_LAST
};
#define DEBUG 0
#if DEBUG
@ -69,12 +67,12 @@ static void
recv_from_ibc(struct ibc_conn *ibc, rimeaddr_t *from)
{
struct uc_conn *c = (struct uc_conn *)ibc;
struct uc_hdr *hdr = rimebuf_dataptr();
PRINTF("%d.%d: uc: recv_from_ibc, receiver %d.%d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
hdr->receiver.u8[0], hdr->receiver.u8[1]);
if(rimeaddr_cmp(&hdr->receiver, &rimeaddr_node_addr)) {
rimebuf_hdrreduce(sizeof(struct uc_hdr));
rimebuf_addr(RIMEBUF_ADDR_RECEIVER)->u8[0],
rimebuf_addr(RIMEBUF_ADDR_RECEIVER)->u8[1]);
if(rimeaddr_cmp(rimebuf_addr(RIMEBUF_ADDR_RECEIVER), &rimeaddr_node_addr)) {
c->u->recv(c, from);
}
}
@ -87,6 +85,7 @@ uc_open(struct uc_conn *c, uint16_t channel,
{
ibc_open(&c->c, channel, &uc);
c->u = u;
channel_set_attributes(channel, attributes);
}
/*---------------------------------------------------------------------------*/
void
@ -101,16 +100,8 @@ uc_send(struct uc_conn *c, const rimeaddr_t *receiver)
PRINTF("%d.%d: uc_send to %d.%d\n",
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1],
receiver->u8[0], receiver->u8[1]);
if(rimebuf_hdralloc(sizeof(struct uc_hdr))) {
int ret;
struct uc_hdr *hdr = rimebuf_hdrptr();
rimeaddr_copy(&hdr->receiver, receiver);
rimeaddr_copy(&uc_receiver, receiver);
ret = ibc_send(&c->c);
rimeaddr_copy(&uc_receiver, &rimeaddr_null);
return ret;
}
return 0;
rimebuf_set_addr(RIMEBUF_ADDR_RECEIVER, receiver);
return ibc_send(&c->c);
}
/*---------------------------------------------------------------------------*/
/** @} */