Commit 9c6b4078 authored by tepelmann's avatar tepelmann
Browse files

Fixed upper tester handling for indications.

Fixed ignoring of payload in BEACONs due to ethernet testing.
parent 16bfbb18
Loading
Loading
Loading
Loading
+3 −5
Original line number Original line Diff line number Diff line
@@ -98,12 +98,11 @@ module LibItsGeoNetworking_Functions {
                [] utPort.receive(UtGnTriggerResult:true) {
                [] utPort.receive(UtGnTriggerResult:true) {
                    tc_wait.stop;
                    tc_wait.stop;
                }
                }
                [] utPort.receive {
                    tc_wait.stop;
                }
                [] tc_wait.timeout {
                [] tc_wait.timeout {
                    v_return := false;
                    v_return := false;
                }
                }
                [] a_utDefault() {
                }
                [else] { // Shortcut defaults
                [else] { // Shortcut defaults
                    repeat;
                    repeat;
                }
                }
@@ -1126,9 +1125,8 @@ module LibItsGeoNetworking_Functions {
                repeat;
                repeat;
            }
            }
            [] utPort.receive {
            [] utPort.receive {
                tc_wait.stop;
                log("*** " & __SCOPE__ & ": INFO: Received unexpected UT message from IUT ***");
                log("*** " & __SCOPE__ & ": INFO: Received unexpected UT message from IUT ***");
                f_selfOrClientSyncAndVerdict("error", e_error);
                repeat;
            }
            }
        }
        }
        
        
+3 −3
Original line number Original line Diff line number Diff line
@@ -1116,10 +1116,10 @@ module LibItsGeoNetworking_Templates {
                    m_beaconHeaderType
                    m_beaconHeaderType
                ),
                ),
                extendedHeader := mw_beaconHeader(p_sourceLongPosVec),
                extendedHeader := mw_beaconHeader(p_sourceLongPosVec),
                payload := {
                payload := */*{
                    decodedPayload := omit,
                    decodedPayload := omit,
                    rawPayload := ''O
                    rawPayload := ''O
                }
                }*/ //FIXME ethernet testing requires minimum packet size of 60 bytes
            }
            }
            
            
        } // end group geoNwPacketBeaconTemplates
        } // end group geoNwPacketBeaconTemplates
@@ -1424,7 +1424,7 @@ module LibItsGeoNetworking_Templates {
            template (value) TrafficClass m_trafficClass ( in SCF p_scf := e_scfEnable, in ChannelOffload p_ChOff := e_choffDisabled ) := {
            template (value) TrafficClass m_trafficClass ( in SCF p_scf := e_scfEnable, in ChannelOffload p_ChOff := e_choffDisabled ) := {
                scf             := p_scf,
                scf             := p_scf,
                channelOffload  := p_ChOff,
                channelOffload  := p_ChOff,
                tcId            := 17
                tcId            := 0
            }
            }
            
            
            /**
            /**