- CS 101 slave: added timeout validity checks

mz-automation · Oct 25, 2019 · cdabe02 · cdabe02
1 parent 7bf7477
commit cdabe02
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib60870-C/src/iec60870/link_layer/link_layer.c b/lib60870-C/src/iec60870/link_layer/link_layer.c
@@ -1086,7 +1086,6 @@ LinkLayerPrimaryBalanced_handleMessage(LinkLayerPrimaryBalanced self, uint8_t fc
 void
 LinkLayerPrimaryBalanced_runStateMachine(LinkLayerPrimaryBalanced self)
 {
-    /* TODO make timeouts dealing with time adjustments (time moves to past) */
     uint64_t currentTime = Hal_getTimeInMs();
 
     PrimaryLinkLayerState primaryState = self->primaryState;
@@ -1108,6 +1107,11 @@ LinkLayerPrimaryBalanced_runStateMachine(LinkLayerPrimaryBalanced self)
 
         if (self->waitingForResponse) {
 
+            if (self->lastSendTime > currentTime) {
+                /* last sent time not plausible! */
+                self->lastSendTime = currentTime;
+            }
+
             if (currentTime > (self->lastSendTime + self->linkLayer->linkLayerParameters->timeoutForAck)) {
 
                 SendFixedFrame(self->linkLayer, LL_FC_09_REQUEST_LINK_STATUS, self->otherStationAddress, true, self->linkLayer->dir, false, false);
@@ -1146,6 +1150,11 @@ LinkLayerPrimaryBalanced_runStateMachine(LinkLayerPrimaryBalanced self)
 
     case PLL_LINK_LAYERS_AVAILABLE:
 
+        if (self->lastReceivedMsg > currentTime) {
+            /* last received message not plausible */
+            self->lastReceivedMsg = currentTime;
+        }
+
         if ((currentTime - self->lastReceivedMsg) > (unsigned int) self->idleTimeout) {
             DEBUG_PRINT ("PLL - Idle timeout detected. Send link layer test function\n");
             self->sendLinkLayerTestFunction = true;