LPP: upgrade dissector to v12.4.0

Change-Id: Ie09ab1002ccc3f275828615755b3130bfbb14fdc
Reviewed-on: https://code.wireshark.org/review/7852
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

4 files changed, 23 insertions, 23 deletions

diff --git a/asn1/lpp/LPP.asn b/asn1/lpp/LPP.asn
index 021e3d45bd..67bdbbb602 100644
--- a/asn1/lpp/LPP.asn
+++ b/asn1/lpp/LPP.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.355 V12.3.0 (2014-12)
+-- 3GPP TS 36.355 V12.4.0 (2015-03)
 --
 
 LPP-PDU-Definitions {
@@ -988,7 +988,7 @@ GNSS-NavModelSatelliteElement ::= SEQUENCE {
 	gnss-ClockModel		GNSS-ClockModel,
 	gnss-OrbitModel		GNSS-OrbitModel,
 	...,
-	[[	svHealthExt-v12xy BIT STRING (SIZE(4))			OPTIONAL		-- Need ON
+	[[	svHealthExt-v1240 BIT STRING (SIZE(4))			OPTIONAL		-- Need ON
 	]]
 }
 
@@ -1294,8 +1294,8 @@ GNSS-Almanac ::= SEQUENCE {
 	completeAlmanacProvided		BOOLEAN,
 	gnss-AlmanacList			GNSS-AlmanacList,
 	...,
-	[[	toa-ext-v12xy			INTEGER (256..1023)	OPTIONAL,	-- Need ON
-		ioda-ext-v12xy			INTEGER (4..15)		OPTIONAL	-- Need ON
+	[[	toa-ext-v1240			INTEGER (256..1023)	OPTIONAL,	-- Need ON
+		ioda-ext-v1240			INTEGER (4..15)		OPTIONAL	-- Need ON
 	]]
 }
 
diff --git a/asn1/lpp/lpp.cnf b/asn1/lpp/lpp.cnf
index 3e99cab676..109b9183ee 100644
--- a/asn1/lpp/lpp.cnf
+++ b/asn1/lpp/lpp.cnf
@@ -1,6 +1,6 @@
 # lpp.cnf
 # llp conformation file
-# Copyright 2011-2014 Pascal Quantin
+# Copyright 2011-2015 Pascal Quantin
 
 #.OPT
 PER
@@ -490,16 +490,16 @@ DGNSS-CorrectionsElement/udreGrowthRate STRINGS=VALS(lpp_udreGrowthRate_vals)
 #.TYPE_ATTR
 DGNSS-CorrectionsElement/udreValidityTime STRINGS=VALS(lpp_udreValidityTime_vals)
 
-#.FN_BODY GNSS-NavModelSatelliteElement/eag_1/svHealthExt-v12xy VAL_PTR = &svHealthExt_tvb
+#.FN_BODY GNSS-NavModelSatelliteElement/eag_1/svHealthExt-v1240 VAL_PTR = &svHealthExt_tvb
   tvbuff_t *svHealthExt_tvb = NULL;
   proto_tree *subtree;
 %(DEFAULT_BODY)s
 
-#.FN_FTR GNSS-NavModelSatelliteElement/eag_1/svHealthExt-v12xy
+#.FN_FTR GNSS-NavModelSatelliteElement/eag_1/svHealthExt-v1240
   if (svHealthExt_tvb) {
-    subtree = proto_item_add_subtree(actx->created_item, ett_lpp_svHealthExt_v12xy);
-    proto_tree_add_bits_item(subtree, hf_lpp_svHealthExt_v12xy_e5bhs, svHealthExt_tvb, 0, 2, ENC_BIG_ENDIAN);
-    proto_tree_add_bits_item(subtree, hf_lpp_svHealthExt_v12xy_e1_bhs, svHealthExt_tvb, 2, 2, ENC_BIG_ENDIAN);
+    subtree = proto_item_add_subtree(actx->created_item, ett_lpp_svHealthExt_v1240);
+    proto_tree_add_bits_item(subtree, hf_lpp_svHealthExt_v1240_e5bhs, svHealthExt_tvb, 0, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_bits_item(subtree, hf_lpp_svHealthExt_v1240_e1_bhs, svHealthExt_tvb, 2, 2, ENC_BIG_ENDIAN);
   }
 
 #.TYPE_ATTR
@@ -972,16 +972,16 @@ GNSS-AcquisitionAssistElement/elevation DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lpp_
   actx->created_item = proto_tree_add_uint_format_value(tree, hf_lpp_toa, tvb, old_offset, len,
                                                         toa, "%u s (%u)", val, toa);
 
-#.FN_BODY GNSS-Almanac/eag_1/toa-ext-v12xy VAL_PTR = &toa_ext
+#.FN_BODY GNSS-Almanac/eag_1/toa-ext-v1240 VAL_PTR = &toa_ext
   guint32 toa_ext, val;
   int len, old_offset = offset;
   T_GNSS_ID_enum gnss_id = (T_GNSS_ID_enum)GPOINTER_TO_UINT(actx->private_data);
 %(DEFAULT_BODY)s
 
-#.FN_FTR GNSS-Almanac/eag_1/toa-ext-v12xy
+#.FN_FTR GNSS-Almanac/eag_1/toa-ext-v1240
   len = (offset-old_offset) >> 3 ? (offset-old_offset) >> 3 : 1;
   val = (gnss_id == T_GNSS_ID_GALILEO) ? 600*toa_ext : 4096*toa_ext;
-  actx->created_item = proto_tree_add_uint_format_value(tree, hf_lpp_toa_ext_v12xy, tvb, old_offset, len,
+  actx->created_item = proto_tree_add_uint_format_value(tree, hf_lpp_toa_ext_v1240, tvb, old_offset, len,
                                                         toa_ext, "%u s (%u)", val, toa_ext);
 
 #.TYPE_ATTR
diff --git a/asn1/lpp/packet-lpp-template.c b/asn1/lpp/packet-lpp-template.c
index a883128793..033866e5ea 100644
--- a/asn1/lpp/packet-lpp-template.c
+++ b/asn1/lpp/packet-lpp-template.c
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Ref 3GPP TS 36.355 version 12.3.0 Release 12
+ * Ref 3GPP TS 36.355 version 12.4.0 Release 12
  * http://www.3gpp.org
  */
 
@@ -46,8 +46,8 @@ void proto_reg_handoff_lpp(void);
 static int proto_lpp = -1;
 
 #include "packet-lpp-hf.c"
-static int hf_lpp_svHealthExt_v12xy_e5bhs = -1;
-static int hf_lpp_svHealthExt_v12xy_e1_bhs = -1;
+static int hf_lpp_svHealthExt_v1240_e5bhs = -1;
+static int hf_lpp_svHealthExt_v1240_e1_bhs = -1;
 static int hf_lpp_kepSV_StatusINAV_e5bhs = -1;
 static int hf_lpp_kepSV_StatusINAV_e1_bhs = -1;
 static int hf_lpp_kepSV_StatusFNAV_e5ahs = -1;
@@ -63,7 +63,7 @@ static guint32 lpp_epdu_id = -1;
 /* Initialize the subtree pointers */
 static gint ett_lpp = -1;
 static gint ett_lpp_bitmap = -1;
-static gint ett_lpp_svHealthExt_v12xy = -1;
+static gint ett_lpp_svHealthExt_v1240 = -1;
 static gint ett_kepSV_StatusINAV = -1;
 static gint ett_kepSV_StatusFNAV = -1;
 static gint ett_lpp_bdsSvHealth_r12 = -1;
@@ -1646,12 +1646,12 @@ void proto_register_lpp(void) {
   static hf_register_info hf[] = {
 
 #include "packet-lpp-hfarr.c"
-    { &hf_lpp_svHealthExt_v12xy_e5bhs,
-      { "E5b Signal Health Status", "lpp.svHealthExt_v12xy.e5bhs",
+    { &hf_lpp_svHealthExt_v1240_e5bhs,
+      { "E5b Signal Health Status", "lpp.svHealthExt_v1240.e5bhs",
         FT_UINT8, BASE_DEC, VALS(lpp_signal_health_status_vals), 0,
         NULL, HFILL }},
-    { &hf_lpp_svHealthExt_v12xy_e1_bhs,
-      { "E1-B Signal Health Status", "lpp.svHealthExt_v12xy.e1_bhs",
+    { &hf_lpp_svHealthExt_v1240_e1_bhs,
+      { "E1-B Signal Health Status", "lpp.svHealthExt_v1240.e1_bhs",
         FT_UINT8, BASE_DEC, VALS(lpp_signal_health_status_vals), 0,
         NULL, HFILL }},
     { &hf_lpp_kepSV_StatusINAV_e5bhs,
@@ -1688,7 +1688,7 @@ void proto_register_lpp(void) {
   static gint *ett[] = {
     &ett_lpp,
     &ett_lpp_bitmap,
-    &ett_lpp_svHealthExt_v12xy,
+    &ett_lpp_svHealthExt_v1240,
     &ett_kepSV_StatusINAV,
     &ett_kepSV_StatusFNAV,
     &ett_lpp_bdsSvHealth_r12,
diff --git a/asn1/lpp/packet-lpp-template.h b/asn1/lpp/packet-lpp-template.h
index ee119284d4..a9006d64a3 100644
--- a/asn1/lpp/packet-lpp-template.h
+++ b/asn1/lpp/packet-lpp-template.h
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Ref 3GPP TS 36.355 version 12.3.0 Release 12
+ * Ref 3GPP TS 36.355 version 12.4.0 Release 12
  * http://www.3gpp.org
  */