osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From David Wei: 

Further additions and fixes to MBMS in M3AP dissector.

from me update to 11.1

svn path=/trunk/; revision=42290
This commit is contained in:
Anders Broman 2012-04-27 11:08:37 +00:00
parent a72f9abfc0
commit 9d9be8f76d
8 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asn1/m3ap/M3AP-CommonDataTypes.asn
View File

@ -1,7 +1,7 @@
-- M3AP-CommonDataTypes.asn
--
-- 3GPP TS 36.444 V11.0.0 (2011-12)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
-- 3GPP TS 36.444 V11.1.0 (2012-03)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip
--
-- 9.3.6 Common Definitions
--
@ -56,3 +56,4 @@ ProtocolIE-ID ::= INTEGER (0..maxProtocolIEs)
TriggeringMessage ::= ENUMERATED { initiating-message, successful-outcome, unsuccessful-outcome}
END

7
asn1/m3ap/M3AP-Constants.asn
View File

@ -1,7 +1,7 @@
-- M3AP-Constants.asn
--
-- 3GPP TS 36.444 V11.0.0 (2011-12)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
-- 3GPP TS 36.444 V11.1.0 (2012-03)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip
--
-- 9.3.7 Constant Definitions
--
@ -50,7 +50,7 @@ id-m3Setup ProcedureCode ::= 7
--
-- **************************************************************
maxnoofMBMSServiceAreasPerMCE INTEGER ::= 65536
maxnoofMBMSServiceAreaIdentitiesPerMCE INTEGER ::= 65536
maxnooferrors INTEGER ::= 256
maxNrOfIndividualM3ConnectionsToReset INTEGER ::= 256
@ -84,3 +84,4 @@ id-MBMSServiceAreaList ProtocolIE-ID ::= 20
id-Time-ofMBMS-DataTransfer ProtocolIE-ID ::= 21
id-Time-ofMBMS-DataStop ProtocolIE-ID ::= 22
END

5
asn1/m3ap/M3AP-Containers.asn
View File

@ -1,7 +1,7 @@
-- M3AP-Containers.asn
--
-- 3GPP TS 36.444 V11.0.0 (2011-12)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
-- 3GPP TS 36.444 V11.1.0 (2012-03)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip
--
-- 9.3.8 Container Definitions
--
@ -202,3 +202,4 @@ PrivateIE-Field {M3AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
}
END

8
asn1/m3ap/M3AP-IEs.asn
View File

@ -1,7 +1,7 @@
-- M3AP-IEs.asn
--
-- 3GPP TS 36.444 V11.0.0 (2011-12)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
-- 3GPP TS 36.444 V11.1.0 (2012-03)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip
--
-- 9.3.5 Information Element Definitions
--
@ -24,7 +24,6 @@ BEGIN
IMPORTS
id-AllocationAndRetentionPriority,
maxnoofMBMSServiceAreasPerMCE,
maxnooferrors
FROM M3AP-Constants
@ -153,8 +152,7 @@ ExtendedMCE-ID ::= OCTET STRING (SIZE(1))
Global-MCE-ID ::= SEQUENCE {
pLMN-Identity PLMN-Identity,
mCE-ID MCE-ID,
-- WS 3GPP Spec error fixed.
extendedMCE-ID ExtendedMCE-ID OPTIONAL,
extendedMCE-ID ExtendedMCE-ID,
iE-Extensions ProtocolExtensionContainer { {GlobalMCE-ID-ExtIEs} } OPTIONAL,
...
}

8
asn1/m3ap/M3AP-PDU-Contents.asn
View File

@ -1,7 +1,7 @@
-- M3AP-PDU-Contents.asn
--
-- 3GPP TS 36.444 V11.0.0 (2011-12)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
-- 3GPP TS 36.444 V11.1.0 (2012-03)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip
--
-- 9.3.4 PDU Definitions
--
@ -85,7 +85,7 @@ FROM M3AP-Containers
id-Time-ofMBMS-DataTransfer,
id-Global-MCE-ID,
id-MCEname,
maxnoofMBMSServiceAreasPerMCE,
maxnoofMBMSServiceAreaIdentitiesPerMCE,
maxnooferrors,
maxNrOfIndividualM3ConnectionsToReset
@ -374,7 +374,7 @@ M3SetupRequestIEs M3AP-PROTOCOL-IES ::= {
}
MBMSServiceAreaListItem ::= SEQUENCE (SIZE(1..maxnoofMBMSServiceAreasPerMCE)) OF MBMSServiceArea1
MBMSServiceAreaListItem ::= SEQUENCE (SIZE(1..maxnoofMBMSServiceAreaIdentitiesPerMCE)) OF MBMSServiceArea1
-- **************************************************************

4
asn1/m3ap/M3AP-PDU-Descriptions.asn
View File

@ -1,7 +1,7 @@
-- M3AP-PDU-Descriptions.asn
--
-- 3GPP TS 36.444 V11.0.0 (2011-12)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b00.zip
-- 3GPP TS 36.444 V11.1.0 (2012-03)
-- http://www.3gpp.org/ftp/Specs/archive/36_series/36.444/36444-b10.zip
--
-- 9.3.3 Elementary Procedure Definitions
--

3
asn1/m3ap/packet-m3ap-template.c
View File

@ -100,7 +100,7 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
}
static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@ -192,6 +192,7 @@ proto_reg_handoff_m3ap(void)
dissector_add_uint("sctp.ppi", PROTO_3GPP_M3AP_PROTOCOL_ID, m3ap_handle);
inited = TRUE;
#include "packet-m3ap-dis-tab.c"
dissector_add_uint("m3ap.extension", 17, new_create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
}
else {
if (SctpPort != 0) {

9
epan/dissectors/packet-m3ap.c
View File

@ -64,7 +64,7 @@ static dissector_handle_t m3ap_handle=NULL;
#define maxPrivateIEs 65535
#define maxProtocolExtensions 65535
#define maxProtocolIEs 65535
#define maxnoofMBMSServiceAreasPerMCE 65536
#define maxnoofMBMSServiceAreaIdentitiesPerMCE 65536
#define maxnooferrors 256
#define maxNrOfIndividualM3ConnectionsToReset 256
@ -927,7 +927,7 @@ dissect_m3ap_MCE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
static const per_sequence_t Global_MCE_ID_sequence[] = {
{ &hf_m3ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_m3ap_PLMN_Identity },
{ &hf_m3ap_mCE_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_m3ap_MCE_ID },
{ &hf_m3ap_extendedMCE_ID , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_m3ap_ExtendedMCE_ID },
{ &hf_m3ap_extendedMCE_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_m3ap_ExtendedMCE_ID },
{ &hf_m3ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_m3ap_ProtocolExtensionContainer },
{ NULL, 0, 0, NULL }
};
@ -1467,7 +1467,7 @@ static int
dissect_m3ap_MBMSServiceAreaListItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
ett_m3ap_MBMSServiceAreaListItem, MBMSServiceAreaListItem_sequence_of,
1, maxnoofMBMSServiceAreasPerMCE, FALSE);
1, maxnoofMBMSServiceAreaIdentitiesPerMCE, FALSE);
return offset;
}
@ -1979,7 +1979,7 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
}
static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@ -2555,6 +2555,7 @@ proto_reg_handoff_m3ap(void)
/*--- End of included file: packet-m3ap-dis-tab.c ---*/
#line 195 "../../asn1/m3ap/packet-m3ap-template.c"
dissector_add_uint("m3ap.extension", 17, new_create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
}
else {
if (SctpPort != 0) {