Commit eb25fc82 authored by garciay's avatar garciay
Browse files

Add support of DENM triggering in Secured GeoNetworking ATS

parent e506ce4d
Loading
Loading
Loading
Loading
+22 −3
Original line number Original line Diff line number Diff line
@@ -484,7 +484,7 @@ module LibItsCam_Templates {
         * @param   p_generationTime Timestamp of the generated message
         * @param   p_generationTime Timestamp of the generated message
         * @param   p_referencePosition Position of the sending station
         * @param   p_referencePosition Position of the sending station
         */
         */
        template (value) CAM m_camMsg_vehicle(
        template (value) CAM m_camMsg_vehicle_HF_BV(
            StationID p_stationId,
            StationID p_stationId,
            GenerationDeltaTime p_generationTime,
            GenerationDeltaTime p_generationTime,
            template (value) ReferencePosition p_referencePosition
            template (value) ReferencePosition p_referencePosition
@@ -538,14 +538,33 @@ module LibItsCam_Templates {
                            performanceClass := omit
                            performanceClass := omit
                        }
                        }
                    },
                    },
                    lowFrequencyContainer := omit,
                    specialVehicleContainer := omit
                }
            }
        }; // End of template m_camMsg_vehicle_HF_BV
        
        /**
         * @desc    Send template for Vehicle CAM PDU
         * @param   p_stationId Station ID of the source
         * @param   p_generationTime Timestamp of the generated message
         * @param   p_referencePosition Position of the sending station
         */
        template (value) CAM m_camMsg_vehicle(
            StationID p_stationId,
            GenerationDeltaTime p_generationTime,
            template (value) ReferencePosition p_referencePosition
        ) modifies m_camMsg_vehicle_HF_BV := {
            cam := {
                generationDeltaTime := p_generationTime,
                camParameters := {
                    lowFrequencyContainer := {
                    lowFrequencyContainer := {
                        basicVehicleContainerLowFrequency := {
                        basicVehicleContainerLowFrequency := {
                            vehicleRole := default_,
                            vehicleRole := default_,
                            exteriorLights := c_exteriorLights_daytimeRunningLightsOn,
                            exteriorLights := c_exteriorLights_daytimeRunningLightsOn,
                            pathHistory := {}
                            pathHistory := {}
                        }
                        }
                    },
                    }
                    specialVehicleContainer := omit
                }
                }
            }
            }
        };
        };
+13 −12
Original line number Original line Diff line number Diff line
@@ -577,7 +577,7 @@ module LibItsGeoNetworking_Templates {
         */
         */
        template (present) GeoNetworkingPacket mw_geoNwPacket(
        template (present) GeoNetworkingPacket mw_geoNwPacket(
            in template (present) CommonHeader p_commonHeader,
            in template (present) CommonHeader p_commonHeader,
            in template ExtendedHeader p_extHeader
            in template (present) ExtendedHeader p_extHeader
        ) := {
        ) := {
            packet := {
            packet := {
                commonHeader := p_commonHeader,
                commonHeader := p_commonHeader,
@@ -596,7 +596,7 @@ module LibItsGeoNetworking_Templates {
         */
         */
        template GeoNetworkingPacket mw_geoNwPduAnyPayload(
        template GeoNetworkingPacket mw_geoNwPduAnyPayload(
            in template (present) CommonHeader p_commonHeader,
            in template (present) CommonHeader p_commonHeader,
            in template ExtendedHeader p_extHeader
            in template (present) ExtendedHeader p_extHeader
        ) modifies mw_geoNwPacket := {
        ) modifies mw_geoNwPacket := {
            packet := {
            packet := {
                payload := ?
                payload := ?
@@ -613,7 +613,7 @@ module LibItsGeoNetworking_Templates {
         */
         */
        template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
        template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
            in template (present) CommonHeader p_commonHeader,
            in template (present) CommonHeader p_commonHeader,
            in template ExtendedHeader p_extHeader,
            in template (present) ExtendedHeader p_extHeader,
            in template (present) octetstring p_payload
            in template (present) octetstring p_payload
        ) modifies mw_geoNwPacket := {
        ) modifies mw_geoNwPacket := {
            packet := {
            packet := {
@@ -631,7 +631,7 @@ module LibItsGeoNetworking_Templates {
         */
         */
        template GeoNetworkingPacket mw_geoNwPduWithPayload(
        template GeoNetworkingPacket mw_geoNwPduWithPayload(
            in template (present) CommonHeader p_commonHeader,
            in template (present) CommonHeader p_commonHeader,
            in template ExtendedHeader p_extHeader,
            in template (present) ExtendedHeader p_extHeader,
            in template (present) Payload p_payload
            in template (present) Payload p_payload
        ) modifies mw_geoNwPacket := {
        ) modifies mw_geoNwPacket := {
            packet := {
            packet := {
@@ -2346,6 +2346,7 @@ module LibItsGeoNetworking_Templates {
            }
            }
            
            
            if(PX_GN_UPPER_LAYER == e_btpA) {
            if(PX_GN_UPPER_LAYER == e_btpA) {
                log("v_payload=", v_payload);
               v_payload := { decodedPayload := { btpPacket := mw_btpA(?, ?, { decodedPayload := *, rawPayload := p_finalPayload } )}, rawPayload := ?};
               v_payload := { decodedPayload := { btpPacket := mw_btpA(?, ?, { decodedPayload := *, rawPayload := p_finalPayload } )}, rawPayload := ?};
               return v_payload;
               return v_payload;
            }
            }