LPPa: upgrade dissector to v14.4.0

Change-Id: Ia84124f5bd7bf7167fae5c431b69de76ca9073eb
Reviewed-on: https://code.wireshark.org/review/26684
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

9 files changed, 36 insertions, 14 deletions

diff --git a/epan/dissectors/asn1/lppa/LPPA-Common.asn b/epan/dissectors/asn1/lppa/LPPA-Common.asn
index d88adf576d..525d4115bb 100644
--- a/epan/dissectors/asn1/lppa/LPPA-Common.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-Common.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V14.2.0 (2017-06)
+-- 3GPP TS 36.455 V14.4.0 (2017-12)
 --
 
 -- **************************************************************
diff --git a/epan/dissectors/asn1/lppa/LPPA-Constant.asn b/epan/dissectors/asn1/lppa/LPPA-Constant.asn
index cbcaa159ad..92dfbb4518 100644
--- a/epan/dissectors/asn1/lppa/LPPA-Constant.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-Constant.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V14.2.0 (2017-06)
+-- 3GPP TS 36.455 V14.4.0 (2017-12)
 --
 
 -- **************************************************************
diff --git a/epan/dissectors/asn1/lppa/LPPA-Container.asn b/epan/dissectors/asn1/lppa/LPPA-Container.asn
index 1643910da7..9056fce298 100644
--- a/epan/dissectors/asn1/lppa/LPPA-Container.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-Container.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V14.2.0 (2017-06)
+-- 3GPP TS 36.455 V14.4.0 (2017-12)
 --
 
 -- **************************************************************
diff --git a/epan/dissectors/asn1/lppa/LPPA-ElementaryProcedure.asn b/epan/dissectors/asn1/lppa/LPPA-ElementaryProcedure.asn
index 35c8e82670..5e35904aa2 100644
--- a/epan/dissectors/asn1/lppa/LPPA-ElementaryProcedure.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-ElementaryProcedure.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V14.2.0 (2017-06)
+-- 3GPP TS 36.455 V14.4.0 (2017-12)
 --
 
 -- **************************************************************
diff --git a/epan/dissectors/asn1/lppa/LPPA-InformationElement.asn b/epan/dissectors/asn1/lppa/LPPA-InformationElement.asn
index 7967e6a2f1..9d8959914b 100644
--- a/epan/dissectors/asn1/lppa/LPPA-InformationElement.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-InformationElement.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V14.2.0 (2017-06)
+-- 3GPP TS 36.455 V14.4.0 (2017-12)
 --
 
 -- **************************************************************
@@ -361,6 +361,8 @@ NumberOfFrequencyHoppingBands ::= ENUMERATED {
 	...
 }
 
+NPRSSequenceInfo ::= INTEGER (0..174,...)
+
 -- O
 
 OffsetNBChanneltoEARFCN ::= ENUMERATED {
@@ -434,7 +436,8 @@ OTDOACell-Information-Item ::= CHOICE {
 	dL-Bandwidth				DL-Bandwidth,
 	pRSOccasionGroup			PRSOccasionGroup,
 	pRSFreqHoppingConfig		PRSFrequencyHoppingConfiguration,
-	repetitionNumberofSIB1-NB	RepetitionNumberofSIB1-NB
+	repetitionNumberofSIB1-NB	RepetitionNumberofSIB1-NB,
+	nPRSSequenceInfo			NPRSSequenceInfo
 }
 
 OTDOA-Information-Item ::= ENUMERATED {
@@ -464,7 +467,8 @@ OTDOA-Information-Item ::= ENUMERATED {
 		multipleprsConfigurationsperCell,
 		prsOccasionGroup,
 		prsFrequencyHoppingConfiguration,
-		repetitionNumberofSIB1-NB
+		repetitionNumberofSIB1-NB,
+		nPRSSequenceInfo
 }
 
 -- P
diff --git a/epan/dissectors/asn1/lppa/LPPA-PDU.asn b/epan/dissectors/asn1/lppa/LPPA-PDU.asn
index 8ab9feb251..da74f51d65 100644
--- a/epan/dissectors/asn1/lppa/LPPA-PDU.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-PDU.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V13.2.0 (2017-06)
+-- 3GPP TS 36.455 V14.4.0 (2017-12)
 --
 
 -- **************************************************************
diff --git a/epan/dissectors/asn1/lppa/lppa.cnf b/epan/dissectors/asn1/lppa/lppa.cnf
index d2b15b090d..2207e49f09 100644
--- a/epan/dissectors/asn1/lppa/lppa.cnf
+++ b/epan/dissectors/asn1/lppa/lppa.cnf
@@ -1,6 +1,6 @@
 # lppa.cnf
 # llpa conformation file
-# Copyright 2011-2017 Pascal Quantin
+# Copyright 2011-2018 Pascal Quantin
 
 #.OPT
 PER
diff --git a/epan/dissectors/asn1/lppa/packet-lppa-template.c b/epan/dissectors/asn1/lppa/packet-lppa-template.c
index 6d28167107..b34445600d 100644
--- a/epan/dissectors/asn1/lppa/packet-lppa-template.c
+++ b/epan/dissectors/asn1/lppa/packet-lppa-template.c
@@ -1,6 +1,6 @@
 /* packet-lppa.c
  * Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection
- * Copyright 2011-2016, Pascal Quantin <pascal.quantin@gmail.com>
+ * Copyright 2011-2018, Pascal Quantin <pascal.quantin@gmail.com>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 36.455 version 14.2.0 Release 14
+ * Ref 3GPP TS 36.455 version 14.4.0 Release 14
  * http://www.3gpp.org
  */
 
diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c
index 039a75d6a1..b6710241b0 100644
--- a/epan/dissectors/packet-lppa.c
+++ b/epan/dissectors/packet-lppa.c
@@ -8,7 +8,7 @@
 #line 1 "./asn1/lppa/packet-lppa-template.c"
 /* packet-lppa.c
  * Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection
- * Copyright 2011-2016, Pascal Quantin <pascal.quantin@gmail.com>
+ * Copyright 2011-2018, Pascal Quantin <pascal.quantin@gmail.com>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -16,7 +16,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 36.455 version 14.2.0 Release 14
+ * Ref 3GPP TS 36.455 version 14.4.0 Release 14
  * http://www.3gpp.org
  */
 
@@ -184,6 +184,7 @@ static int hf_lppa_dL_Bandwidth = -1;             /* DL_Bandwidth */
 static int hf_lppa_pRSOccasionGroup = -1;         /* PRSOccasionGroup */
 static int hf_lppa_pRSFreqHoppingConfig = -1;     /* PRSFrequencyHoppingConfiguration */
 static int hf_lppa_repetitionNumberofSIB1_NB = -1;  /* RepetitionNumberofSIB1_NB */
+static int hf_lppa_nPRSSequenceInfo = -1;         /* NPRSSequenceInfo */
 static int hf_lppa_thirty_two = -1;               /* BIT_STRING_SIZE_32 */
 static int hf_lppa_sixty_four = -1;               /* BIT_STRING_SIZE_64 */
 static int hf_lppa_one_hundred_and_twenty_eight = -1;  /* BIT_STRING_SIZE_128 */
@@ -1717,6 +1718,16 @@ dissect_lppa_RepetitionNumberofSIB1_NB(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 }
 
 
+
+static int
+dissect_lppa_NPRSSequenceInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+                                                            0U, 174U, NULL, TRUE);
+
+  return offset;
+}
+
+
 static const value_string lppa_OTDOACell_Information_Item_vals[] = {
   {   0, "pCI" },
   {   1, "cellId" },
@@ -1744,6 +1755,7 @@ static const value_string lppa_OTDOACell_Information_Item_vals[] = {
   {  23, "pRSOccasionGroup" },
   {  24, "pRSFreqHoppingConfig" },
   {  25, "repetitionNumberofSIB1-NB" },
+  {  26, "nPRSSequenceInfo" },
   { 0, NULL }
 };
 
@@ -1774,6 +1786,7 @@ static const per_choice_t OTDOACell_Information_Item_choice[] = {
   {  23, &hf_lppa_pRSOccasionGroup, ASN1_NOT_EXTENSION_ROOT, dissect_lppa_PRSOccasionGroup },
   {  24, &hf_lppa_pRSFreqHoppingConfig, ASN1_NOT_EXTENSION_ROOT, dissect_lppa_PRSFrequencyHoppingConfiguration },
   {  25, &hf_lppa_repetitionNumberofSIB1_NB, ASN1_NOT_EXTENSION_ROOT, dissect_lppa_RepetitionNumberofSIB1_NB },
+  {  26, &hf_lppa_nPRSSequenceInfo, ASN1_NOT_EXTENSION_ROOT, dissect_lppa_NPRSSequenceInfo },
   { 0, NULL, 0, NULL }
 };
 
@@ -2568,6 +2581,7 @@ static const value_string lppa_OTDOA_Information_Item_vals[] = {
   {  23, "prsOccasionGroup" },
   {  24, "prsFrequencyHoppingConfiguration" },
   {  25, "repetitionNumberofSIB1-NB" },
+  {  26, "nPRSSequenceInfo" },
   { 0, NULL }
 };
 
@@ -2575,7 +2589,7 @@ static const value_string lppa_OTDOA_Information_Item_vals[] = {
 static int
 dissect_lppa_OTDOA_Information_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
-                                     10, NULL, TRUE, 16, NULL);
+                                     10, NULL, TRUE, 17, NULL);
 
   return offset;
 }
@@ -4189,6 +4203,10 @@ void proto_register_lppa(void) {
       { "repetitionNumberofSIB1-NB", "lppa.repetitionNumberofSIB1_NB",
         FT_UINT32, BASE_DEC, VALS(lppa_RepetitionNumberofSIB1_NB_vals), 0,
         NULL, HFILL }},
+    { &hf_lppa_nPRSSequenceInfo,
+      { "nPRSSequenceInfo", "lppa.nPRSSequenceInfo",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_lppa_thirty_two,
       { "thirty-two", "lppa.thirty_two",
         FT_BYTES, BASE_NONE, NULL, 0,