802.11: Fixed bug #206, cancel receive timeout message when CTS arrives.

inet-framework · Jun 17, 2016 · 2c051a8 · 2c051a8
1 parent 37eb546
commit 2c051a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/inet/linklayer/ieee80211/mac/FrameExchange.cc b/src/inet/linklayer/ieee80211/mac/FrameExchange.cc
@@ -244,8 +244,10 @@ IFrameExchange::FrameProcessingResult StepBasedFrameExchange::lowerFrameReceived
         if (status == INPROGRESS) {
             logStatus(result == IGNORED ? "processReply(): frame IGNORED": "processReply(): frame PROCESSED");
             checkOperation(operation, "processReply()");
-            if (result == PROCESSED_KEEP || result == PROCESSED_DISCARD || operation != NONE)
+            if (result == PROCESSED_KEEP || result == PROCESSED_DISCARD || operation != NONE) {
+                cleanup();
                 proceed();
+            }
             else
                 operation = EXPECT_FULL_REPLY; // restore
         }
@@ -261,6 +263,7 @@ IFrameExchange::FrameProcessingResult StepBasedFrameExchange::lowerFrameReceived
             logStatus(result == IGNORED ? "processReply(): frame IGNORED": "processReply(): frame PROCESSED");
             checkOperation(operation, "processReply()");
             if (result == PROCESSED_KEEP || result == PROCESSED_DISCARD || operation != NONE) {
+                cleanup();
                 proceed();
             }
             else {

diff --git a/src/inet/linklayer/ieee80211/mac/Rx.cc b/src/inet/linklayer/ieee80211/mac/Rx.cc
@@ -87,6 +87,7 @@ void Rx::lowerFrameReceived(Ieee80211Frame *frame)
 
 void Rx::frameTransmitted(simtime_t durationField)
 {
+    Enter_Method_Silent();
     // the txIndex that transmitted the frame should already own the TXOP, so
     // it has no need to (and should not) check the NAV.
     setOrExtendNav(durationField);