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

update to latest version

Browse source
This commit is contained in:
Harald Pichler 2013-01-14 14:33:05 +01:00
parent 30b5333123
commit 2c172bfd31
4 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
examples/osd/rpl-border-router/border-router.c
View file

@ -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>");

1
examples/osd/rpl-border-router/httpd-simple.c
View file

@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: httpd-simple.c,v 1.5 2010/10/19 18:29:04 adamdunkels Exp $
*/ */
/** /**

1
examples/osd/rpl-border-router/project-conf.h
View file

@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: project-conf.h,v 1.1 2010/10/21 18:23:44 joxe Exp $
*/ */
#ifndef __PROJECT_ROUTER_CONF_H__ #ifndef __PROJECT_ROUTER_CONF_H__

1
examples/osd/rpl-border-router/slip-bridge.c
View file

@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: slip-bridge.c,v 1.6 2011/01/17 20:05:51 joxe Exp $
*/ */
/** /**