Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 63 insertions, 19 deletions

diff --git a/epan/dissectors/asn1/its/its.cnf b/epan/dissectors/asn1/its/its.cnf
index b0205197..a6f0e8f2 100644
--- a/epan/dissectors/asn1/its/its.cnf
+++ b/epan/dissectors/asn1/its/its.cnf
@@ -25,7 +25,7 @@ RTCMEM
 VAM
 ItsPduHeaderVam
 IMZM
-
+CollectivePerceptionMessage
 EvcsnPdu
 DriverLanguage
 ChargingPower
@@ -39,14 +39,40 @@ TrailerPresenceInformation
 CartesianAngularAccelerationComponent
 CartesianAngularAccelerationComponentValue
 AngularAccelerationConfidence
-StandardLength2B
-StandardLength9b
 PrecipitationIntensity
 ObjectFace
 BogiesCount
 BarometricPressure
 AxlesCount
 AirHumidity
+TracesExtended
+RoadConfigurationSection
+RoadConfigurationSectionList
+RoadSectionDefinition
+PathPredictedList
+PathPredicted2
+PathExtended
+PathReferences
+OccupiedLanesWithConfidence
+MapReferences
+IvimReference
+IvimReferences
+GeneralizedLanePositions
+UsageIndication
+MapemConfiguration
+MapemElementReference
+BasicLaneConfiguration
+OrdinalNumber1B
+Position1d
+ProviderId
+MapemConnectionList
+MapemLaneList
+GeoPosition
+BasicLaneInformation
+StandardLength2B
+RoadSectionId
+PathId
+IssuerIdentifier
 
 #.NO_EMIT
 Code-Units WITHOUT_VALS
@@ -100,7 +126,7 @@ MapData
 SignalRequestMessage
 SignalStatusMessage
 RTCMcorrections
-CollectivePerceptionMessage
+CpmPayload
 ItsPduHeader
 VruAwareness
 InterferenceManagementZoneMessage
@@ -484,7 +510,7 @@ CauseCodeType
   regext->type = Reg_RTCMcorrections;
 #.END
 
-#.FN_HDR CollectivePerceptionMessage
+#.FN_HDR CpmPayload
   actx->private_data = (void*)wmem_new0(actx->pinfo->pool, its_private_data_t);
   col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, "CPM");
   col_set_str(actx->pinfo->cinfo, COL_INFO, "CPM");
@@ -756,24 +782,42 @@ CauseCodeType
 
 #.FN_PARS RegionId VAL_PTR = &((its_private_data_t*)actx->private_data)->region_id
 
-#.FN_PARS ProtocolVersion VAL_PTR = &((its_header_t*)actx->private_data)->version
-#.FN_PARS MessageId VAL_PTR = &((its_header_t*)actx->private_data)->msgId
-#.FN_PARS StationId VAL_PTR = actx->private_data?&((its_header_t*)actx->private_data)->stationId:NULL
-#.FN_PARS CpmContainerId VAL_PTR = &((its_header_t*)actx->private_data)->CpmContainerId
+#.FN_BODY ProtocolVersion VAL_PTR = &version
+    uint32_t version;
+%(DEFAULT_BODY)s
+    its_header_t *its_hdr = its_get_private_data(actx->pinfo);
+    its_hdr->version = version;
+
+#.FN_BODY MessageId VAL_PTR = &msgId
+    uint32_t msgId;
+%(DEFAULT_BODY)s
+    its_header_t *its_hdr = its_get_private_data(actx->pinfo);
+    its_hdr->msgId = msgId;
+
+#.FN_BODY StationId VAL_PTR = &stationId
+    uint32_t stationId;
+%(DEFAULT_BODY)s
+    its_header_t *its_hdr = its_get_private_data(actx->pinfo);
+    its_hdr->stationId = stationId;
+
+#.FN_BODY CpmContainerId VAL_PTR = &CpmContainerId
+    uint32_t CpmContainerId;
+%(DEFAULT_BODY)s
+    its_header_t *its_hdr = its_get_private_data(actx->pinfo);
+    its_hdr->CpmContainerId = CpmContainerId;
 
 #.FN_BODY ItsPduHeader
-  guint8 version = tvb_get_guint8(tvb, 0);
+  uint8_t version = tvb_get_uint8(tvb, 0);
   int test_offset = offset;
   if ((test_offset = dissector_try_uint(its_version_subdissector_table, version, tvb, actx->pinfo, tree))) {
     return test_offset;
   }
   // Lets try it that way, regarless of version value...
-  its_header_t *hdr = wmem_new0(actx->pinfo->pool, its_header_t);
-  actx->private_data = (void*)hdr;
 %(DEFAULT_BODY)s
   tap_queue_packet(its_tap, actx->pinfo, actx->private_data);
   tvbuff_t *next_tvb = tvb_new_subset_length(tvb, offset >> 3, -1);
-  int data_offset = dissector_try_uint(its_msgid_subdissector_table, (hdr->version << 16)+hdr->msgId, next_tvb, actx->pinfo, tree);
+  its_header_t *its_hdr = its_get_private_data(actx->pinfo);
+  int data_offset = dissector_try_uint(its_msgid_subdissector_table, (its_hdr->version << 16)+its_hdr->msgId, next_tvb, actx->pinfo, tree);
   if (!data_offset) {
     proto_tree_add_expert(tree, actx->pinfo, &ei_its_no_sub_dis, next_tvb, 0,  - 1);
     data_offset = call_data_dissector(next_tvb, actx->pinfo, tree);
@@ -900,22 +944,22 @@ GenerationDeltaTime
 
 #.FN_BODY InternationalSign-speedLimits/unit
   offset = dissect_per_constrained_integer(%(TVB)s, %(OFFSET)s, %(ACTX)s, %(TREE)s, %(HF_INDEX)s,
-                                           0U, 1U, %(VAL_PTR)s, FALSE);
+                                           0U, 1U, %(VAL_PTR)s, false);
 #.END
 
 #.FN_BODY Weight/unit
   offset = dissect_per_constrained_integer(%(TVB)s, %(OFFSET)s, %(ACTX)s, %(TREE)s, %(HF_INDEX)s,
-                                           10U, 12U, %(VAL_PTR)s, FALSE);
+                                           10U, 12U, %(VAL_PTR)s, false);
 #.END
 
 #.FN_BODY DistOrDuration-Units
   offset = dissect_per_constrained_integer(%(TVB)s, %(OFFSET)s, %(ACTX)s, %(TREE)s, %(HF_INDEX)s,
-                                           2U, 9U, %(VAL_PTR)s, FALSE);
+                                           2U, 9U, %(VAL_PTR)s, false);
 #.END
 
 #.FN_BODY Distance/unit
   offset = dissect_per_constrained_integer(%(TVB)s, %(OFFSET)s, %(ACTX)s, %(TREE)s, %(HF_INDEX)s,
-                                           2U, 8U, %(VAL_PTR)s, FALSE);
+                                           2U, 8U, %(VAL_PTR)s, false);
 #.END
 
 #=== PtActivation =======================================================
@@ -927,11 +971,11 @@ GenerationDeltaTime
   pta = wmem_new0(actx->pinfo->pool, its_pt_activation_data_t);
   actx->private_data = pta;
 #.FN_FTR
-  dissector_try_uint_new(cam_pt_activation_table, pta->type, pta->data, actx->pinfo, tree, TRUE, NULL);
+  dissector_try_uint_new(cam_pt_activation_table, pta->type, pta->data, actx->pinfo, tree, true, NULL);
   actx->private_data = priv_data;
 #.END
 
-#.FN_PARS 
+#.FN_PARS
 PtActivationType VAL_PTR = &((its_pt_activation_data_t*)actx->private_data)->type
 PtActivationData VAL_PTR = &((its_pt_activation_data_t*)actx->private_data)->data
 #.END