Add support of DENM triggering in Secured GeoNetworking ATS

ttcn/CAM/LibItsCam_Templates.ttcn

@@ -484,7 +484,7 @@ module LibItsCam_Templates {
          * @param   p_generationTime Timestamp of the generated message
          * @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,
             GenerationDeltaTime p_generationTime,
             template (value) ReferencePosition p_referencePosition
@@ -538,14 +538,33 @@ module LibItsCam_Templates {
                             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 := {
                         basicVehicleContainerLowFrequency := {
                             vehicleRole := default_,
                             exteriorLights := c_exteriorLights_daytimeRunningLightsOn,
                             pathHistory := {}
                         }
-                    },
-                    specialVehicleContainer := omit
+                    }
                 }
             }
         };

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

@@ -577,7 +577,7 @@ module LibItsGeoNetworking_Templates {
          */
         template (present) GeoNetworkingPacket mw_geoNwPacket(
             in template (present) CommonHeader p_commonHeader,
-            in template ExtendedHeader p_extHeader
+            in template (present) ExtendedHeader p_extHeader
         ) := {
             packet := {
                 commonHeader := p_commonHeader,
@@ -596,7 +596,7 @@ module LibItsGeoNetworking_Templates {
          */
         template GeoNetworkingPacket mw_geoNwPduAnyPayload(
             in template (present) CommonHeader p_commonHeader,
-            in template ExtendedHeader p_extHeader
+            in template (present) ExtendedHeader p_extHeader
         ) modifies mw_geoNwPacket := {
             packet := {
                 payload := ?
@@ -613,7 +613,7 @@ module LibItsGeoNetworking_Templates {
          */
         template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
             in template (present) CommonHeader p_commonHeader,
-            in template ExtendedHeader p_extHeader,
+            in template (present) ExtendedHeader p_extHeader,
             in template (present) octetstring p_payload
         ) modifies mw_geoNwPacket := {
             packet := {
@@ -631,7 +631,7 @@ module LibItsGeoNetworking_Templates {
          */
         template GeoNetworkingPacket mw_geoNwPduWithPayload(
             in template (present) CommonHeader p_commonHeader,
-            in template ExtendedHeader p_extHeader,
+            in template (present) ExtendedHeader p_extHeader,
             in template (present) Payload p_payload
         ) modifies mw_geoNwPacket := {
             packet := {
@@ -2310,23 +2310,23 @@ module LibItsGeoNetworking_Templates {
             var template (value) Payload v_payload;
             
             if(PX_GN_UPPER_LAYER == e_any) {
-               v_payload := { decodedPayload := omit, rawPayload := p_finalPayload};
-               return v_payload;
+                v_payload := { decodedPayload := omit, rawPayload := p_finalPayload};
+                return v_payload;
             }
             
             if(PX_GN_UPPER_LAYER == e_ipv6) {
-               v_payload := { decodedPayload := { ipv6Packet := m_ipv6Packet(c_unspecified, c_allNodesMca, c_noNextHdr, m_octetstringPayload(p_finalPayload))}, rawPayload := ''O};
-               return v_payload;
+                v_payload := { decodedPayload := { ipv6Packet := m_ipv6Packet(c_unspecified, c_allNodesMca, c_noNextHdr, m_octetstringPayload(p_finalPayload))}, rawPayload := ''O};
+                return v_payload;
             }
             
             if(PX_GN_UPPER_LAYER == e_btpA) {
-               v_payload := { decodedPayload := { btpPacket := m_btpA({ decodedPayload := omit, rawPayload := p_finalPayload })}, rawPayload := ''O};
-               return v_payload;
+                v_payload := { decodedPayload := { btpPacket := m_btpA({ decodedPayload := omit, rawPayload := p_finalPayload })}, rawPayload := ''O};
+                return v_payload;
             }
             
             if(PX_GN_UPPER_LAYER == e_btpB) {
-               v_payload := { decodedPayload := { btpPacket := m_btpB({ decodedPayload := omit, rawPayload := p_finalPayload })}, rawPayload := ''O};
-               return v_payload;
+                v_payload := { decodedPayload := { btpPacket := m_btpB({ decodedPayload := omit, rawPayload := p_finalPayload })}, rawPayload := ''O};
+                return v_payload;
             }
             
             return v_payload;
@@ -2346,6 +2346,7 @@ module LibItsGeoNetworking_Templates {
             }
             
             if(PX_GN_UPPER_LAYER == e_btpA) {
+                log("v_payload=", v_payload);
                v_payload := { decodedPayload := { btpPacket := mw_btpA(?, ?, { decodedPayload := *, rawPayload := p_finalPayload } )}, rawPayload := ?};
                return v_payload;
             }