Commit 999c0ec8 authored by berge's avatar berge
Browse files

Added possiblity for IUT not to include BTP header in UT indication even...

Added possiblity for IUT not to include BTP header in UT indication even though PX_GN_UPPER_LAYER is set to e_btp*
parent 131012b9
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -172,6 +172,14 @@ module LibItsGeoNetworking_Pixits {
             * @see  ETSI TS 102 871-3 Table B.7
             */
            modulepar NextHeader PX_GN_UPPER_LAYER := e_btpA;    

            /**
             * @desc   Is BTP header present in IUT's UT indication. Only applicable if PX_GN_UPPER_LAYER == e_btpA or e_btpB.
             * @remark It may happen that IUT do not report BTP header in UT indications (dur to GN/BTP merge)
             * @see    ETSI TS 102 871-3 Table B.7
             */
            modulepar boolean PX_BTP_IN_UT_IND := true;    

        }
        
        group parametrisation {
+11 −0
Original line number Diff line number Diff line
@@ -2321,6 +2321,17 @@ module LibItsGeoNetworking_Templates {
    
    group geoTemplateFunctions {
        
        function f_adaptPayloadForUtInd_m(in template (value) Payload p_gnPayload) return octetstring {
            
            if(PX_BTP_IN_UT_IND == false) {
            	if(PX_GN_UPPER_LAYER == e_btpA or PX_GN_UPPER_LAYER == e_btpB) {
				    return bit2oct(encvalue(p_gnPayload.decodedPayload.btpPacket.payload));
            	}
            }
            
			return bit2oct(encvalue(p_gnPayload));
        }

        function f_adaptPayload_m(in template (value) octetstring p_finalPayload) return template (value) Payload {
            var template (value) Payload v_payload;