diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-04-02 17:28:39 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-02 15:53:07 +0000 |
| commit | 941088262bbf474b9f20f4f7fcf5b7f9175c196a (patch) | |
| tree | 2475b24f5283350b3663c2d77b2f7c4c9106b796 | |
| parent | 5838881f2e2dc985fe3b890bb855d765bff9dbd8 (diff) | |
| download | wireshark-941088262bbf474b9f20f4f7fcf5b7f9175c196a.tar.gz | |
Add a cople of missing pcap.extension IE:s
Change-Id: I7086349f3fb9e3fd8c1ea902ef08b54c27b0a8c5
Reviewed-on: https://code.wireshark.org/review/923
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | asn1/pcap/pcap.cnf | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-pcap.c | 11 |
2 files changed, 18 insertions, 5 deletions
diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf index d29a6f7e31..1b8a1a43bc 100644 --- a/asn1/pcap/pcap.cnf +++ b/asn1/pcap/pcap.cnf @@ -259,7 +259,6 @@ id-ganssReq-EarthOrientPara ProtocolIE-ID id-ganssAddNavigationModel-req ProtocolIE-ID id-ganssAddUTCModel-req ProtocolIE-ID id-ganssAuxInfo-req ProtocolIE-ID -id-GANSS-AddADchoices ProtocolIE-ID id-OTDOA-ReferenceCellInfo ProtocolIE-ID id-DGNSS-ValidityPeriod ProtocolIE-ID id-AzimuthAndElevationLSB ProtocolIE-ID @@ -312,13 +311,20 @@ UC-ID-InfEx-Rqst N pcap.ies id-UC-ID-InfEx-Rqst UE-PositionEstimateInfo N pcap.ies id-UE-PositionEstimateInfo OTDOA-MeasuredResultsSets N pcap.ies id-OTDOA-MeasuredResultsSets PeriodicPosCalcInfo N pcap.ies id-PeriodicPosCalcInfo -PeriodicLocationInfo N pcap.extension id-PeriodicLocationInfo -MeasInstructionsUsed N pcap.extension id-MeasInstructionsUsed PeriodicTerminationCause N pcap.ies id-PeriodicTerminationCause #PCAP-PROTOCOL-EXTENSION +CellId-MeasuredResultsSets N pcap.extension id-CellId-MeasuredResultsSets +OTDOA-MeasurementGroup N pcap.extension id-OTDOA-MeasurementGroup +HorizontalAccuracyCode N pcap.extension id-HorizontalAccuracyCode +VerticalAccuracyCode N pcap.extension id-VerticalAccuracyCode +UTDOA-Group N pcap.extension id-UTDOA-Group +Positioning-ResponseTime N pcap.extension id-Positioning-ResponseTime IncludeVelocity N pcap.extension id-IncludeVelocity +PeriodicPosCalcInfo N pcap.extension id-PeriodicPosCalcInfo AmountOfReporting N pcap.extension id-AmountOfReporting +PeriodicLocationInfo N pcap.extension id-PeriodicLocationInfo +MeasInstructionsUsed N pcap.extension id-MeasInstructionsUsed CellIDPositioning N pcap.extension id-CellIDPositioning GANSSPositioning N pcap.extension id-GANSSPositioning RRCstateChange N pcap.extension id-RRCstateChange diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 4a29e57c89..99fca83470 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -13616,11 +13616,18 @@ proto_reg_handoff_pcap(void) dissector_add_uint("pcap.ies", id_UE_PositionEstimateInfo, new_create_dissector_handle(dissect_UE_PositionEstimateInfo_PDU, proto_pcap)); dissector_add_uint("pcap.ies", id_OTDOA_MeasuredResultsSets, new_create_dissector_handle(dissect_OTDOA_MeasuredResultsSets_PDU, proto_pcap)); dissector_add_uint("pcap.ies", id_PeriodicPosCalcInfo, new_create_dissector_handle(dissect_PeriodicPosCalcInfo_PDU, proto_pcap)); - dissector_add_uint("pcap.extension", id_PeriodicLocationInfo, new_create_dissector_handle(dissect_PeriodicLocationInfo_PDU, proto_pcap)); - dissector_add_uint("pcap.extension", id_MeasInstructionsUsed, new_create_dissector_handle(dissect_MeasInstructionsUsed_PDU, proto_pcap)); dissector_add_uint("pcap.ies", id_PeriodicTerminationCause, new_create_dissector_handle(dissect_PeriodicTerminationCause_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_CellId_MeasuredResultsSets, new_create_dissector_handle(dissect_CellId_MeasuredResultsSets_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_OTDOA_MeasurementGroup, new_create_dissector_handle(dissect_OTDOA_MeasurementGroup_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_HorizontalAccuracyCode, new_create_dissector_handle(dissect_HorizontalAccuracyCode_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_VerticalAccuracyCode, new_create_dissector_handle(dissect_VerticalAccuracyCode_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_UTDOA_Group, new_create_dissector_handle(dissect_UTDOA_Group_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_Positioning_ResponseTime, new_create_dissector_handle(dissect_Positioning_ResponseTime_PDU, proto_pcap)); dissector_add_uint("pcap.extension", id_IncludeVelocity, new_create_dissector_handle(dissect_IncludeVelocity_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_PeriodicPosCalcInfo, new_create_dissector_handle(dissect_PeriodicPosCalcInfo_PDU, proto_pcap)); dissector_add_uint("pcap.extension", id_AmountOfReporting, new_create_dissector_handle(dissect_AmountOfReporting_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_PeriodicLocationInfo, new_create_dissector_handle(dissect_PeriodicLocationInfo_PDU, proto_pcap)); + dissector_add_uint("pcap.extension", id_MeasInstructionsUsed, new_create_dissector_handle(dissect_MeasInstructionsUsed_PDU, proto_pcap)); dissector_add_uint("pcap.extension", id_CellIDPositioning, new_create_dissector_handle(dissect_CellIDPositioning_PDU, proto_pcap)); dissector_add_uint("pcap.extension", id_GANSSPositioning, new_create_dissector_handle(dissect_GANSSPositioning_PDU, proto_pcap)); dissector_add_uint("pcap.extension", id_RRCstateChange, new_create_dissector_handle(dissect_RRCstateChange_PDU, proto_pcap)); |