Add support of SPATEM, including one state rotation

ttcn/Common/LibItsCommon_Functions.ttcn

@@ -16,7 +16,7 @@ module LibItsCommon_Functions {
     // LibIts
     import from LibItsCommon_Pixits all;
     import from ITS_Container language "ASN.1:1997" all;
-
+    import from DSRC language "ASN.1:1997" all;
     
     group generalFunctions {
         
@@ -88,7 +88,7 @@ module LibItsCommon_Functions {
     
         /**
          * @desc    Gets the current time since 01/01/2004
-         * @return  Timestamp - current time since 01/01/2004 in milliseconds
+         * @return  TimestampIts - current time since 01/01/2004 in milliseconds
          */
         function f_getCurrentTime() return TimestampIts {
             var TimestampIts v_timeStamp := 0;
@@ -99,6 +99,19 @@ module LibItsCommon_Functions {
             return v_timeStamp;
         }
            
+        /**
+         * @desc    Gets the current time since 01/01/2004
+         * @return  TimeMark - tenths of a second in the current or next hour in units of 1/10th second from UTC time
+         */
+        function f_getCurrentTimeMark() return TimeMark {
+            var TimeMark v_timeMark := 0;
+            
+//            log("*** f_getCurrentTimeMark: INFO: calling fx_getCurrentTimeMark() ***");
+            v_timeMark := fx_getCurrentTimeMark();
+            
+            return v_timeMark;
+        }
+           
     } // end generalFunctions  
        
     group itsFunctions { 
@@ -171,6 +184,12 @@ module LibItsCommon_Functions {
          */
         external function fx_getCurrentTime() return TimestampIts;
         
+        /**
+         * @desc    Gets the current time since 01/01/2004
+         * @return  TimeMark - tenths of a second in the current or next hour in units of 1/10th second from UTC time
+         */
+        external function fx_getCurrentTimeMark() return UInt32;
+        
         /**
          * @desc    External function to compute distance between two points
          * @param   p_latitudeA   Latitude of first point

ttcn/DENM/LibItsDenm_Pics.ttcn

-/**
- *  @author   ETSI / STF405
- *  @version  $URL$
- *            $Id$
- *  @desc     DENM PICS
- *
- */
-module LibItsDenm_Pics {
-    
-    group denmPics {
-        
-        /**
-         * @desc Support for DENM generation
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_DENM_GENERATION := true;
-
-        /**
-         * @desc Support for DENM update
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_DENM_UPDATE := true;
-
-        /**
-         * @desc Support for DENM repetition
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_DENM_REPETITION := true;
-
-        /**
-         * @desc Support for DENM cancellation
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_DENM_CANCELLATION := true;
-
-        /**
-         * @desc Support for DENM NEGATION
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_DENM_NEGATION := false;
-
-        /**
-         * @desc Support for DENM RECEPTION
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_DENM_RECEPTION := true;
-
-        /**
-         * @desc Support for Keep-Alive Forwarding
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_DENM_KAF := false;
-
-        /**
-         * @desc Support for impact recuction
-         * @see  ETSI TS 102 869-2 Table 3
-         */
-        modulepar boolean PICS_IMPACT_REDUCTION := true;
-        
-        /**
-         * @desc Is the IUT running in secured mode?
-         */
-        modulepar boolean PICS_IS_IUT_SECURED := false;
-        
-    } // end denmPics
-    
+/**
+ *  @author   ETSI / STF405
+ *  @version  $URL$
+ *            $Id$
+ *  @desc     DENM PICS
+ *
+ */
+module LibItsDenm_Pics {
+    
+    group denmPics {
+        
+        /**
+         * @desc Support for DENM generation
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_DENM_GENERATION := true;
+
+        /**
+         * @desc Support for DENM update
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_DENM_UPDATE := true;
+
+        /**
+         * @desc Support for DENM repetition
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_DENM_REPETITION := true;
+
+        /**
+         * @desc Support for DENM cancellation
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_DENM_CANCELLATION := true;
+
+        /**
+         * @desc Support for DENM NEGATION
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_DENM_NEGATION := false;
+
+        /**
+         * @desc Support for DENM RECEPTION
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_DENM_RECEPTION := true;
+
+        /**
+         * @desc Support for Keep-Alive Forwarding
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_DENM_KAF := false;
+
+        /**
+         * @desc Support for impact recuction
+         * @see  ETSI TS 102 869-2 Table 3
+         */
+        modulepar boolean PICS_IMPACT_REDUCTION := true;
+        
+        /**
+         * @desc Is the IUT running in secured mode?
+         */
+        modulepar boolean PICS_IS_IUT_SECURED := false;
+        
+    } // end denmPics
+    
 }
\ No newline at end of file

ttcn/GeoNetworking/LibItsGeoNetworking_Pics.ttcn

@@ -68,9 +68,10 @@ module LibItsGeoNetworking_Pics {
          * @desc GN Security support enabled or disabled
          * @see  ETSI TS 102 871-2 Table 4
          * @remark This PIC is different than PICS_IS_IUT_SECURED. 
-         *         When set to true, this PIC indicates that the GeoNetworking is running with security against a secured device
+         *         When set to true, this PIC indicates that the GeoNetworking is running with security ATS
+         *         UtInitialse shall indicate which certificate the IUT shall use
          */
-        modulepar boolean PICS_GN_SECURITY := true;
+        modulepar boolean PICS_GN_SECURITY := false;
         
         /**
          * @desc Maximum number of retransmissions of LS_REQUEST packets
@@ -359,6 +360,7 @@ module LibItsGeoNetworking_Pics {
      * @desc Is the IUT running in secured mode?
      * @remark This PIC is different than PICS_GN_SECURITY. 
      *         When set to true, this PIC indicates that the GeoNetworking is running without security against a secured device
+     *         UtInitialse does not indicate any certificate
      */
     modulepar boolean PICS_IS_IUT_SECURED := false;
     

ttcn/GeoNetworking/LibItsGeoNetworking_Pixits.ttcn

@@ -171,7 +171,7 @@ module LibItsGeoNetworking_Pixits {
              * @desc The IUT's upper layer
              * @see  ETSI TS 102 871-3 Table B.7
              */
-            modulepar NextHeader PX_GN_UPPER_LAYER := e_btpA;    
+            modulepar NextHeader PX_GN_UPPER_LAYER := e_btpB;    
 
             /**
              * @desc   Is BTP header present in IUT's UT indication. Only applicable if PX_GN_UPPER_LAYER == e_btpA or e_btpB.
@@ -190,7 +190,7 @@ module LibItsGeoNetworking_Pixits {
              */
             modulepar integer PX_MESSAGE_COUNT := 5;
             
-            /**
+            /**
              * @desc Time necessary for IUT to detect neighbours
              * @see  ETSI TS 102 871-3 Table B.7
              */

ttcn/SremSsem/LibItsSremSsem_Pics.ttcn

@@ -25,7 +25,7 @@ module LibItsSremSsem_Pics {
     /**
      * @desc Is IUT acting as a RSU? 
      */
-    modulepar boolean PICS_RSU_ROLE := true;
+    modulepar boolean PICS_RSU_ROLE := false;
     
     /**
      * @desc Is the IUT running in secured mode?