diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-03 23:17:34 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-03 21:24:12 +0000 |
| commit | 3b9771a424089d9b37c9bc3cb769b26a4681995c (patch) | |
| tree | 308dc2a8680270572879799abb94dedff1a8b084 | |
| parent | 4a3b320c98febdd8fae2d3bb8f017b1aa46f1b75 (diff) | |
M2AP: fix registration of extensions in proper dissector table
Change-Id: If529448539f9e8d740fd20009221e9221db83b2b
Reviewed-on: https://code.wireshark.org/review/17475
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | epan/dissectors/asn1/m2ap/m2ap.cnf | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-m2ap.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/asn1/m2ap/m2ap.cnf b/epan/dissectors/asn1/m2ap/m2ap.cnf index abf5163637..a63fa979bc 100644 --- a/epan/dissectors/asn1/m2ap/m2ap.cnf +++ b/epan/dissectors/asn1/m2ap/m2ap.cnf @@ -257,8 +257,6 @@ MBMS-Counting-Request-Session N m2ap.ies id-MBMS-Countin MBMS-Counting-Request-SessionIE N m2ap.ies id-MBMS-Counting-Request-Session-Item MBMS-Counting-Result-List N m2ap.ies id-MBMS-Counting-Result-List MBMS-Counting-Result N m2ap.ies id-MBMS-Counting-Result-Item -Modulation-Coding-Scheme2 N m2ap.ies id-Modulation-Coding-Scheme2 -MCH-Scheduling-PeriodExtended N m2ap.ies id-MCH-Scheduling-PeriodExtended TNL-Information N m2ap.ies id-Alternative-TNL-Information Overload-Status-Per-PMCH-List N m2ap.ies id-Overload-Status-Per-PMCH-List PMCH-Overload-Status N m2ap.ies id-PMCH-Overload-Status @@ -267,6 +265,10 @@ MBMS-Suspension-Notification-List N m2ap.ies id-MBMS-Suspens MBMS-Suspension-Notification-Item N m2ap.ies id-MBMS-Suspension-Notification-Item SC-PTM-Information N m2ap.ies id-SC-PTM-Information +#M2AP-PROTOCOL-EXTENSION +Modulation-Coding-Scheme2 N m2ap.extension id-Modulation-Coding-Scheme2 +MCH-Scheduling-PeriodExtended N m2ap.extension id-MCH-Scheduling-PeriodExtended + #M2AP-ELEMENTARY-PROCEDURE SessionStartRequest N m2ap.proc.imsg id-sessionStart SessionStartResponse N m2ap.proc.sout id-sessionStart diff --git a/epan/dissectors/packet-m2ap.c b/epan/dissectors/packet-m2ap.c index 07103c1c21..34983be35b 100644 --- a/epan/dissectors/packet-m2ap.c +++ b/epan/dissectors/packet-m2ap.c @@ -4284,8 +4284,6 @@ proto_reg_handoff_m2ap(void) dissector_add_uint("m2ap.ies", id_MBMS_Counting_Request_Session_Item, create_dissector_handle(dissect_MBMS_Counting_Request_SessionIE_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_MBMS_Counting_Result_List, create_dissector_handle(dissect_MBMS_Counting_Result_List_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_MBMS_Counting_Result_Item, create_dissector_handle(dissect_MBMS_Counting_Result_PDU, proto_m2ap)); - dissector_add_uint("m2ap.ies", id_Modulation_Coding_Scheme2, create_dissector_handle(dissect_Modulation_Coding_Scheme2_PDU, proto_m2ap)); - dissector_add_uint("m2ap.ies", id_MCH_Scheduling_PeriodExtended, create_dissector_handle(dissect_MCH_Scheduling_PeriodExtended_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_Alternative_TNL_Information, create_dissector_handle(dissect_TNL_Information_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_Overload_Status_Per_PMCH_List, create_dissector_handle(dissect_Overload_Status_Per_PMCH_List_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_PMCH_Overload_Status, create_dissector_handle(dissect_PMCH_Overload_Status_PDU, proto_m2ap)); @@ -4293,6 +4291,8 @@ proto_reg_handoff_m2ap(void) dissector_add_uint("m2ap.ies", id_MBMS_Suspension_Notification_List, create_dissector_handle(dissect_MBMS_Suspension_Notification_List_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_MBMS_Suspension_Notification_Item, create_dissector_handle(dissect_MBMS_Suspension_Notification_Item_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_SC_PTM_Information, create_dissector_handle(dissect_SC_PTM_Information_PDU, proto_m2ap)); + dissector_add_uint("m2ap.extension", id_Modulation_Coding_Scheme2, create_dissector_handle(dissect_Modulation_Coding_Scheme2_PDU, proto_m2ap)); + dissector_add_uint("m2ap.extension", id_MCH_Scheduling_PeriodExtended, create_dissector_handle(dissect_MCH_Scheduling_PeriodExtended_PDU, proto_m2ap)); dissector_add_uint("m2ap.proc.imsg", id_sessionStart, create_dissector_handle(dissect_SessionStartRequest_PDU, proto_m2ap)); dissector_add_uint("m2ap.proc.sout", id_sessionStart, create_dissector_handle(dissect_SessionStartResponse_PDU, proto_m2ap)); dissector_add_uint("m2ap.proc.uout", id_sessionStart, create_dissector_handle(dissect_SessionStartFailure_PDU, proto_m2ap)); |