Merge pull request openwsn-berkeley#199 from openwsn-berkeley/develop…

…_FW-404 FW-404. Fixed.
RIOT-OS · Jul 1, 2015 · 7bd0bbd · 7bd0bbd
2 parents f31faa2 + 6d237fd
commit 7bd0bbd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/openstack/02a-MAClow/IEEE802154.c b/openstack/02a-MAClow/IEEE802154.c
@@ -62,7 +62,6 @@ void ieee802154_prependHeader(OpenQueueEntry_t* msg,
    // add termination IE accordingly 
    if (payloadIEPresent == TRUE) {
        ielistpresent = IEEE154_IELIST_YES; 
-       frameVersion  = IEEE154_FRAMEVERSION;
        //add header termination IE (id=0x7e)
        packetfunctions_reserveHeaderSize(msg,TerminationIE_Length);
        msg->payload[0] = Header_PayloadIE_TerminationIE         & 0xFF;
@@ -78,7 +77,6 @@ void ieee802154_prependHeader(OpenQueueEntry_t* msg,
            // no need for termination IE.
            if (headerIEPresent == TRUE){
                ielistpresent = IEEE154_IELIST_YES;
-               frameVersion  = IEEE154_FRAMEVERSION;
                packetfunctions_reserveHeaderSize(msg,TerminationIE_Length);
                msg->payload[0] = Header_Payload_TerminationIE        & 0xFF;
                msg->payload[1] = (Header_Payload_TerminationIE >> 8) & 0xFF;
@@ -90,10 +88,8 @@ void ieee802154_prependHeader(OpenQueueEntry_t* msg,
            // no payload, termination IE is omitted. check whether timeCorrection IE
            // presents. 
            if (frameType != IEEE154_TYPE_ACK) {
-               frameVersion = IEEE154_FRAMEVERSION_2006;
            } else {
                ielistpresent = IEEE154_IELIST_YES; // I will have a timeCorrection IE later
-               frameVersion = IEEE154_FRAMEVERSION;
            }
        }
   }
@@ -146,9 +142,9 @@ void ieee802154_prependHeader(OpenQueueEntry_t* msg,
    }
    // destpan -- se page 41 of 15.4-2011 std. DEST PANID only sent as it is equal to SRC PANID
    packetfunctions_writeAddress(msg,idmanager_getMyID(ADDR_PANID),OW_LITTLE_ENDIAN);
-   //dsn
-   packetfunctions_reserveHeaderSize(msg,sizeof(uint8_t));
-   *((uint8_t*)(msg->payload)) = sequenceNumber;
+
+   //dsn is suppressed
+
    //fcf (2nd byte)
    packetfunctions_reserveHeaderSize(msg,sizeof(uint8_t));
    temp_8b              = 0;
@@ -168,7 +164,8 @@ void ieee802154_prependHeader(OpenQueueEntry_t* msg,
    temp_8b             |= IEEE154_ADDR_EXT                << IEEE154_FCF_SRC_ADDR_MODE;
    //poipoi xv IE list present
    temp_8b             |= ielistpresent                   << IEEE154_FCF_IELIST_PRESENT;
-   temp_8b             |= frameVersion                    << IEEE154_FCF_FRAME_VERSION;
+   temp_8b             |= IEEE154_FRAMEVERSION_2012       << IEEE154_FCF_FRAME_VERSION;
+   temp_8b             |= IEEE154_DSN_SUPPRESSION_YES     << IEEE154_FCF_DSN_SUPPRESSION;
 
    *((uint8_t*)(msg->payload)) = temp_8b;
    //fcf (1st byte)
@@ -223,8 +220,9 @@ void ieee802154_retrieveHeader(OpenQueueEntry_t*      msg,
    //poipoi xv IE list present
    ieee802514_header->ieListPresent  = (temp_8b >> IEEE154_FCF_IELIST_PRESENT     ) & 0x01;//1b
    ieee802514_header->frameVersion   = (temp_8b >> IEEE154_FCF_FRAME_VERSION      ) & 0x03;//2b
+   ieee802514_header->dsn_suppressed = (temp_8b >> IEEE154_FCF_DSN_SUPPRESSION    ) & 0x01;//1b
 
-   if (ieee802514_header->ieListPresent==TRUE && ieee802514_header->frameVersion!=IEEE154_FRAMEVERSION){
+   if (ieee802514_header->ieListPresent==TRUE && ieee802514_header->frameVersion!=IEEE154_FRAMEVERSION_2012){
        return; //invalid packet accordint to p.64 IEEE15.4e
    }
 
@@ -261,10 +259,14 @@ void ieee802154_retrieveHeader(OpenQueueEntry_t*      msg,
          return; // this is an invalid packet, return
    }
    ieee802514_header->headerLength += 1;
-   // sequenceNumber
-   if (ieee802514_header->headerLength>msg->length) { return; } // no more to read!
-   ieee802514_header->dsn  = *((uint8_t*)(msg->payload)+ieee802514_header->headerLength);
-   ieee802514_header->headerLength += 1;
+
+   if (ieee802514_header->dsn_suppressed==FALSE) {
+       // sequenceNumber
+       if (ieee802514_header->headerLength>msg->length) { return; } // no more to read!
+       ieee802514_header->dsn  = *((uint8_t*)(msg->payload)+ieee802514_header->headerLength);
+       ieee802514_header->headerLength += 1;
+   }
+
    // panID
    if (ieee802514_header->headerLength>msg->length) { return; } // no more to read!
    packetfunctions_readAddress(((uint8_t*)(msg->payload)+ieee802514_header->headerLength),
@@ -320,7 +322,7 @@ void ieee802154_retrieveHeader(OpenQueueEntry_t*      msg,
       // no need for a default, since case would have been caught above
    }
 
-   if (ieee802514_header->ieListPresent==TRUE && ieee802514_header->frameVersion!=IEEE154_FRAMEVERSION){
+   if (ieee802514_header->ieListPresent==TRUE && ieee802514_header->frameVersion!=IEEE154_FRAMEVERSION_2012){
        return; //invalid packet accordint to p.64 IEEE15.4e
    }
 

diff --git a/openstack/02a-MAClow/IEEE802154.h b/openstack/02a-MAClow/IEEE802154.h
@@ -22,13 +22,14 @@ enum IEEE802154_fcf_enums {
    IEEE154_FCF_DEST_ADDR_MODE          = 2,
    IEEE154_FCF_FRAME_VERSION           = 4,
    IEEE154_FCF_SRC_ADDR_MODE           = 6,
+   IEEE154_FCF_DSN_SUPPRESSION         = 0,
 };
 
 
 enum IEEE802154_fcf_frameversion_enums {
    IEEE154_FRAMEVERSION_2003           = 0, //ieee154-2003
    IEEE154_FRAMEVERSION_2006           = 1, //ieee154-2006
-   IEEE154_FRAMEVERSION                = 2, //ieee154
+   IEEE154_FRAMEVERSION_2012           = 2, //ieee154e-2012
 };
 
 enum IEEE802154_fcf_type_enums {
@@ -49,6 +50,11 @@ enum IEEE802154_fcf_ielist_enums {
    IEEE154_IELIST_YES                  = 1,
 };
 
+enum IEEE802154_fcf_dsn_enums {
+   IEEE154_DSN_SUPPRESSION_NO          = 0,
+   IEEE154_DSN_SUPPRESSION_YES         = 1,
+};
+
 enum IEEE802154_fcf_pending_enums {
    IEEE154_PENDING_NO_FRAMEPENDING     = 0,
    IEEE154_PENDING_YES_FRAMEPENDING    = 1,
@@ -118,6 +124,7 @@ typedef struct {
    bool        ieListPresent;
    uint8_t     frameVersion;
    uint8_t     dsn;
+   bool        dsn_suppressed;
    open_addr_t panid;
    open_addr_t dest;
    open_addr_t src;