act as leaf node by stopping send DIO if neighbor's control slot is conflict with parent's.

changtengfei · changtengfei · commit 6160a07e1bf9 · 2017-08-28T09:50:47.000+02:00
diff --git a/openstack/02a-MAClow/IEEE802154E.c b/openstack/02a-MAClow/IEEE802154E.c
@@ -927,7 +927,8 @@ port_INLINE void activity_ti1ORri1() {
             // sfcontrol
             /**
                 minimal slot 0:
-                    only send DIO with possibility of 10 %
+                    only send DIO with possibility of 10% or
+                    stop sending DIO if control slot conflict detected
                 my control slot:
                     when traffic controlled by sf0:
                         only allow sixtopres packet to send
@@ -940,7 +941,10 @@ port_INLINE void activity_ti1ORri1() {
             */
             if (ieee154e_vars.slotOffset==SCHEDULE_MINIMAL_6TISCH_SLOTOFFSET){
                 ieee154e_vars.dataToSend = openqueue_macGetDIOPacket();
-                if (ieee154e_vars.dataToSend != NULL && openrandom_get16b()>0xffff/10){
+                if (
+                    (ieee154e_vars.dataToSend != NULL && openrandom_get16b()>0xffff/10) ||
+                    sf0_getControlslotConflictWithParent()
+                ){
                     ieee154e_vars.dataToSend = NULL;
                 }
             } else {
@@ -960,7 +964,8 @@ port_INLINE void activity_ti1ORri1() {
                 } else {
                     if (cellType==CELLTYPE_TXRX && neighbor.type == ADDR_64B){
                         // this is parent control slot
-                        ieee154e_vars.dataToSend = openqueue_macGetPacketCreatedBy(COMPONENT_SIXTOP_RES,&neighbor);
+//                        ieee154e_vars.dataToSend = openqueue_macGetPacketCreatedBy(COMPONENT_SIXTOP_RES,&neighbor);
+                        ieee154e_vars.dataToSend = openqueue_macGetDataPacket(&neighbor);
                     } else {
                         // all other slots send data packet 
                         ieee154e_vars.dataToSend = openqueue_macGetDataPacket(&neighbor);
@@ -2498,6 +2503,7 @@ bool isValidEbFormat(OpenQueueEntry_t* pkt, uint16_t* lenIE){
                         // there is a conflict when using this hashFunction, replace my control slot by neighbor's control slot.
                         // (same slotoffset and type but with neighbor's ADDR_64B address associated)
                         schedule_removeActiveSlot(tempSlotoffset,&temp_neighbor);
+                        sf0_setControlslotConflictWithParent(TRUE);
                     }
                     
                     schedule_addActiveSlot(
diff --git a/openstack/02b-MAChigh/sf0.c b/openstack/02b-MAChigh/sf0.c
@@ -171,6 +171,14 @@ void sf0_6pQuery_notifyReceived(uint16_t queryOffset, open_addr_t* neighbor){
     }
 }
 
+bool sf0_getControlslotConflictWithParent(){
+    return sf0_vars.controlCellConflictWithParent;
+}
+
+void sf0_setControlslotConflictWithParent(bool isConflicted){
+    sf0_vars.controlCellConflictWithParent = isConflicted;
+}
+
 void sf0_6pQuery_timer_cb(opentimers_id_t id){
     open_addr_t     temp_neighbor;
     owerror_t       outcome;
diff --git a/openstack/02b-MAChigh/sf0.h b/openstack/02b-MAChigh/sf0.h
@@ -25,7 +25,7 @@ typedef struct {
    bool sf_controlSlot_reserved;
    bool sf_isBusySendingQuery;
    uint8_t sf_query_offset;
-   
+   bool controlCellConflictWithParent;
    bool busySendingKA;
    // sfcontrol
 } sf0_vars_t;
@@ -48,6 +48,8 @@ uint16_t  sf0_getControlslotoffset(void);
 uint16_t  sf0_hashFunction(uint16_t functionInput);
 bool      sf0_isTrafficControlled(void);
 void      sf0_6pQuery_notifyReceived(uint16_t queryOffset, open_addr_t* neighbor);
+bool      sf0_getControlslotConflictWithParent();
+void      sf0_setControlslotConflictWithParent(bool isConflicted);
 
 void      sf0_6pQuery_sendDone(void);
 // sf control
diff --git a/projects/python/SConscript.env b/projects/python/SConscript.env
@@ -637,6 +637,8 @@ functionsToChange = [
     'sf0_getMetadata',
     'sf0_translateMetadata',
     'sf0_handleRCError',
+    'sf0_getControlslotConflictWithParent',
+    'sf0_setControlslotConflictWithParent',
     # sixtop
     'sixtop_init',
     'sixtop_setKaPeriod',

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,14 @@ void sf0_6pQuery_notifyReceived(uint16_t queryOffset, open_addr_t* neighbor){`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
	`174`	`+bool sf0_getControlslotConflictWithParent(){`
	`175`	`+ return sf0_vars.controlCellConflictWithParent;`
	`176`	`+}`
	`177`	`+`
	`178`	`+void sf0_setControlslotConflictWithParent(bool isConflicted){`
	`179`	`+ sf0_vars.controlCellConflictWithParent = isConflicted;`
	`180`	`+}`
	`181`	`+`
`174`	`182`	`void sf0_6pQuery_timer_cb(opentimers_id_t id){`
`175`	`183`	`open_addr_t temp_neighbor;`
`176`	`184`	`owerror_t outcome;`