The multihop module used the pre-chameleon style packet headers. Converted it to use packet attributes instead of packet headers

This commit is contained in:
adamdunkels 2009-03-23 16:20:37 +00:00
parent c791d851bb
commit 143bf11548
2 changed files with 29 additions and 34 deletions

View file

@ -58,7 +58,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: multihop.h,v 1.4 2009/03/12 21:58:21 adamdunkels Exp $
* $Id: multihop.h,v 1.5 2009/03/23 16:20:37 adamdunkels Exp $
*/
/**
@ -78,20 +78,20 @@ struct multihop_conn;
#define MULTIHOP_ATTRIBUTES { PACKETBUF_ADDR_ESENDER, PACKETBUF_ADDRSIZE }, \
{ PACKETBUF_ADDR_ERECEIVER, PACKETBUF_ADDRSIZE }, \
{ PACKETBUF_ATTR_TTL, PACKETBUF_ATTR_BIT * 5 }, \
{ PACKETBUF_ATTR_HOPS, PACKETBUF_ATTR_BIT * 5 }, \
UNICAST_ATTRIBUTES
struct multihop_callbacks {
void (* recv)(struct multihop_conn *ptr,
rimeaddr_t *sender,
rimeaddr_t *prevhop,
const rimeaddr_t *sender,
const rimeaddr_t *prevhop,
uint8_t hops);
rimeaddr_t *(* forward)(struct multihop_conn *ptr,
rimeaddr_t *originator,
rimeaddr_t *dest,
rimeaddr_t *prevhop,
const rimeaddr_t *originator,
const rimeaddr_t *dest,
const rimeaddr_t *prevhop,
uint8_t hops);
};