aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/asn1/lpp/LPP.asn16
-rw-r--r--epan/dissectors/asn1/lpp/packet-lpp-template.c2
-rw-r--r--epan/dissectors/asn1/lpp/packet-lpp-template.h2
-rw-r--r--epan/dissectors/packet-lpp.c23
-rw-r--r--epan/dissectors/packet-lpp.h2
5 files changed, 33 insertions, 12 deletions
diff --git a/epan/dissectors/asn1/lpp/LPP.asn b/epan/dissectors/asn1/lpp/LPP.asn
index e8bd0d0b35..41dba314d7 100644
--- a/epan/dissectors/asn1/lpp/LPP.asn
+++ b/epan/dissectors/asn1/lpp/LPP.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.355 V14.2.0 (2017-06)
+-- 3GPP TS 36.355 V14.3.0 (2017-09)
--
LPP-PDU-Definitions {
@@ -182,7 +182,6 @@ RequestLocationInformation-r9-IEs ::= SEQUENCE {
wlan-RequestLocationInformation-r13 WLAN-RequestLocationInformation-r13 OPTIONAL, -- Need ON
bt-RequestLocationInformation-r13 BT-RequestLocationInformation-r13 OPTIONAL -- Need ON
]]
-
}
@@ -198,7 +197,7 @@ ProvideLocationInformation ::= SEQUENCE {
ProvideLocationInformation-r9-IEs ::= SEQUENCE {
commonIEsProvideLocationInformation
- CommonIEsProvideLocationInformation OPTIONAL,
+ CommonIEsProvideLocationInformation OPTIONAL,
a-gnss-ProvideLocationInformation A-GNSS-ProvideLocationInformation OPTIONAL,
otdoa-ProvideLocationInformation OTDOA-ProvideLocationInformation OPTIONAL,
ecid-ProvideLocationInformation ECID-ProvideLocationInformation OPTIONAL,
@@ -719,9 +718,9 @@ PRS-Info ::= SEQUENCE {
po512-v1420 BIT STRING (SIZE(512)),
po1024-v1420 BIT STRING (SIZE(1024))
} OPTIONAL, -- Need OP
- [[ prsID-r14 INTEGER (0..4095) OPTIONAL, -- Need ON
+ [[ prsID-r14 INTEGER (0..4095) OPTIONAL, -- Need ON
add-numDL-Frames-r14 INTEGER (1..160) OPTIONAL, -- Cond sf-add
- prsOccGroupLen-r14 ENUMERATED {g2, g4, g8, g16, g32, g64, g128,... }
+ prsOccGroupLen-r14 ENUMERATED {g2, g4, g8, g16, g32, g64, g128,... }
OPTIONAL, -- Cond Occ-Grp
prsHoppingInfo-r14 CHOICE {
nb2-r14 INTEGER (0.. maxAvailNarrowBands-Minus1-r14),
@@ -1004,7 +1003,8 @@ OTDOA-ProvideCapabilities ::= SEQUENCE {
maxSupportedPrsConfigs-r14 ENUMERATED { c2, c3 } OPTIONAL,
periodicalReporting-r14 ENUMERATED { supported } OPTIONAL,
multiPrbNprs-r14 ENUMERATED { supported } OPTIONAL,
- idleStateForMeasurements-r14 ENUMERATED { required } OPTIONAL
+ idleStateForMeasurements-r14 ENUMERATED { required } OPTIONAL,
+ numberOfRXantennas-r14 ENUMERATED { rx1, ... } OPTIONAL
}
maxBands INTEGER ::= 64
@@ -2811,8 +2811,8 @@ WLAN-MeasurementElement-r13 ::= SEQUENCE {
}
WLAN-AP-Identifier-r13 ::= SEQUENCE {
- bssid-r13 OCTET STRING (SIZE (6)),
- ssid-r13 OCTET STRING (SIZE (1..32)) OPTIONAL,
+ bssid-r13 OCTET STRING (SIZE (6)),
+ ssid-r13 OCTET STRING (SIZE (1..32)) OPTIONAL,
...
}
diff --git a/epan/dissectors/asn1/lpp/packet-lpp-template.c b/epan/dissectors/asn1/lpp/packet-lpp-template.c
index 86e7849ba2..6a18b202c3 100644
--- a/epan/dissectors/asn1/lpp/packet-lpp-template.c
+++ b/epan/dissectors/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 14.2.0 Release 14
+ * Ref 3GPP TS 36.355 version 14.3.0 Release 14
* http://www.3gpp.org
*/
diff --git a/epan/dissectors/asn1/lpp/packet-lpp-template.h b/epan/dissectors/asn1/lpp/packet-lpp-template.h
index 158588bb56..4d8cc9a329 100644
--- a/epan/dissectors/asn1/lpp/packet-lpp-template.h
+++ b/epan/dissectors/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 14.2.0 Release 14
+ * Ref 3GPP TS 36.355 version 14.3.0 Release 14
* http://www.3gpp.org
*/
diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c
index 74620a9d29..b613cd5153 100644
--- a/epan/dissectors/packet-lpp.c
+++ b/epan/dissectors/packet-lpp.c
@@ -28,7 +28,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 14.2.0 Release 14
+ * Ref 3GPP TS 36.355 version 14.3.0 Release 14
* http://www.3gpp.org
*/
@@ -449,6 +449,7 @@ static int hf_lpp_maxSupportedPrsConfigs_r14 = -1; /* T_maxSupportedPrsConfigs_
static int hf_lpp_periodicalReporting_r14 = -1; /* T_periodicalReporting_r14 */
static int hf_lpp_multiPrbNprs_r14 = -1; /* T_multiPrbNprs_r14 */
static int hf_lpp_idleStateForMeasurements_r14 = -1; /* T_idleStateForMeasurements_r14 */
+static int hf_lpp_numberOfRXantennas_r14 = -1; /* T_numberOfRXantennas_r14 */
static int hf_lpp_bandEUTRA = -1; /* INTEGER_1_maxFBI */
static int hf_lpp_bandEUTRA_v9a0 = -1; /* INTEGER_maxFBI_Plus1_maxFBI2 */
static int hf_lpp_locationServerErrorCauses = -1; /* OTDOA_LocationServerErrorCauses */
@@ -5137,6 +5138,21 @@ dissect_lpp_T_idleStateForMeasurements_r14(tvbuff_t *tvb _U_, int offset _U_, as
}
+static const value_string lpp_T_numberOfRXantennas_r14_vals[] = {
+ { 0, "rx1" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_lpp_T_numberOfRXantennas_r14(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,
+ 1, NULL, TRUE, 0, NULL);
+
+ return offset;
+}
+
+
static const per_sequence_t OTDOA_ProvideCapabilities_sequence[] = {
{ &hf_lpp_otdoa_Mode , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_lpp_T_otdoa_Mode },
{ &hf_lpp_supportedBandListEUTRA, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lpp_SEQUENCE_SIZE_1_maxBands_OF_SupportedBandEUTRA },
@@ -5156,6 +5172,7 @@ static const per_sequence_t OTDOA_ProvideCapabilities_sequence[] = {
{ &hf_lpp_periodicalReporting_r14, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lpp_T_periodicalReporting_r14 },
{ &hf_lpp_multiPrbNprs_r14, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lpp_T_multiPrbNprs_r14 },
{ &hf_lpp_idleStateForMeasurements_r14, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lpp_T_idleStateForMeasurements_r14 },
+ { &hf_lpp_numberOfRXantennas_r14, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_lpp_T_numberOfRXantennas_r14 },
{ NULL, 0, 0, NULL }
};
@@ -16822,6 +16839,10 @@ void proto_register_lpp(void) {
{ "idleStateForMeasurements-r14", "lpp.idleStateForMeasurements_r14",
FT_UINT32, BASE_DEC, VALS(lpp_T_idleStateForMeasurements_r14_vals), 0,
NULL, HFILL }},
+ { &hf_lpp_numberOfRXantennas_r14,
+ { "numberOfRXantennas-r14", "lpp.numberOfRXantennas_r14",
+ FT_UINT32, BASE_DEC, VALS(lpp_T_numberOfRXantennas_r14_vals), 0,
+ NULL, HFILL }},
{ &hf_lpp_bandEUTRA,
{ "bandEUTRA", "lpp.bandEUTRA",
FT_UINT32, BASE_DEC, NULL, 0,
diff --git a/epan/dissectors/packet-lpp.h b/epan/dissectors/packet-lpp.h
index 7b53ecd1cb..5c19d20186 100644
--- a/epan/dissectors/packet-lpp.h
+++ b/epan/dissectors/packet-lpp.h
@@ -28,7 +28,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 14.2.0 Release 14
+ * Ref 3GPP TS 36.355 version 14.3.0 Release 14
* http://www.3gpp.org
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 21:21:00 +0000