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

added config for enabling/disabling removal of oldest route and added support function for checking if lladdress is used as nexthop

Browse source
This commit is contained in:
Joakim Eriksson 2015-08-20 17:00:47 +02:00
parent 513393db54
commit d181bd9e6f
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/net/ipv6/uip-ds6-route.c
View file

@ -207,6 +207,12 @@ uip_ds6_route_next(uip_ds6_route_t *r)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
uip_ds6_route_is_nexthop(const uip_lladdr_t *lladdr)
{
return nbr_table_get_from_lladdr(nbr_routes, (linkaddr_t *)lladdr) != NULL;
}
/*---------------------------------------------------------------------------*/
int
uip_ds6_route_num_routes(void) uip_ds6_route_num_routes(void)
{ {
return num_routes; return num_routes;
@ -307,11 +313,16 @@ uip_ds6_route_add(uip_ipaddr_t *ipaddr, uint8_t length,
least recently used one we have. */ least recently used one we have. */
if(uip_ds6_route_num_routes() == UIP_DS6_ROUTE_NB) { if(uip_ds6_route_num_routes() == UIP_DS6_ROUTE_NB) {
uip_ds6_route_t *oldest;
oldest = NULL;
#if UIP_DS6_ROUTE_REMOVE_LEAST_RECENTLY_USED
/* Removing the oldest route entry from the route table. The /* Removing the oldest route entry from the route table. The
least recently used route is the first route on the list. */ least recently used route is the first route on the list. */
uip_ds6_route_t *oldest; oldest = list_tail(routelist);
#endif
oldest = list_tail(routelist); /* uip_ds6_route_head(); */ if(oldest == NULL) {
return NULL;
}
PRINTF("uip_ds6_route_add: dropping route to "); PRINTF("uip_ds6_route_add: dropping route to ");
PRINT6ADDR(&oldest->ipaddr); PRINT6ADDR(&oldest->ipaddr);
PRINTF("\n"); PRINTF("\n");

2
core/net/ipv6/uip-ds6-route.h
View file

@ -197,7 +197,7 @@ uip_ipaddr_t *uip_ds6_route_nexthop(uip_ds6_route_t *);
int uip_ds6_route_num_routes(void); int uip_ds6_route_num_routes(void);
uip_ds6_route_t *uip_ds6_route_head(void); uip_ds6_route_t *uip_ds6_route_head(void);
uip_ds6_route_t *uip_ds6_route_next(uip_ds6_route_t *); uip_ds6_route_t *uip_ds6_route_next(uip_ds6_route_t *);
int uip_ds6_route_is_nexthop(const uip_lladdr_t *lladdr);
/** @} */ /** @} */
#endif /* UIP_DS6_ROUTE_H */ #endif /* UIP_DS6_ROUTE_H */