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

Update to the new ds6_route API

Browse source
This commit is contained in:
George Oikonomou 2012-12-16 17:50:36 +00:00
parent 64a95dcb59
commit f5bc1c92ba
2 changed files with 126 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
platform/cc2530dk/viztool.c
View file

@ -41,6 +41,7 @@
#include "contiki.h" #include "contiki.h"
#include "contiki-lib.h" #include "contiki-lib.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "net/uip-ds6-route.h"
#include <string.h> #include <string.h>
@ -68,9 +69,10 @@ static int8_t len;
#define REQUEST_TYPE_TOTALS 0xFF #define REQUEST_TYPE_TOTALS 0xFF
extern uip_ds6_netif_t uip_ds6_if; extern uip_ds6_netif_t uip_ds6_if;
extern uip_ds6_route_t uip_ds6_routing_table[UIP_DS6_ROUTE_NB];
extern uip_ds6_nbr_t uip_ds6_nbr_cache[UIP_DS6_NBR_NB]; extern uip_ds6_nbr_t uip_ds6_nbr_cache[UIP_DS6_NBR_NB];
extern uip_ds6_defrt_t uip_ds6_defrt_list[UIP_DS6_DEFRT_NB]; static uip_ds6_route_t *rt;
static uip_ds6_defrt_t *defrt;
static uip_ipaddr_t *addr;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static uint8_t static uint8_t
process_request() CC_NON_BANKED process_request() CC_NON_BANKED
@ -90,7 +92,7 @@ process_request() CC_NON_BANKED
for(i = buf[1]; i < UIP_DS6_NBR_NB; i++) { for(i = buf[1]; i < UIP_DS6_NBR_NB; i++) {
if(uip_ds6_nbr_cache[i].isused) { if(uip_ds6_nbr_cache[i].isused) {
entry_size = sizeof(i) + sizeof(uip_ipaddr_t) + sizeof(uip_lladdr_t) entry_size = sizeof(i) + sizeof(uip_ipaddr_t) + sizeof(uip_lladdr_t)
+ sizeof(uip_ds6_nbr_cache[i].state); + sizeof(uip_ds6_nbr_cache[i].state);
PRINTF("%02u: ", i); PRINTF("%02u: ", i);
PRINT6ADDR(&uip_ds6_nbr_cache[i].ipaddr); PRINT6ADDR(&uip_ds6_nbr_cache[i].ipaddr);
PRINTF(" - "); PRINTF(" - ");
@ -104,7 +106,7 @@ process_request() CC_NON_BANKED
memcpy(buf + len, &uip_ds6_nbr_cache[i].lladdr, sizeof(uip_lladdr_t)); memcpy(buf + len, &uip_ds6_nbr_cache[i].lladdr, sizeof(uip_lladdr_t));
len += sizeof(uip_lladdr_t); len += sizeof(uip_lladdr_t);
memcpy(buf + len, &uip_ds6_nbr_cache[i].state, memcpy(buf + len, &uip_ds6_nbr_cache[i].state,
sizeof(uip_ds6_nbr_cache[i].state)); sizeof(uip_ds6_nbr_cache[i].state));
len += sizeof(uip_ds6_nbr_cache[i].state); len += sizeof(uip_ds6_nbr_cache[i].state);
count++; count++;
@ -117,52 +119,52 @@ process_request() CC_NON_BANKED
} }
} else if(buf[0] == REQUEST_TYPE_RT) { } else if(buf[0] == REQUEST_TYPE_RT) {
uint32_t flip = 0; uint32_t flip = 0;
PRINTF("Routing table\n"); PRINTF("Routing table\n");
for(i = buf[1]; i < UIP_DS6_ROUTE_NB; i++) { rt = uip_ds6_route_list_head();
if(uip_ds6_routing_table[i].isused) {
entry_size = sizeof(i) + sizeof(uip_ds6_routing_table[i].ipaddr) for(i = buf[1]; i < uip_ds6_route_num_routes(); i++) {
+ sizeof(uip_ds6_routing_table[i].length) if(rt != NULL) {
+ sizeof(uip_ds6_routing_table[i].metric) entry_size = sizeof(i) + sizeof(rt->ipaddr)
+ sizeof(uip_ds6_routing_table[i].nexthop) + sizeof(rt->length)
+ sizeof(uip_ds6_routing_table[i].state.lifetime) + sizeof(rt->metric)
+ sizeof(uip_ds6_routing_table[i].state.learned_from); + sizeof(rt->nexthop)
+ sizeof(rt->state.lifetime)
+ sizeof(rt->state.learned_from);
memcpy(buf + len, &i, sizeof(i)); memcpy(buf + len, &i, sizeof(i));
len += sizeof(i); len += sizeof(i);
memcpy(buf + len, &uip_ds6_routing_table[i].ipaddr, memcpy(buf + len, &rt->ipaddr, sizeof(rt->ipaddr));
sizeof(uip_ds6_routing_table[i].ipaddr)); len += sizeof(rt->ipaddr);
len += sizeof(uip_ds6_routing_table[i].ipaddr); memcpy(buf + len, &rt->length, sizeof(rt->length));
memcpy(buf + len, &uip_ds6_routing_table[i].length, len += sizeof(rt->length);
sizeof(uip_ds6_routing_table[i].length)); memcpy(buf + len, &rt->metric, sizeof(rt->metric));
len += sizeof(uip_ds6_routing_table[i].length); len += sizeof(rt->metric);
memcpy(buf + len, &uip_ds6_routing_table[i].metric, memcpy(buf + len, &rt->nexthop, sizeof(rt->nexthop));
sizeof(uip_ds6_routing_table[i].metric)); len += sizeof(rt->nexthop);
len += sizeof(uip_ds6_routing_table[i].metric);
memcpy(buf + len, &uip_ds6_routing_table[i].nexthop,
sizeof(uip_ds6_routing_table[i].nexthop));
len += sizeof(uip_ds6_routing_table[i].nexthop);
PRINT6ADDR(&uip_ds6_routing_table[i].ipaddr); PRINT6ADDR(&rt->ipaddr);
PRINTF(" - %02x", uip_ds6_routing_table[i].length); PRINTF(" - %02x", rt->length);
PRINTF(" - %02x", uip_ds6_routing_table[i].metric); PRINTF(" - %02x", rt->metric);
PRINTF(" - "); PRINTF(" - ");
PRINT6ADDR(&uip_ds6_routing_table[i].nexthop); PRINT6ADDR(&rt->nexthop);
flip = uip_htonl(uip_ds6_routing_table[i].state.lifetime); flip = uip_htonl(rt->state.lifetime);
memcpy(buf + len, &flip, sizeof(flip)); memcpy(buf + len, &flip, sizeof(flip));
len += sizeof(flip); len += sizeof(flip);
PRINTF(" - %08lx", uip_ds6_routing_table[i].state.lifetime); PRINTF(" - %08lx", rt->state.lifetime);
memcpy(buf + len, &uip_ds6_routing_table[i].state.learned_from, memcpy(buf + len, &rt->state.learned_from,
sizeof(uip_ds6_routing_table[i].state.learned_from)); sizeof(rt->state.learned_from));
len += sizeof(uip_ds6_routing_table[i].state.learned_from); len += sizeof(rt->state.learned_from);
PRINTF(" - %02x [%u]\n", uip_ds6_routing_table[i].state.learned_from, PRINTF(" - %02x [%u]\n", rt->state.learned_from, entry_size);
entry_size);
count++; count++;
left -= entry_size; left -= entry_size;
rt = list_item_next(rt);
if(left < entry_size) { if(left < entry_size) {
break; break;
} }
@ -170,30 +172,30 @@ process_request() CC_NON_BANKED
} }
} else if(buf[0] == REQUEST_TYPE_DRT) { } else if(buf[0] == REQUEST_TYPE_DRT) {
uint32_t flip = 0; uint32_t flip = 0;
PRINTF("Default Routes\n");
for(i = buf[1]; i < UIP_DS6_DEFRT_NB; i++) {
if(uip_ds6_defrt_list[i].isused) {
entry_size = sizeof(i) + sizeof(uip_ds6_defrt_list[i].ipaddr)
+ sizeof(uip_ds6_defrt_list[i].isinfinite);
memcpy(buf + len, &i, sizeof(i)); PRINTF("Default Route\n");
len += sizeof(i); addr = uip_ds6_defrt_choose();
memcpy(buf + len, &uip_ds6_defrt_list[i].ipaddr, if(addr != NULL) {
sizeof(uip_ds6_defrt_list[i].ipaddr)); defrt = uip_ds6_defrt_lookup(addr);
len += sizeof(uip_ds6_defrt_list[i].ipaddr); }
memcpy(buf + len, &uip_ds6_defrt_list[i].isinfinite,
sizeof(uip_ds6_defrt_list[i].isinfinite));
len += sizeof(uip_ds6_defrt_list[i].isinfinite);
PRINT6ADDR(&uip_ds6_defrt_list[i].ipaddr); i = buf[1];
PRINTF(" - %u\n", uip_ds6_defrt_list[i].isinfinite);
count++;
left -= entry_size;
if(left < entry_size) { if(defrt != NULL && i < 1) {
break; entry_size = sizeof(i) + sizeof(defrt->ipaddr)
} + sizeof(defrt->isinfinite);
}
memcpy(buf + len, &i, sizeof(i));
len += sizeof(i);
memcpy(buf + len, &defrt->ipaddr, sizeof(defrt->ipaddr));
len += sizeof(defrt->ipaddr);
memcpy(buf + len, &defrt->isinfinite, sizeof(defrt->isinfinite));
len += sizeof(defrt->isinfinite);
PRINT6ADDR(&defrt->ipaddr);
PRINTF(" - %u\n", defrt->isinfinite);
count++;
left -= entry_size;
} }
} else if(buf[0] == REQUEST_TYPE_ADDR) { } else if(buf[0] == REQUEST_TYPE_ADDR) {
PRINTF("Unicast Addresses\n"); PRINTF("Unicast Addresses\n");
@ -204,7 +206,7 @@ process_request() CC_NON_BANKED
memcpy(buf + len, &i, sizeof(i)); memcpy(buf + len, &i, sizeof(i));
len += sizeof(i); len += sizeof(i);
memcpy(buf + len, &uip_ds6_if.addr_list[i].ipaddr, memcpy(buf + len, &uip_ds6_if.addr_list[i].ipaddr,
sizeof(uip_ds6_if.addr_list[i].ipaddr)); sizeof(uip_ds6_if.addr_list[i].ipaddr));
len += sizeof(uip_ds6_if.addr_list[i].ipaddr); len += sizeof(uip_ds6_if.addr_list[i].ipaddr);
PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr); PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
@ -229,16 +231,10 @@ process_request() CC_NON_BANKED
buf[3]++; buf[3]++;
} }
} }
for(i = 0; i < UIP_DS6_ROUTE_NB; i++) {
if(uip_ds6_routing_table[i].isused) { buf[4] = uip_ds6_route_num_routes();
buf[4]++; buf[5] = 1;
}
}
for(i = 0; i < UIP_DS6_DEFRT_NB; i++) {
if(uip_ds6_defrt_list[i].isused) {
buf[5]++;
}
}
len += 4; len += 4;
count = 4; count = 4;
} else { } else {

130
platform/sensinode/viztool.c
View file

@ -41,6 +41,7 @@
#include "contiki.h" #include "contiki.h"
#include "contiki-lib.h" #include "contiki-lib.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "net/uip-ds6-route.h"
#include <string.h> #include <string.h>
@ -68,9 +69,10 @@ static int8_t len;
#define REQUEST_TYPE_TOTALS 0xFF #define REQUEST_TYPE_TOTALS 0xFF
extern uip_ds6_netif_t uip_ds6_if; extern uip_ds6_netif_t uip_ds6_if;
extern uip_ds6_route_t uip_ds6_routing_table[UIP_DS6_ROUTE_NB];
extern uip_ds6_nbr_t uip_ds6_nbr_cache[UIP_DS6_NBR_NB]; extern uip_ds6_nbr_t uip_ds6_nbr_cache[UIP_DS6_NBR_NB];
extern uip_ds6_defrt_t uip_ds6_defrt_list[UIP_DS6_DEFRT_NB]; static uip_ds6_route_t *rt;
static uip_ds6_defrt_t *defrt;
static uip_ipaddr_t *addr;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static uint8_t static uint8_t
process_request() CC_NON_BANKED process_request() CC_NON_BANKED
@ -90,7 +92,7 @@ process_request() CC_NON_BANKED
for(i = buf[1]; i < UIP_DS6_NBR_NB; i++) { for(i = buf[1]; i < UIP_DS6_NBR_NB; i++) {
if(uip_ds6_nbr_cache[i].isused) { if(uip_ds6_nbr_cache[i].isused) {
entry_size = sizeof(i) + sizeof(uip_ipaddr_t) + sizeof(uip_lladdr_t) entry_size = sizeof(i) + sizeof(uip_ipaddr_t) + sizeof(uip_lladdr_t)
+ sizeof(uip_ds6_nbr_cache[i].state); + sizeof(uip_ds6_nbr_cache[i].state);
PRINTF("%02u: ", i); PRINTF("%02u: ", i);
PRINT6ADDR(&uip_ds6_nbr_cache[i].ipaddr); PRINT6ADDR(&uip_ds6_nbr_cache[i].ipaddr);
PRINTF(" - "); PRINTF(" - ");
@ -104,7 +106,7 @@ process_request() CC_NON_BANKED
memcpy(buf + len, &uip_ds6_nbr_cache[i].lladdr, sizeof(uip_lladdr_t)); memcpy(buf + len, &uip_ds6_nbr_cache[i].lladdr, sizeof(uip_lladdr_t));
len += sizeof(uip_lladdr_t); len += sizeof(uip_lladdr_t);
memcpy(buf + len, &uip_ds6_nbr_cache[i].state, memcpy(buf + len, &uip_ds6_nbr_cache[i].state,
sizeof(uip_ds6_nbr_cache[i].state)); sizeof(uip_ds6_nbr_cache[i].state));
len += sizeof(uip_ds6_nbr_cache[i].state); len += sizeof(uip_ds6_nbr_cache[i].state);
count++; count++;
@ -117,52 +119,52 @@ process_request() CC_NON_BANKED
} }
} else if(buf[0] == REQUEST_TYPE_RT) { } else if(buf[0] == REQUEST_TYPE_RT) {
uint32_t flip = 0; uint32_t flip = 0;
PRINTF("Routing table\n"); PRINTF("Routing table\n");
for(i = buf[1]; i < UIP_DS6_ROUTE_NB; i++) { rt = uip_ds6_route_list_head();
if(uip_ds6_routing_table[i].isused) {
entry_size = sizeof(i) + sizeof(uip_ds6_routing_table[i].ipaddr) for(i = buf[1]; i < uip_ds6_route_num_routes(); i++) {
+ sizeof(uip_ds6_routing_table[i].length) if(rt != NULL) {
+ sizeof(uip_ds6_routing_table[i].metric) entry_size = sizeof(i) + sizeof(rt->ipaddr)
+ sizeof(uip_ds6_routing_table[i].nexthop) + sizeof(rt->length)
+ sizeof(uip_ds6_routing_table[i].state.lifetime) + sizeof(rt->metric)
+ sizeof(uip_ds6_routing_table[i].state.learned_from); + sizeof(rt->nexthop)
+ sizeof(rt->state.lifetime)
+ sizeof(rt->state.learned_from);
memcpy(buf + len, &i, sizeof(i)); memcpy(buf + len, &i, sizeof(i));
len += sizeof(i); len += sizeof(i);
memcpy(buf + len, &uip_ds6_routing_table[i].ipaddr, memcpy(buf + len, &rt->ipaddr, sizeof(rt->ipaddr));
sizeof(uip_ds6_routing_table[i].ipaddr)); len += sizeof(rt->ipaddr);
len += sizeof(uip_ds6_routing_table[i].ipaddr); memcpy(buf + len, &rt->length, sizeof(rt->length));
memcpy(buf + len, &uip_ds6_routing_table[i].length, len += sizeof(rt->length);
sizeof(uip_ds6_routing_table[i].length)); memcpy(buf + len, &rt->metric, sizeof(rt->metric));
len += sizeof(uip_ds6_routing_table[i].length); len += sizeof(rt->metric);
memcpy(buf + len, &uip_ds6_routing_table[i].metric, memcpy(buf + len, &rt->nexthop, sizeof(rt->nexthop));
sizeof(uip_ds6_routing_table[i].metric)); len += sizeof(rt->nexthop);
len += sizeof(uip_ds6_routing_table[i].metric);
memcpy(buf + len, &uip_ds6_routing_table[i].nexthop,
sizeof(uip_ds6_routing_table[i].nexthop));
len += sizeof(uip_ds6_routing_table[i].nexthop);
PRINT6ADDR(&uip_ds6_routing_table[i].ipaddr); PRINT6ADDR(&rt->ipaddr);
PRINTF(" - %02x", uip_ds6_routing_table[i].length); PRINTF(" - %02x", rt->length);
PRINTF(" - %02x", uip_ds6_routing_table[i].metric); PRINTF(" - %02x", rt->metric);
PRINTF(" - "); PRINTF(" - ");
PRINT6ADDR(&uip_ds6_routing_table[i].nexthop); PRINT6ADDR(&rt->nexthop);
flip = uip_htonl(uip_ds6_routing_table[i].state.lifetime); flip = uip_htonl(rt->state.lifetime);
memcpy(buf + len, &flip, sizeof(flip)); memcpy(buf + len, &flip, sizeof(flip));
len += sizeof(flip); len += sizeof(flip);
PRINTF(" - %08lx", uip_ds6_routing_table[i].state.lifetime); PRINTF(" - %08lx", rt->state.lifetime);
memcpy(buf + len, &uip_ds6_routing_table[i].state.learned_from, memcpy(buf + len, &rt->state.learned_from,
sizeof(uip_ds6_routing_table[i].state.learned_from)); sizeof(rt->state.learned_from));
len += sizeof(uip_ds6_routing_table[i].state.learned_from); len += sizeof(rt->state.learned_from);
PRINTF(" - %02x [%u]\n", uip_ds6_routing_table[i].state.learned_from, PRINTF(" - %02x [%u]\n", rt->state.learned_from, entry_size);
entry_size);
count++; count++;
left -= entry_size; left -= entry_size;
rt = list_item_next(rt);
if(left < entry_size) { if(left < entry_size) {
break; break;
} }
@ -170,30 +172,30 @@ process_request() CC_NON_BANKED
} }
} else if(buf[0] == REQUEST_TYPE_DRT) { } else if(buf[0] == REQUEST_TYPE_DRT) {
uint32_t flip = 0; uint32_t flip = 0;
PRINTF("Default Routes\n");
for(i = buf[1]; i < UIP_DS6_DEFRT_NB; i++) {
if(uip_ds6_defrt_list[i].isused) {
entry_size = sizeof(i) + sizeof(uip_ds6_defrt_list[i].ipaddr)
+ sizeof(uip_ds6_defrt_list[i].isinfinite);
memcpy(buf + len, &i, sizeof(i)); PRINTF("Default Route\n");
len += sizeof(i); addr = uip_ds6_defrt_choose();
memcpy(buf + len, &uip_ds6_defrt_list[i].ipaddr, if(addr != NULL) {
sizeof(uip_ds6_defrt_list[i].ipaddr)); defrt = uip_ds6_defrt_lookup(addr);
len += sizeof(uip_ds6_defrt_list[i].ipaddr); }
memcpy(buf + len, &uip_ds6_defrt_list[i].isinfinite,
sizeof(uip_ds6_defrt_list[i].isinfinite));
len += sizeof(uip_ds6_defrt_list[i].isinfinite);
PRINT6ADDR(&uip_ds6_defrt_list[i].ipaddr); i = buf[1];
PRINTF(" - %u\n", uip_ds6_defrt_list[i].isinfinite);
count++;
left -= entry_size;
if(left < entry_size) { if(defrt != NULL && i < 1) {
break; entry_size = sizeof(i) + sizeof(defrt->ipaddr)
} + sizeof(defrt->isinfinite);
}
memcpy(buf + len, &i, sizeof(i));
len += sizeof(i);
memcpy(buf + len, &defrt->ipaddr, sizeof(defrt->ipaddr));
len += sizeof(defrt->ipaddr);
memcpy(buf + len, &defrt->isinfinite, sizeof(defrt->isinfinite));
len += sizeof(defrt->isinfinite);
PRINT6ADDR(&defrt->ipaddr);
PRINTF(" - %u\n", defrt->isinfinite);
count++;
left -= entry_size;
} }
} else if(buf[0] == REQUEST_TYPE_ADDR) { } else if(buf[0] == REQUEST_TYPE_ADDR) {
PRINTF("Unicast Addresses\n"); PRINTF("Unicast Addresses\n");
@ -204,7 +206,7 @@ process_request() CC_NON_BANKED
memcpy(buf + len, &i, sizeof(i)); memcpy(buf + len, &i, sizeof(i));
len += sizeof(i); len += sizeof(i);
memcpy(buf + len, &uip_ds6_if.addr_list[i].ipaddr, memcpy(buf + len, &uip_ds6_if.addr_list[i].ipaddr,
sizeof(uip_ds6_if.addr_list[i].ipaddr)); sizeof(uip_ds6_if.addr_list[i].ipaddr));
len += sizeof(uip_ds6_if.addr_list[i].ipaddr); len += sizeof(uip_ds6_if.addr_list[i].ipaddr);
PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr); PRINT6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
@ -229,16 +231,10 @@ process_request() CC_NON_BANKED
buf[3]++; buf[3]++;
} }
} }
for(i = 0; i < UIP_DS6_ROUTE_NB; i++) {
if(uip_ds6_routing_table[i].isused) { buf[4] = uip_ds6_route_num_routes();
buf[4]++; buf[5] = 1;
}
}
for(i = 0; i < UIP_DS6_DEFRT_NB; i++) {
if(uip_ds6_defrt_list[i].isused) {
buf[5]++;
}
}
len += 4; len += 4;
count = 4; count = 4;
} else { } else {