Commit f79013a0 authored by garciay's avatar garciay
Browse files

Change SSP & ITS-AID types for transferring from lower layer to upper layer

parent 7e49401d

ttcn/CAM/LibItsCam_Templates.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ module LibItsCam_Templates { 
         */

        template CamInd mw_camIndWithSecurityParameters(

                                                          template (present) CAM p_camMsg,

                                                          template Oct16 p_ssp := *,

                                                          template Oct16 p_its_aid := *

                                                          template Bit128 p_ssp := *,

                                                          template UInt32 p_its_aid := *

        ) modifies mw_camInd := { 

            ssp             := p_ssp,

            its_aid         := p_its_aid

ttcn/CAM/LibItsCam_TestSystem.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ module LibItsCam_TestSystem { 
                UInt8       gnTrafficClass optional,

                UInt16      btpDestinationPort optional,

                UInt16      btpInfo optional,

                Oct16       ssp optional,

                Oct16       its_aid optional

                Bit128      ssp optional,

                UInt32      its_aid optional

            }

            with {

                encode (msgIn) "LibItsCam_asn1"

ttcn/DENM/LibItsDenm_Templates.ttcn

+25 −25
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ module LibItsDenm_Templates { 
         */

        template DenmInd mw_denmIndWithSecurityParameters(

                                                          template (present) DENM p_denMsg,

                                                          template Oct16 p_ssp := *,

                                                          template Oct16 p_its_aid := *

                                                          template Bit128 p_ssp := *,

                                                          template UInt32 p_its_aid := *

        ) modifies mw_denmInd := { 

            ssp             := p_ssp,

            its_aid         := p_its_aid
@@ -810,26 +810,26 @@ module LibItsDenm_Templates { 
    

    group sspTemplates {

        

        template (present) DenmInd mw_denmInd_SSP (

		    template (present) DENM p_denMsg,

            template (present) bitstring p_SSP := ?

        ) := {

            msgIn               := p_denMsg,

            gnNextHeader        := *,

            gnHeaderType        := *,

            gnHeaderSubtype     := *,

            gnLifetime          := *,

            gnTrafficClass      := *,

            btpDestinationPort  := *,

            btpInfo             := *,

//          TODO: add support for SSP

//			ssp                 := p_SSP,

            ssp                 := *,

//          TODO: add support for ItsAid

//			its_aid             := c_denmItsAid 

            its_aid             := * 

        }

    	

//        template (present) DenmInd mw_denmInd_SSP (

//                                               template (present) DENM p_denMsg,

//            template (present) bitstring p_SSP := ?

//        ) := {

//            msgIn               := p_denMsg,

//            gnNextHeader        := *,

//            gnHeaderType        := *,

//            gnHeaderSubtype     := *,

//            gnLifetime          := *,

//            gnTrafficClass      := *,

//            btpDestinationPort  := *,

//            btpInfo             := *,

////          TODO: add support for SSP

////            ssp                 := p_SSP,

//            ssp                 := *,

////          TODO: add support for ItsAid

////            its_aid             := c_denmItsAid 

//            its_aid             := * 

//        }

//        

        template (present) bitstring mw_sspTrafficCondition        := '*1'B;

        template (present) bitstring mw_sspAccident                := '*1?'B;

        template (present) bitstring mw_sspRoadworks               := '*1??'B;

ttcn/DENM/LibItsDenm_TestSystem.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ module LibItsDenm_TestSystem { 
                UInt8       gnTrafficClass optional,

                UInt16      btpDestinationPort optional,

                UInt16      btpInfo optional,

                Oct16       ssp optional,

                Oct16       its_aid optional

                Bit128      ssp optional,

                UInt32      its_aid optional

            }

            with {

                encode (msgIn) "LibItsDenm_asn1"

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

+4 −6
Original line number Diff line number Diff line
@@ -10,10 +10,8 @@ module LibItsGeoNetworking_TestSystem { 
    // LibCommon

    import from LibCommon_Time {modulepar all};

    import from LibCommon_Sync all;

    import from LibCommon_BasicTypesAndValues {

        type UInt16;

        const c_uInt16Max

    };

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

    

    // LibItsCommon

    import from LibItsCommon_TestSystem all;
@@ -142,8 +140,8 @@ module LibItsGeoNetworking_TestSystem { 
            type record GeoNetworkingInd {

                GeoNetworkingPdu    msgIn,

                MacAddress          macDestinationAddress,

                octetstring         ssp optional,

                octetstring         its_aid optional

                Bit128      ssp optional,

                UInt32      its_aid optional

            }

            

            /**