Merge pull request #426 from openwsn-berkeley/develop_FW-741

FW-741. Disable MSF add/delete cells after first cell is added.

Author: changtengfei

SConscript

@@ -46,6 +46,8 @@ if env['noadaptivesync']==1:
     env.Append(CPPDEFINES    = 'NOADAPTIVESYNC')
 if env['l2_security']==1:
     env.Append(CPPDEFINES    = 'L2_SECURITY_ACTIVE')
+if env['msf_adapting_to_traffic']==1:
+    env.Append(CPPDEFINES    = 'MSF_ADAPTING_TO_TRAFFIC')
 if env['printf']==1:
     env.Append(CPPDEFINES    = 'OPENSERIAL_PRINTF')
 if env['deadline_option']==1:

SConstruct

@@ -78,7 +78,9 @@ project:
                    openstack/02a-MAClow/topology.c file.
     noadaptivesync Do not use adaptive synchronization.
     l2_security   Use hop-by-hop encryption and authentication.
-                  0 (off), 1 (on)
+                  0 (off), 1 (on)
+    msf_adapting_to_traffic enable/disable MSF for adding/deleting cell to adapt to traffic
+                  0 (disable), 1 (enable)
     printf        Sends the string messages to openvisualizer  
                   0 (off ), 1 (on, default)
     ide           qtcreator
@@ -129,21 +131,22 @@ command_line_options = {
         'openos',
         'freertos',
     ],
-    'fet_version':      ['2','3'],
-    'verbose':          ['0','1'],
-    'fastsim':          ['1','0'],
-    'simhost':          ['amd64-linux','x86-linux','amd64-windows','x86-windows'],
-    'simhostpy':        [''],                               # No reasonable default
-    'panid':            [''],
-    'dagroot':          ['0','1'],
-    'forcetopology':    ['0','1'],
-    'debug':            ['0','1'],
-    'noadaptivesync':   ['0','1'],
-    'l2_security':      ['0','1'],
-    'printf':           ['1','0'],          # 1=on (default),  0=off
-    'deadline_option':  ['0','1'],
-    'ide':              ['none','qtcreator'],
-    'revision':         ['']
+    'fet_version':              ['2','3'],
+    'verbose':                  ['0','1'],
+    'fastsim':                  ['1','0'],
+    'simhost':                  ['amd64-linux','x86-linux','amd64-windows','x86-windows'],
+    'simhostpy':                [''],                               # No reasonable default
+    'panid':                    [''],
+    'dagroot':                  ['0','1'],
+    'forcetopology':            ['0','1'],
+    'debug':                    ['0','1'],
+    'noadaptivesync':           ['0','1'],
+    'l2_security':              ['0','1'],
+    'msf_adapting_to_traffic':  ['0','1'],
+    'printf':                   ['1','0'],          # 1=on (default),  0=off
+    'deadline_option':          ['0','1'],
+    'ide':                      ['none','qtcreator'],
+    'revision':                 ['']
 }
 
 def validate_option(key, value, env):
@@ -287,6 +290,13 @@ command_line_vars.AddVariables(
         command_line_options['l2_security'][0],            # default
         validate_option,                                   # validator
         int,                                               # converter
+    ),
+    (
+        'msf_adapting_to_traffic',                         # key
+        '',                                                # help
+        command_line_options['msf_adapting_to_traffic'][1],# default
+        validate_option,                                   # validator
+        int,                                               # converter
     ),
    (
         'printf',                                          # key

openstack/02b-MAChigh/msf.c

@@ -59,7 +59,7 @@ void msf_init(void) {
 
 // called by schedule
 void    msf_updateCellsPassed(open_addr_t* neighbor){
-
+#ifdef MSF_ADAPTING_TO_TRAFFIC
     if (icmpv6rpl_isPreferredParent(neighbor)==FALSE){
         return;
     }
@@ -75,6 +75,7 @@ void    msf_updateCellsPassed(open_addr_t* neighbor){
         msf_vars.numCellsPassed = 0;
         msf_vars.numCellsUsed   = 0;
     }
+#endif
 }
 
 void    msf_updateCellsUsed(open_addr_t* neighbor){