aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2018-03-08 15:09:09 +0100
committerPascal Quantin <pascal.quantin@gmail.com>2018-03-08 14:44:02 +0000
commit5c25e1b2c1e986df36ea95047a891e1d54070694 (patch)
treeb29ae9ddc23f70a82544d071ded75929aac4db4b /epan
parentb91ef7da5168143ff558785b6bc04a68f72b19ec (diff)
S1AP: EmergencyAreaIDListForRestart is not an extension IE.
Change-Id: I3dd623e1a2ec3005ee2c810492e4d0fad39ce1d0 Reviewed-on: https://code.wireshark.org/review/26364 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/asn1/s1ap/s1ap.cnf2
-rw-r--r--epan/dissectors/packet-s1ap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/asn1/s1ap/s1ap.cnf b/epan/dissectors/asn1/s1ap/s1ap.cnf
index 566e909dc9..52e43b17cb 100644
--- a/epan/dissectors/asn1/s1ap/s1ap.cnf
+++ b/epan/dissectors/asn1/s1ap/s1ap.cnf
@@ -1694,6 +1694,7 @@ SecondaryRATusageDataRequst N s1ap.ies id-SecondaryRATusageD
SecondaryRATusageReportList N s1ap.ies id-SecondaryRATusageReportList
UE-Application-Layer-Measurement-Capability N s1ap.ies id-UE-Application-Layer-Measurement-Capability
HandoverFlag N s1ap.ies id-HandoverFlag
+EmergencyAreaIDListForRestart N s1ap.ies id-EmergencyAreaIDListForRestart
#S1AP-PROTOCOL-IES-PAIR
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -1721,7 +1722,6 @@ COUNTValueExtended N s1ap.extension id-DLCOUNTValueExtended
ReceiveStatusOfULPDCPSDUsExtended N s1ap.extension id-ReceiveStatusOfULPDCPSDUsExtended
Correlation-ID N s1ap.extension id-SIPTO-Correlation-ID
TransportInformation N s1ap.extension id-TransportInformation
-EmergencyAreaIDListForRestart N s1ap.extension id-EmergencyAreaIDListForRestart
ENBIndirectX2TransportLayerAddresses N s1ap.extension id-eNBIndirectX2TransportLayerAddresses
LoggedMBSFNMDT N s1ap.extension id-LoggedMBSFNMDT
UE-HistoryInformationFromTheUE N s1ap.extension id-uE-HistoryInformationFromTheUE
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 9d05c2e243..b45bd80124 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -15130,6 +15130,7 @@ proto_reg_handoff_s1ap(void)
dissector_add_uint("s1ap.ies", id_SecondaryRATusageReportList, create_dissector_handle(dissect_SecondaryRATusageReportList_PDU, proto_s1ap));
dissector_add_uint("s1ap.ies", id_UE_Application_Layer_Measurement_Capability, create_dissector_handle(dissect_UE_Application_Layer_Measurement_Capability_PDU, proto_s1ap));
dissector_add_uint("s1ap.ies", id_HandoverFlag, create_dissector_handle(dissect_HandoverFlag_PDU, proto_s1ap));
+ dissector_add_uint("s1ap.ies", id_EmergencyAreaIDListForRestart, create_dissector_handle(dissect_EmergencyAreaIDListForRestart_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_Data_Forwarding_Not_Possible, create_dissector_handle(dissect_Data_Forwarding_Not_Possible_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_Time_Synchronisation_Info, create_dissector_handle(dissect_TimeSynchronisationInfo_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_x2TNLConfigurationInfo, create_dissector_handle(dissect_X2TNLConfigurationInfo_PDU, proto_s1ap));
@@ -15149,7 +15150,6 @@ proto_reg_handoff_s1ap(void)
dissector_add_uint("s1ap.extension", id_ReceiveStatusOfULPDCPSDUsExtended, create_dissector_handle(dissect_ReceiveStatusOfULPDCPSDUsExtended_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_SIPTO_Correlation_ID, create_dissector_handle(dissect_Correlation_ID_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_TransportInformation, create_dissector_handle(dissect_TransportInformation_PDU, proto_s1ap));
- dissector_add_uint("s1ap.extension", id_EmergencyAreaIDListForRestart, create_dissector_handle(dissect_EmergencyAreaIDListForRestart_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_eNBIndirectX2TransportLayerAddresses, create_dissector_handle(dissect_ENBIndirectX2TransportLayerAddresses_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_LoggedMBSFNMDT, create_dissector_handle(dissect_LoggedMBSFNMDT_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_uE_HistoryInformationFromTheUE, create_dissector_handle(dissect_UE_HistoryInformationFromTheUE_PDU, proto_s1ap));