diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-26 22:42:30 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-26 21:38:45 +0000 |
| commit | f48c2cb5d46884e13c472d75556793b185d9183a (patch) | |
| tree | 3839226d87534df815dad35bae7758e9f0735efa /epan/dissectors/asn1 | |
| parent | 0e639797309c3bb62171d6c226c197e63b0cea59 (diff) | |
LPP: upgrade dissector to v14.3.0
Change-Id: I0d571e277c4ec00d3da9dfabfc9cd80689763f69
Reviewed-on: https://code.wireshark.org/review/23757
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1')
| -rw-r--r-- | epan/dissectors/asn1/lpp/LPP.asn | 16 | ||||
| -rw-r--r-- | epan/dissectors/asn1/lpp/packet-lpp-template.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/lpp/packet-lpp-template.h | 2 |
3 files changed, 10 insertions, 10 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 */ |