Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

made it possible to have zero contexts to avoid stateful compression in hc06

Browse Source
This commit is contained in:
joxe 2010-03-19 08:15:20 +00:00
parent 9bcf982d87
commit cf9acf4748
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/net/sicslowpan.c
View File

@ -32,7 +32,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: sicslowpan.c,v 1.30 2010/03/17 12:08:59 joxe Exp $ * $Id: sicslowpan.c,v 1.31 2010/03/19 08:15:20 joxe Exp $
*/ */
/** /**
* \file * \file
@ -252,9 +252,12 @@ static struct timer reass_timer;
/** \name HC06 specific variables /** \name HC06 specific variables
* @{ * @{
*/ */
/** Addresses contexts for IPHC. */ /** Addresses contexts for IPHC. */
#if SICSLOWPAN_CONF_MAX_ADD_CONTEXTS > 0
static struct sicslowpan_addr_context static struct sicslowpan_addr_context
addr_contexts[SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS]; addr_contexts[SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS];
#endif
/** pointer to an address context. */ /** pointer to an address context. */
static struct sicslowpan_addr_context *context; static struct sicslowpan_addr_context *context;
@ -262,10 +265,6 @@ static struct sicslowpan_addr_context *context;
/** pointer to the byte where to write next inline field. */ /** pointer to the byte where to write next inline field. */
static uint8_t *hc06_ptr; static uint8_t *hc06_ptr;
/** Index for loops. */
static uint8_t i;
/** @} */
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
/** \name HC06 related functions /** \name HC06 related functions
@ -274,24 +273,32 @@ static uint8_t i;
/** \brief find the context corresponding to prefix ipaddr */ /** \brief find the context corresponding to prefix ipaddr */
static struct sicslowpan_addr_context* static struct sicslowpan_addr_context*
addr_context_lookup_by_prefix(uip_ipaddr_t *ipaddr) { addr_context_lookup_by_prefix(uip_ipaddr_t *ipaddr) {
/* Remove code to avoid warnings and save flash if no context is used */
#if SICSLOWPAN_CONF_MAX_ADD_CONTEXTS > 0
int i;
for(i = 0; i < SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS; i++) { for(i = 0; i < SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS; i++) {
if((addr_contexts[i].used == 1) && if((addr_contexts[i].used == 1) &&
uip_ipaddr_prefixcmp(&addr_contexts[i].prefix, ipaddr, 64)) { uip_ipaddr_prefixcmp(&addr_contexts[i].prefix, ipaddr, 64)) {
return &addr_contexts[i]; return &addr_contexts[i];
} }
} }
#endif /* SICSLOWPAN_CONF_MAX_ADD_CONTEXTS > 0 */
return NULL; return NULL;
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
/** \brief find the context with the given number */ /** \brief find the context with the given number */
static struct sicslowpan_addr_context* static struct sicslowpan_addr_context*
addr_context_lookup_by_number(u8_t number) { addr_context_lookup_by_number(u8_t number) {
/* Remove code to avoid warnings and save flash if no context is used */
#if SICSLOWPAN_CONF_MAX_ADD_CONTEXTS > 0
int i;
for(i = 0; i < SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS; i++) { for(i = 0; i < SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS; i++) {
if((addr_contexts[i].used == 1) && if((addr_contexts[i].used == 1) &&
addr_contexts[i].number == number) { addr_contexts[i].number == number) {
return &addr_contexts[i]; return &addr_contexts[i];
} }
} }
#endif /* SICSLOWPAN_CONF_MAX_ADD_CONTEXTS > 0 */
return NULL; return NULL;
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
@ -1644,28 +1651,19 @@ sicslowpan_init(void)
tcpip_set_outputfunc(output); tcpip_set_outputfunc(output);
#if SICSLOWPAN_COMPRESSION == SICSLOWPAN_COMPRESSION_HC06 #if SICSLOWPAN_COMPRESSION == SICSLOWPAN_COMPRESSION_HC06
#if SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS < 1 #if SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 0
#error sicslowpan compression HC06 requires at least one address context.
#error Change SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS in contiki-conf.h.
#endif
/*
* Initialize the address contexts
* Context 00 is not anymore link local context since
* there is built-in support for link-local compression
* in hc-06
* - should we be able to have longer contexts than 64 bits?
* currently 64 bits length is supported...
*/
addr_contexts[0].used = 1; addr_contexts[0].used = 1;
addr_contexts[0].number = 0; addr_contexts[0].number = 0;
addr_contexts[0].prefix[0] = 0xaa; addr_contexts[0].prefix[0] = 0xaa;
addr_contexts[0].prefix[1] = 0xaa; addr_contexts[0].prefix[1] = 0xaa;
#endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 0 */
#if SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1 #if SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1
{
int i;
for(i = 1; i < SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS; i++) { for(i = 1; i < SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS; i++) {
addr_contexts[i].used = 0; addr_contexts[i].used = 0;
} }
}
#endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1 */ #endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1 */
#endif /* SICSLOWPAN_COMPRESSION == SICSLOWPAN_COMPRESSION_HC06 */ #endif /* SICSLOWPAN_COMPRESSION == SICSLOWPAN_COMPRESSION_HC06 */