mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-08-16 22:28:59 +00:00
Updated to use the new uip-ds6-route API
This commit is contained in:
parent
43ecad5a99
commit
5406dd8b18
@ -57,7 +57,6 @@
|
|||||||
uint16_t dag_id[] = {0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011};
|
uint16_t dag_id[] = {0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011};
|
||||||
|
|
||||||
extern uip_ds6_nbr_t uip_ds6_nbr_cache[];
|
extern uip_ds6_nbr_t uip_ds6_nbr_cache[];
|
||||||
extern uip_ds6_route_t uip_ds6_routing_table[];
|
|
||||||
|
|
||||||
static uip_ipaddr_t prefix;
|
static uip_ipaddr_t prefix;
|
||||||
static uint8_t prefix_set;
|
static uint8_t prefix_set;
|
||||||
@ -149,6 +148,7 @@ static
|
|||||||
PT_THREAD(generate_routes(struct httpd_state *s))
|
PT_THREAD(generate_routes(struct httpd_state *s))
|
||||||
{
|
{
|
||||||
static int i;
|
static int i;
|
||||||
|
static uip_ds6_route_t *r;
|
||||||
#if BUF_USES_STACK
|
#if BUF_USES_STACK
|
||||||
char buf[256];
|
char buf[256];
|
||||||
#endif
|
#endif
|
||||||
@ -220,45 +220,45 @@ PT_THREAD(generate_routes(struct httpd_state *s))
|
|||||||
#else
|
#else
|
||||||
blen = 0;
|
blen = 0;
|
||||||
#endif
|
#endif
|
||||||
for(i = 0; i < UIP_DS6_ROUTE_NB; i++) {
|
|
||||||
if(uip_ds6_routing_table[i].isused) {
|
for(r = uip_ds6_route_list_head(); r != NULL; r = list_item_next(r)) {
|
||||||
|
|
||||||
#if BUF_USES_STACK
|
#if BUF_USES_STACK
|
||||||
#if WEBSERVER_CONF_ROUTE_LINKS
|
#if WEBSERVER_CONF_ROUTE_LINKS
|
||||||
ADD("<a href=http://[");
|
ADD("<a href=http://[");
|
||||||
ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
|
ipaddr_add(&r->ipaddr);
|
||||||
ADD("]/status.shtml>");
|
ADD("]/status.shtml>");
|
||||||
ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
|
ipaddr_add(&r->ipaddr);
|
||||||
ADD("</a>");
|
ADD("</a>");
|
||||||
#else
|
#else
|
||||||
ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
|
ipaddr_add(&r->ipaddr);
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#if WEBSERVER_CONF_ROUTE_LINKS
|
#if WEBSERVER_CONF_ROUTE_LINKS
|
||||||
ADD("<a href=http://[");
|
ADD("<a href=http://[");
|
||||||
ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
|
ipaddr_add(&r->ipaddr);
|
||||||
ADD("]/status.shtml>");
|
ADD("]/status.shtml>");
|
||||||
SEND_STRING(&s->sout, buf); //TODO: why tunslip6 needs an output here, wpcapslip does not
|
SEND_STRING(&s->sout, buf); //TODO: why tunslip6 needs an output here, wpcapslip does not
|
||||||
blen = 0;
|
blen = 0;
|
||||||
ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
|
ipaddr_add(&r->ipaddr);
|
||||||
ADD("</a>");
|
ADD("</a>");
|
||||||
#else
|
#else
|
||||||
ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
|
ipaddr_add(&r->ipaddr);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
ADD("/%u (via ", uip_ds6_routing_table[i].length);
|
ADD("/%u (via ", r->length);
|
||||||
ipaddr_add(&uip_ds6_routing_table[i].nexthop);
|
ipaddr_add(&r->nexthop);
|
||||||
if(1 || (uip_ds6_routing_table[i].state.lifetime < 600)) {
|
if(1 || (r->state.lifetime < 600)) {
|
||||||
ADD(") %lus\n", uip_ds6_routing_table[i].state.lifetime);
|
ADD(") %lus\n", r->state.lifetime);
|
||||||
} else {
|
} else {
|
||||||
ADD(")\n");
|
ADD(")\n");
|
||||||
}
|
|
||||||
SEND_STRING(&s->sout, buf);
|
|
||||||
#if BUF_USES_STACK
|
|
||||||
bufptr = buf; bufend = bufptr + sizeof(buf);
|
|
||||||
#else
|
|
||||||
blen = 0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
SEND_STRING(&s->sout, buf);
|
||||||
|
#if BUF_USES_STACK
|
||||||
|
bufptr = buf; bufend = bufptr + sizeof(buf);
|
||||||
|
#else
|
||||||
|
blen = 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
ADD("</pre>");
|
ADD("</pre>");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user