M6lbr

examples/6lbr/6lbr/nvm-config.c

@@ -49,6 +49,8 @@
 #include "nvm-itf.h"
 #include "log-6lbr.h"
 
+nvm_data_t *nvms_data;
+uint16_t rpl_instances, rpl_current_instance;
 nvm_data_t nvm_data;
 
 /*---------------------------------------------------------------------------*/

examples/6lbr/6lbr/nvm-config.h

@@ -39,7 +39,9 @@
 
 #include "nvm-data.h"
 
+extern nvm_data_t *nvms_data;
 extern nvm_data_t nvm_data;
+extern uint16_t rpl_instances, rpl_current_instance;
 
 void load_nvm_config(void);
 void store_nvm_config(void);

examples/6lbr/6lbr/rio.c

@@ -59,18 +59,22 @@ uip_ds6_route_info_add(uip_ipaddr_t * ipaddr, uint8_t ipaddrlen,
   if(uip_ds6_list_loop
      ((uip_ds6_element_t *) uip_ds6_route_info_list, UIP_DS6_ROUTE_INFO_NB,
       sizeof(uip_ds6_route_info_t), ipaddr, ipaddrlen,
-      (uip_ds6_element_t **) & locrtinfo) == FREESPACE) {
-    locrtinfo->isused = 1;
-    uip_ipaddr_copy(&locrtinfo->ipaddr, ipaddr);
-    locrtinfo->length = ipaddrlen;
-    locrtinfo->flags = flags;
-    locrtinfo->lifetime = rlifetime;
-    LOG6LBR_6ADDR(DEBUG, &locrtinfo->ipaddr, "Adding route information: length=%u, flags=%x, route lifetime=%lu, dest=",
-           ipaddrlen, flags, rlifetime);
-    return locrtinfo;
-  } else {
-    LOG6LBR_ERROR("No more space in route information list\n");
-  }
+      (uip_ds6_element_t **) & locrtinfo) != FOUND)
+    if(uip_ds6_list_loop
+       ((uip_ds6_element_t *) uip_ds6_route_info_list, UIP_DS6_ROUTE_INFO_NB,
+	sizeof(uip_ds6_route_info_t), ipaddr, ipaddrlen,
+	(uip_ds6_element_t **) & locrtinfo) == FREESPACE) {
+      locrtinfo->isused = 1;
+      uip_ipaddr_copy(&locrtinfo->ipaddr, ipaddr);
+      locrtinfo->length = ipaddrlen;
+      locrtinfo->flags = flags;
+      locrtinfo->lifetime = rlifetime;
+      LOG6LBR_6ADDR(DEBUG, &locrtinfo->ipaddr, "Adding route information: length=%u, flags=%x, route lifetime=%lu, dest=",
+		    ipaddrlen, flags, rlifetime);
+      return locrtinfo;
+    } else {
+      LOG6LBR_ERROR("No more space in route information list\n");
+    }
   return NULL;
 }
 

examples/6lbr/Makefile

@@ -11,6 +11,8 @@ CETIC_6LBR_LEARN_RPL_MAC=1
 
 CONTIKI_WITH_IPV6 = 1
 
+RPL_CONF_MAX_INSTANCES=10
+
 6LBR?=.
 
 CONTIKI = $(6LBR)/../..
@@ -40,6 +42,7 @@ CFLAGS +=-DCETIC_6LBR_ROUTER=$(CETIC_6LBR_ROUTER)
 CFLAGS +=-DCETIC_6LBR_6LR=$(CETIC_6LBR_6LR)
 CFLAGS +=-DCETIC_6LBR_ONE_ITF=$(CETIC_6LBR_ONE_ITF)
 CFLAGS +=-DCETIC_6LBR_LEARN_RPL_MAC=$(CETIC_6LBR_LEARN_RPL_MAC)
+CFLAGS +=-DRPL_CONF_MAX_INSTANCES=$(RPL_CONF_MAX_INSTANCES)
 
 CONTIKI_WITH_RPL ?= 1
 WITH_IP64?=1

examples/6lbr/angstrom/control

@@ -1,5 +1,5 @@
 Package: cetic-6lbr
-Version: 1.3.2
+Version: 1.4.0
 Architecture: armv7a
 Maintainer: CETIC <[email protected]>
 Section: network

examples/6lbr/apps/6lbr-webserver/Makefile.6lbr-webserver

@@ -1,6 +1,7 @@
 CFLAGS += -DWEBSERVER=1
 6lbr-webserver_src = httpd.c httpd-cgi.c httpd-urlconv.c webserver.c webserver-utils.c \
     webserver-main.c webserver-network.c \
+    webserver-instances.c \
     webserver-config.c webserver-statistics.c webserver-admin.c webserver-log.c
 
 ifeq ($(CONTIKI_WITH_RPL),1)

examples/6lbr/apps/6lbr-webserver/httpd-cgi.c

@@ -36,16 +36,59 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "contiki-net.h"
 #include "httpd-cgi.h"
 #include "nvm-config.h"
 
+static httpd_group_t *instances = NULL;
 static httpd_group_t *groups = NULL;
 static httpd_cgi_call_t *calls = NULL;
 static httpd_cgi_command_t *commands = NULL;
 /*---------------------------------------------------------------------------*/
 void
+httpd_instances_add(void *dgroup, uint16_t nb)
+{
+  httpd_group_t *group;
+  if(nb > 0){
+    group = (httpd_group_t *)malloc(2 + nb * sizeof(httpd_group_t));
+
+    group[0].title = (char*)malloc(2*sizeof(char));
+    sprintf(group[0].title, "%c", '-');
+    group[0].next = &group[1];
+    group[1].title = (char*)malloc(2*sizeof(char));
+    sprintf(group[1].title, "%c", '+');
+  }
+  else {
+    group = (httpd_group_t *)malloc(sizeof(httpd_group_t));
+
+    group[0].title = (char*)malloc(2*sizeof(char));
+    sprintf(group[0].title, "%c", '+');
+    group[0].next = NULL;
+  }
+
+  if(nb > 0){
+    group[1].next = &group[2]; 
+    int i;
+    char * instance;
+    for(i=0;i<nb-1;i++){
+      instance = (char*)malloc(5*sizeof(char));
+      sprintf(instance,"%d",nvms_data[i].rpl_instance_id);
+      group[i+2].title = instance;
+      LOG6LBR_INFO("Adding instance : %s\n", group[i+2].title);
+      group[i+2].next = &group[i+3];
+    }
+    instance = (char*)malloc(5*sizeof(char));
+    sprintf(instance,"%d",nvms_data[i].rpl_instance_id);
+    group[nb+1].title = instance;
+    group[nb+1].next = NULL;
+  }
+
+  instances = &group[0];
+}
+/*---------------------------------------------------------------------------*/
+void
 httpd_group_add(httpd_group_t *group)
 {
   httpd_group_t *l;
@@ -60,6 +103,11 @@ httpd_group_add(httpd_group_t *group)
   }
 }
 /*---------------------------------------------------------------------------*/
+httpd_group_t* httpd_instance_head(void)
+{
+  return instances;
+}
+/*---------------------------------------------------------------------------*/
 httpd_group_t* httpd_group_head(void)
 {
   return groups;

examples/6lbr/apps/6lbr-webserver/httpd-cgi.h

@@ -79,8 +79,10 @@ typedef struct httpd_cgi_command httpd_cgi_command_t;
 #define HTTPD_CUSTOM_TOP    0x00000002
 #define HTTPD_CUSTOM_BOTTOM 0x00000004
 
+void httpd_instances_add(void *group, uint16_t nb);
 void httpd_group_add(httpd_group_t *group);
 void httpd_group_add_page(httpd_group_t *group, httpd_cgi_call_t *c);
+httpd_group_t* httpd_instance_head(void);
 httpd_group_t* httpd_group_head(void);
 
 void httpd_cgi_add(httpd_cgi_call_t *c);
@@ -94,9 +96,15 @@ httpd_cgi_command_t* httpd_cgi_command_head(void);
 #define HTTPD_CGI_CALL_NAME(name) \
 extern struct httpd_cgi_call name;
 
+#define HTTPD_GROUPS_NAME(name) \
+    extern httpd_group_t * name;
+
 #define HTTPD_GROUP_NAME(name) \
     extern httpd_group_t name;
 
+#define HTTPD_GROUPS(name) \
+httpd_group_t * name = NULL
+
 #define HTTPD_GROUP(name, str) \
 httpd_group_t name = {NULL, str, NULL, 0}
 

examples/6lbr/apps/6lbr-webserver/httpd.c

@@ -202,9 +202,9 @@ PT_THREAD(handle_input(struct httpd_state *s))
   }
 #endif /* URLCONV */
   if(s->query) {
-    LOG6LBR_6ADDR(DEBUG, &uip_conn->ripaddr, "Request for '%s?%s' from ", s->filename, s->query);
+    LOG6LBR_6ADDR(INFO, &uip_conn->ripaddr, "Request for '%s?%s' from ", s->filename, s->query);
   } else {
-    LOG6LBR_6ADDR(DEBUG, &uip_conn->ripaddr, "Request for '%s' from ", s->filename);
+    LOG6LBR_6ADDR(INFO, &uip_conn->ripaddr, "Request for '%s' from ", s->filename);
   }
 
   s->state = STATE_OUTPUT;

examples/6lbr/apps/6lbr-webserver/webserver-config.c

@@ -511,6 +511,13 @@ update_config(const char *name, uint8_t *reboot_needed)
     }
   }
   if(do_update) {
+    int i,find=0;
+    for(i=0;i<rpl_instances && !find;i++)
+      if(nvms_data[i].rpl_instance_id == rpl_current_instance){
+	nvms_data[i] = nvm_data;
+	find=1;
+      }
+
     store_nvm_config();
 #if !LOG6LBR_STATIC
     if(nvm_data.log_level != 0xFF) {