Commit 61629d1b authored by mogos's avatar mogos
Browse files

added messageIdentifier validation

parent ad28251a

ttcn/LibItsECall_Functions.ttcn

+7 −4
Original line number Diff line number Diff line
@@ -78,7 +78,10 @@ 
     * @param   p_expectedEcallMessage  eCall message to be received

     */

    function f_verifyMSD(in template(present) ECallMessageUnion p_expectedEcallMessage) runs on PsapMtc {

        f_expectFeedback(mw_inbandMsdReceived(PX_WORKER, ?, f_toTemplate(p_expectedEcallMessage)));

        var FeedbackResult v_msd;



        v_msd := f_expectFeedback(mw_inbandMsdReceived(PX_WORKER, ?, f_toTemplate(p_expectedEcallMessage, vc_messageIdentifier)));

        vc_messageIdentifier := vc_messageIdentifier + 1;



        f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

    }
@@ -282,11 +285,11 @@ 
    * @desc   Generates a template from the given eCall message

    * @return ECallMessageUnion with the decoded field set (if the input is valid), otherwise unchanged

    */

    function f_toTemplate(in template(present) ECallMessageUnion p_eCallMessage) return template(present) ECallMessageUnion {

    function f_toTemplate(in template(present) ECallMessageUnion p_eCallMessage, in template integer p_messageIdentifier := ?) return template(present) ECallMessageUnion {

        p_eCallMessage := f_expandMsd(p_eCallMessage);



        if (ischosen(p_eCallMessage.decoded)) {

            p_eCallMessage.decoded.id := ?;

            p_eCallMessage.decoded.id := p_messageIdentifier;

            p_eCallMessage.decoded.msd.msdStructure.messageIdentifier := ?;

            p_eCallMessage.decoded.msd.msdStructure.timestamp := ?;

            p_eCallMessage.decoded.msd.msdStructure.numberOfPassengers := *;
@@ -455,7 +458,7 @@ 
            f_setSimulatorConfigurationPsap(p_configuration);



            vc_initialized := true;

            

            vc_messageIdentifier := 1;

        } // end f_configIvsUp



        /**