osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

LPPa: upgrade dissector to v14.2.0 

Change-Id: I534f6e480e0cd13f4592ff3ca6ecd7f769863927
Reviewed-on: https://code.wireshark.org/review/22608
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2017-07-13 13:56:56 +02:00
parent 8fd97bdecb
commit 6335764469
9 changed files with 1918 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lppa/LPPA-Common.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.455 V13.1.0 (2016-03)
-- 3GPP TS 36.455 V14.2.0 (2017-06)
--
-- **************************************************************

10
epan/dissectors/asn1/lppa/LPPA-Constant.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.455 V13.1.0 (2016-03)
-- 3GPP TS 36.455 V14.2.0 (2017-06)
--
-- **************************************************************
@ -50,6 +50,10 @@ maxnoOTDOAtypes INTEGER ::= 63
maxServCell INTEGER ::= 5
maxGERANMeas INTEGER ::= 8
maxUTRANMeas INTEGER ::= 8
maxCellineNB-ext INTEGER ::= 3840
maxMBSFN-Allocations INTEGER ::= 8
maxWLANchannels INTEGER ::= 16
maxnoFreqHoppingBandsMinusOne INTEGER ::= 7
-- **************************************************************
--
@ -75,5 +79,9 @@ id-Cell-Portion-ID ProtocolIE-ID ::= 14
id-InterRATMeasurementQuantities ProtocolIE-ID ::= 15
id-InterRATMeasurementQuantities-Item ProtocolIE-ID ::= 16
id-InterRATMeasurementResult ProtocolIE-ID ::= 17
id-AddOTDOACells ProtocolIE-ID ::= 18
id-WLANMeasurementQuantities ProtocolIE-ID ::= 19
id-WLANMeasurementQuantities-Item ProtocolIE-ID ::= 20
id-WLANMeasurementResult ProtocolIE-ID ::= 21
END

2
epan/dissectors/asn1/lppa/LPPA-Container.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.455 V13.1.0 (2016-03)
-- 3GPP TS 36.455 V14.2.0 (2017-06)
--
-- **************************************************************

2
epan/dissectors/asn1/lppa/LPPA-ElementaryProcedure.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.455 V13.1.0 (2016-03)
-- 3GPP TS 36.455 V14.2.0 (2017-06)
--
-- **************************************************************

267
epan/dissectors/asn1/lppa/LPPA-InformationElement.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.455 V13.1.0 (2016-03)
-- 3GPP TS 36.455 V14.2.0 (2017-06)
--
-- **************************************************************
@ -25,8 +25,13 @@ IMPORTS
maxnoOTDOAtypes,
maxServCell,
id-InterRATMeasurementQuantities-Item,
id-WLANMeasurementQuantities-Item,
maxGERANMeas,
maxUTRANMeas
maxUTRANMeas,
maxCellineNB-ext,
maxWLANchannels,
maxMBSFN-Allocations,
maxnoFreqHoppingBandsMinusOne
FROM LPPA-Constants
@ -46,10 +51,32 @@ FROM LPPA-CommonDataTypes
FROM LPPA-Containers;
-- A
Add-OTDOACells ::= SEQUENCE (SIZE (1.. maxCellineNB-ext)) OF SEQUENCE {
add-OTDOACellInfo Add-OTDOACell-Information,
iE-Extensions ProtocolExtensionContainer { {Add-OTDOACells-ExtIEs} } OPTIONAL,
...
}
Add-OTDOACells-ExtIEs LPPA-PROTOCOL-EXTENSION ::= {
...
}
Add-OTDOACell-Information ::= SEQUENCE (SIZE (1..maxnoOTDOAtypes)) OF OTDOACell-Information-Item
-- B
BCCH ::= INTEGER (0..1023, ...)
BitmapsforNPRS ::= CHOICE {
ten BIT STRING(SIZE (10)),
forty BIT STRING(SIZE (40)),
...
}
BSSID ::= OCTET STRING (SIZE(6))
-- C
Cause ::= CHOICE {
@ -83,7 +110,7 @@ CauseRadioNetwork ::= ENUMERATED {
}
Cell-Portion-ID ::= INTEGER (0..255,...)
Cell-Portion-ID ::= INTEGER (0..255,... , 256..4095)
CPLength ::= ENUMERATED {
normal,
@ -120,6 +147,17 @@ CriticalityDiagnostics-IE-List-ExtIEs LPPA-PROTOCOL-EXTENSION ::= {
}
-- D
DL-Bandwidth ::= ENUMERATED {
bw6,
bw15,
bw25,
bw50,
bw75,
bw100,
...
}
-- E
E-CID-MeasurementResult ::= SEQUENCE {
@ -162,6 +200,10 @@ E-UTRANAccessPointPosition ::= SEQUENCE {
-- F
-- G
-- H
HESSID ::= OCTET STRING (SIZE(6))
-- I
InterRATMeasurementQuantities ::= SEQUENCE (SIZE (0.. maxNoMeas)) OF ProtocolIE-Single-Container { {InterRATMeasurementQuantities-ItemIEs} }
@ -255,8 +297,47 @@ MeasuredResultsValue ::= CHOICE {
...
}
MBSFNsubframeConfiguration ::= SEQUENCE (SIZE (1.. maxMBSFN-Allocations)) OF MBSFNsubframeConfigurationValue
MBSFNsubframeConfigurationValue ::= SEQUENCE {
radioframeAllocationPeriod ENUMERATED {n1, n2, n4, n8, n16, n32},
radioframeAllocationOffset INTEGER (0..7),
subframeAllocation Subframeallocation
}
-- N
NarrowBandIndex ::= INTEGER (0..15,...)
NPRSConfiguration ::= SEQUENCE {
nPRSSubframePartA NPRSSubframePartA OPTIONAL,
nPRSSubframePartB NPRSSubframePartB OPTIONAL,
...
}
NPRSMutingConfiguration ::= CHOICE {
two BIT STRING (SIZE (2)),
four BIT STRING (SIZE (4)),
eight BIT STRING (SIZE (8)),
sixteen BIT STRING (SIZE (16)),
...
}
NPRSSubframePartA ::= SEQUENCE {
bitmapsforNPRS BitmapsforNPRS,
nPRSMutingConfiguration NPRSMutingConfiguration OPTIONAL,
...
}
NPRSSubframePartB ::= SEQUENCE {
numberofNPRSOneOccasion ENUMERATED {sf10, sf20, sf40, sf80, sf160, sf320, sf640, sf1280, ...},
periodicityofNPRS ENUMERATED {sf160, sf320, sf640, sf1280, ...},
startingsubframeoffset ENUMERATED {zero, one-Eighth, two-Eighths, three-Eighths, four-Eighths, five-Eighths, six-Eighths, seven-Eighths, ...},
nPRSMutingConfiguration NPRSMutingConfiguration OPTIONAL,
...
}
NumberOfAntennaPorts ::= ENUMERATED {
n1-or-n2,
n4,
@ -271,8 +352,49 @@ NumberOfDlFrames ::= ENUMERATED {
...
}
NumberOfDlFrames-Extended ::= INTEGER (1..160,...)
NumberOfFrequencyHoppingBands ::= ENUMERATED {
twobands,
fourbands,
...
}
-- O
OffsetNBChanneltoEARFCN ::= ENUMERATED {
minusTen,
minusNine,
minusEight,
minusSeven,
minusSix,
minusFive,
minusFour,
minusThree,
minusTwo,
minusOne,
minusZeroDotFive,
zero,
one,
two,
three,
four,
five,
six,
seven,
eight,
nine,
...
}
OperationModeInfo ::= ENUMERATED {
inband,
guardband,
standalone,
...
}
OTDOACells ::= SEQUENCE (SIZE (1.. maxCellineNB)) OF SEQUENCE {
oTDOACellInfo OTDOACell-Information,
iE-Extensions ProtocolExtensionContainer { {OTDOACells-ExtIEs} } OPTIONAL,
@ -298,7 +420,21 @@ OTDOACell-Information-Item ::= CHOICE {
sFNInitialisationTime SFNInitialisationTime,
e-UTRANAccessPointPosition E-UTRANAccessPointPosition,
...,
pRSMutingConfiguration PRSMutingConfiguration
pRSMutingConfiguration PRSMutingConfiguration,
prsid PRS-ID,
tpid TP-ID,
tpType TP-Type,
numberOfDlFrames-Extended NumberOfDlFrames-Extended,
crsCPlength CPLength,
mBSFNsubframeConfiguration MBSFNsubframeConfiguration,
nPRSConfiguration NPRSConfiguration,
offsetNBChanneltoEARFCN OffsetNBChanneltoEARFCN,
operationModeInfo OperationModeInfo,
nPRS-ID INTEGER (0..4095, ...),
dL-Bandwidth DL-Bandwidth,
pRSOccasionGroup PRSOccasionGroup,
pRSFreqHoppingConfig PRSFrequencyHoppingConfiguration,
repetitionNumberofSIB1-NB RepetitionNumberofSIB1-NB
}
OTDOA-Information-Item ::= ENUMERATED {
@ -314,7 +450,21 @@ OTDOA-Information-Item ::= ENUMERATED {
sFNInitTime,
...,
e-UTRANAccessPointPosition,
prsmutingconfiguration
prsmutingconfiguration,
prsid,
tpid,
tpType,
crsCPlength,
mBSFNsubframeConfiguration,
nPRSConfiguration,
offsetNBChannelNumbertoEARFCN,
operationModeInfo,
nPRS-ID,
dlBandwidth,
multipleprsConfigurationsperCell,
prsOccasionGroup,
prsFrequencyHoppingConfiguration,
repetitionNumberofSIB1-NB
}
-- P
@ -341,18 +491,54 @@ PRS-Bandwidth ::= ENUMERATED {
PRS-Configuration-Index ::= INTEGER (0..4095, ...)
PRS-ID ::= INTEGER (0..4095, ...)
PRSMutingConfiguration ::= CHOICE {
two BIT STRING (SIZE (2)),
four BIT STRING (SIZE (4)),
eight BIT STRING (SIZE (8)),
sixteen BIT STRING (SIZE (16)),
...,
thirty-two BIT STRING (SIZE (32)),
sixty-four BIT STRING (SIZE (64)),
one-hundred-and-twenty-eight BIT STRING (SIZE (128)),
two-hundred-and-fifty-six BIT STRING (SIZE (256)),
five-hundred-and-twelve BIT STRING (SIZE (512)),
one-thousand-and-twenty-four BIT STRING (SIZE (1024))
}
PRSOccasionGroup ::= ENUMERATED {
og2,
og4,
og8,
og16,
og32,
og64,
og128,
...
}
PRSFrequencyHoppingConfiguration ::= SEQUENCE {
noOfFreqHoppingBands NumberOfFrequencyHoppingBands,
bandPositions SEQUENCE(SIZE (1..maxnoFreqHoppingBandsMinusOne)) OF NarrowBandIndex,
iE-Extensions ProtocolExtensionContainer { { PRSFrequencyHoppingConfiguration-Item-IEs} } OPTIONAL,
...
}
PRSFrequencyHoppingConfiguration-Item-IEs LPPA-PROTOCOL-EXTENSION ::= {
...
}
-- Q
-- R
RepetitionNumberofSIB1-NB ::= ENUMERATED {
r4,
r8,
r16,
...
}
ReportCharacteristics ::= ENUMERATED {
onDemand,
periodic,
@ -455,10 +641,22 @@ SRSConfigurationForOneCell ::= SEQUENCE {
...
}
Subframeallocation ::= CHOICE {
oneFrame BIT STRING (SIZE(6)),
fourFrames BIT STRING (SIZE(24))
}
SSID ::= OCTET STRING (SIZE(1..32))
-- T
TAC ::= OCTET STRING (SIZE(2))
TP-ID ::= INTEGER (0..4095, ...)
TP-Type ::= ENUMERATED { prs-only-tp, ... }
TypeOfError ::= ENUMERATED {
not-understood,
@ -493,6 +691,65 @@ ValueRSRP ::= INTEGER (0..97, ...)
ValueRSRQ ::= INTEGER (0..34, ...)
-- W
WLANMeasurementQuantities ::= SEQUENCE (SIZE (0.. maxNoMeas)) OF ProtocolIE-Single-Container { {WLANMeasurementQuantities-ItemIEs} }
WLANMeasurementQuantities-ItemIEs LPPA-PROTOCOL-IES ::= {
{ ID id-WLANMeasurementQuantities-Item CRITICALITY reject TYPE WLANMeasurementQuantities-Item PRESENCE mandatory}}
WLANMeasurementQuantities-Item ::= SEQUENCE {
wLANMeasurementQuantitiesValue WLANMeasurementQuantitiesValue,
iE-Extensions ProtocolExtensionContainer { { WLANMeasurementQuantitiesValue-ExtIEs} } OPTIONAL,
...
}
WLANMeasurementQuantitiesValue-ExtIEs LPPA-PROTOCOL-EXTENSION ::= {
...
}
WLANMeasurementQuantitiesValue ::= ENUMERATED {
wlan,
...
}
WLANMeasurementResult ::= SEQUENCE (SIZE (1..maxNoMeas)) OF WLANMeasurementResult-Item
WLANMeasurementResult-Item ::= SEQUENCE {
wLAN-RSSI WLAN-RSSI,
sSID SSID OPTIONAL,
bSSID BSSID OPTIONAL,
hESSID HESSID OPTIONAL,
operatingClass WLANOperatingClass OPTIONAL,
countryCode WLANCountryCode OPTIONAL,
wLANChannelList WLANChannelList OPTIONAL,
wLANBand WLANBand OPTIONAL,
iE-Extensions ProtocolExtensionContainer { { WLANMeasurementResult-Item-ExtIEs } } OPTIONAL,
...
}
WLANMeasurementResult-Item-ExtIEs LPPA-PROTOCOL-EXTENSION ::= {
...
}
WLAN-RSSI ::= INTEGER (0..141, ...)
WLANBand ::= ENUMERATED {band2dot4, band5, ...}
WLANChannelList ::= SEQUENCE (SIZE (1..maxWLANchannels)) OF WLANChannel
WLANChannel ::= INTEGER (0..255)
WLANCountryCode ::= ENUMERATED {
unitedStates,
europe,
japan,
global,
...
}
WLANOperatingClass ::= INTEGER (0..255)
-- X
-- Y
-- Z

25
epan/dissectors/asn1/lppa/LPPA-PDU.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.455 V13.1.0 (2016-03)
-- 3GPP TS 36.455 V13.2.0 (2017-06)
--
-- **************************************************************
@ -36,7 +36,10 @@ IMPORTS
ULConfiguration,
Cell-Portion-ID,
InterRATMeasurementQuantities,
InterRATMeasurementResult
InterRATMeasurementResult,
Add-OTDOACells,
WLANMeasurementQuantities,
WLANMeasurementResult
FROM LPPA-IEs
@ -70,7 +73,10 @@ FROM LPPA-Containers
id-ULConfiguration,
id-Cell-Portion-ID,
id-InterRATMeasurementQuantities,
id-InterRATMeasurementResult
id-InterRATMeasurementResult,
id-AddOTDOACells,
id-WLANMeasurementQuantities,
id-WLANMeasurementResult
FROM LPPA-Constants;
@ -90,9 +96,10 @@ E-CIDMeasurementInitiationRequest-IEs LPPA-PROTOCOL-IES ::= {
{ ID id-E-SMLC-UE-Measurement-ID CRITICALITY reject TYPE Measurement-ID PRESENCE mandatory}|
{ ID id-ReportCharacteristics CRITICALITY reject TYPE ReportCharacteristics PRESENCE mandatory}|
{ ID id-MeasurementPeriodicity CRITICALITY reject TYPE MeasurementPeriodicity PRESENCE conditional}|
-- The IE shall be present if the Report Characteritics IE is set to “periodic” --
-- The IE shall be present if the Report Characteritics IE is set to "periodic" --
{ ID id-MeasurementQuantities CRITICALITY reject TYPE MeasurementQuantities PRESENCE mandatory}|
{ ID id-InterRATMeasurementQuantities CRITICALITY ignore TYPE InterRATMeasurementQuantities PRESENCE optional},
{ ID id-InterRATMeasurementQuantities CRITICALITY ignore TYPE InterRATMeasurementQuantities PRESENCE optional}|
{ ID id-WLANMeasurementQuantities CRITICALITY ignore TYPE WLANMeasurementQuantities PRESENCE optional},
...
}
@ -114,7 +121,8 @@ E-CIDMeasurementInitiationResponse-IEs LPPA-PROTOCOL-IES ::= {
{ ID id-E-CID-MeasurementResult CRITICALITY ignore TYPE E-CID-MeasurementResult PRESENCE optional}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
{ ID id-Cell-Portion-ID CRITICALITY ignore TYPE Cell-Portion-ID PRESENCE optional}|
{ ID id-InterRATMeasurementResult CRITICALITY ignore TYPE InterRATMeasurementResult PRESENCE optional},
{ ID id-InterRATMeasurementResult CRITICALITY ignore TYPE InterRATMeasurementResult PRESENCE optional}|
{ ID id-WLANMeasurementResult CRITICALITY ignore TYPE WLANMeasurementResult PRESENCE optional},
...
}
@ -244,7 +252,8 @@ OTDOAInformationResponse ::= SEQUENCE {
OTDOAInformationResponse-IEs LPPA-PROTOCOL-IES ::= {
{ ID id-OTDOACells CRITICALITY ignore TYPE OTDOACells PRESENCE mandatory}|
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}|
{ ID id-AddOTDOACells CRITICALITY ignore TYPE Add-OTDOACells PRESENCE optional},
...
}
@ -358,7 +367,7 @@ ErrorIndication-IEs LPPA-PROTOCOL-IES ::= {
-- **************************************************************
PrivateMessage ::= SEQUENCE {
privateIEs PrivateIE-Container {{PrivateMessage-IEs}},
privateIEs PrivateIE-Container {{PrivateMessage-IEs}},
...
}

16
epan/dissectors/asn1/lppa/lppa.cnf
View File

@ -1,6 +1,6 @@
# lppa.cnf
# llpa conformation file
# Copyright 2011-2016 Pascal Quantin
# Copyright 2011-2017 Pascal Quantin
#.OPT
PER
@ -61,6 +61,12 @@ ProtocolIE-Field/value ie_field_value
col_append_sep_str(actx->pinfo->cinfo, COL_PROTOCOL, "/", "LPPa");
#.END
#.TYPE_ATTR
BSSID TYPE=FT_ETHER
#.TYPE_ATTR
HESSID TYPE=FT_ETHER
#.TYPE_ATTR
# ProcedureCode
id-errorIndication ProcedureCode
@ -92,6 +98,10 @@ id-Cell-Portion-ID ProtocolIE-ID
id-InterRATMeasurementQuantities ProtocolIE-ID
id-InterRATMeasurementQuantities-Item ProtocolIE-ID
id-InterRATMeasurementResult ProtocolIE-ID
id-AddOTDOACells ProtocolIE-ID
id-WLANMeasurementQuantities ProtocolIE-ID
id-WLANMeasurementQuantities-Item ProtocolIE-ID
id-WLANMeasurementResult ProtocolIE-ID
#.REGISTER
#LPPA-PROTOCOL-IES
@ -113,6 +123,10 @@ InterRATMeasurementQuantities N lppa.ies id-InterRATMeasurementQuantit
Cell-Portion-ID N lppa.ies id-Cell-Portion-ID
InterRATMeasurementResult N lppa.ies id-InterRATMeasurementResult
InterRATMeasurementQuantities-Item N lppa.ies id-InterRATMeasurementQuantities-Item
WLANMeasurementQuantities N lppa.ies id-WLANMeasurementQuantities
WLANMeasurementResult N lppa.ies id-WLANMeasurementResult
Add-OTDOACells N lppa.ies id-AddOTDOACells
WLANMeasurementQuantities-Item N lppa.ies id-WLANMeasurementQuantities-Item
#LPPA-ELEMENTARY-PROCEDURE
E-CIDMeasurementInitiationRequest N lppa.proc.imsg id-e-CIDMeasurementInitiation

2
epan/dissectors/asn1/lppa/packet-lppa-template.c
View File

@ -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.455 version 13.1.0 Release 13
* Ref 3GPP TS 36.455 version 14.2.0 Release 14
* http://www.3gpp.org
*/

2008
epan/dissectors/packet-lppa.c
View File

File diff suppressed because it is too large Load Diff