Split out the Gmb application AVP:s to at least make it simpler to handle the

AVP "collision".
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1494

svn path=/trunk/; revision=24235

4 files changed, 119 insertions, 85 deletions

diff --git a/diameter/TGPPGmb.xml b/diameter/TGPPGmb.xml
new file mode 100644
index 0000000000..7c441f2805
--- /dev/null
+++ b/diameter/TGPPGmb.xml
@@ -0,0 +1,110 @@
+<!-- $Id$ -->
+
+		<!-- 3GPP TS 29.061 version 7.5.0 Release 7 -->
+
+	<application id="16777223" name="3GPP Gmb" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
+<!--
+	These AVP:s collide(share AVP code number) with other 3GPP AVP:s  (3GPP Cx imscxdx.xml)
+	comment those out if you want to use these.
+-->
+		<avp name="3GPP-IMSI" code="1" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="3GPP-SGSNAddress" code="6" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="3GPP-SGSN-IPv6-Address" code="15" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="3GPP-IMEISV" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="3GPP-RAT-Type" code="21" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="3GPP-User-Location-Info" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="3GPP-MSTimeZone" code="23" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="TMGI" code="900" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+
+		<avp name="Required-MBMSBearer-Capabilities" code="901" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+
+		<avp name="MBMS-StartStop-Indication" code="902" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="START" code="0"/>
+			<enum name="STOP" code="1"/>
+		</avp>
+
+		<avp name="MBMS-Service-Area" code="903" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+
+		<avp name="MBMS-Session-Duration" code="904" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+
+		<avp name="Alternative-APN" code="905" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+
+		<avp name="MBMS-Service-Type" code="906" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="MULTICAST" code="0"/>
+			<enum name="BROADCAST" code="1"/>
+		</avp>
+
+		<avp name="MBMS-2G-3G-Indicator AVP" code="907" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="2G" code="0"/>
+			<enum name="3G" code="1"/>
+			<enum name="2G-AND-3G" code="2"/>
+		</avp>
+
+		<avp name="RAI" code="909" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+
+		<avp name="Additional-MBMS-Trace-Info" code="910" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+
+		<avp name="MBMS-Time-To-Data-Transfer" code="911" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+
+		<avp name="MBMS-Session-Identity-Repetition-Number " code="912" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="MBMS-Required-QoS" code="913" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="MBMS-Counting-Information" code="914" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="COUNTING-NOT-APPLICABLE" code="0"/>
+			<enum name="COUNTING-APPLICABLE" code="1"/>
+		</avp>
+		<avp name="MBMS-User-Data-Mode-Indication" code="915" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="Unicast" code="0"/>
+			<enum name="Multicast and Unicast" code="1"/>
+		</avp>
+		<avp name="MBMS-GGSN-Address" code="916" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="MBMS-GGSN-IPv6-Address" code="917" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="MBMS-BMSC-SSM-IP-Address" code="918" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+		<avp name="MBMS-BMSC-SSM-IPv6-Address" code="919" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
+		</avp>
+	</application>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 054fc3fd1b..a8dd4025cd 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -10,6 +10,7 @@
 	<!ENTITY chargecontrol SYSTEM "chargecontrol.xml">
 	<!ENTITY sunping SYSTEM "sunping.xml">
 	<!ENTITY imscxdx SYSTEM "imscxdx.xml">
+	<!ENTITY TGPPGmb SYSTEM "TGPPGmb.xml">
 	<!ENTITY TGPPSh SYSTEM "TGPPSh.xml">
 	<!ENTITY sip SYSTEM "sip.xml">
 	<!ENTITY gqpolicy SYSTEM "gqpolicy.xml">
@@ -1927,91 +1928,10 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
 			<type type-name="Enumerated"/>
 		</avp>
 
-		<!-- 3GPP TS 29.061 version 7.5.0 Release 7 -->
-
-		<avp name="TMGI" code="900" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-
-		<avp name="Required-MBMSBearer-Capabilities" code="901" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-
-		<avp name="MBMS-StartStop-Indication" code="902" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Enumerated"/>
-			<enum name="START" code="0"/>
-			<enum name="STOP" code="1"/>
-		</avp>
-
-		<avp name="MBMS-Service-Area" code="903" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-
-		<avp name="MBMS-Session-Duration" code="904" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-
-		<avp name="Alternative-APN" code="905" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-
-		<avp name="MBMS-Service-Type" code="906" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Enumerated"/>
-			<enum name="MULTICAST" code="0"/>
-			<enum name="BROADCAST" code="1"/>
-		</avp>
-
-		<avp name="MBMS-2G-3G-Indicator AVP" code="907" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Enumerated"/>
-			<enum name="2G" code="0"/>
-			<enum name="3G" code="1"/>
-			<enum name="2G-AND-3G" code="2"/>
-		</avp>
-
-		<avp name="RAI" code="909" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-
-		<avp name="Additional-MBMS-Trace-Info" code="910" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-
-		<avp name="MBMS-Time-To-Data-Transfer" code="911" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-
-		<avp name="MBMS-Session-Identity-Repetition-Number " code="912" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="MBMS-Required-QoS" code="913" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="UTF8String"/>
-		</avp>
-		<avp name="MBMS-Counting-Information" code="914" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Enumerated"/>
-			<enum name="COUNTING-NOT-APPLICABLE" code="0"/>
-			<enum name="COUNTING-APPLICABLE" code="1"/>
-		</avp>
-		<avp name="MBMS-User-Data-Mode-Indication" code="915" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="Enumerated"/>
-			<enum name="Unicast" code="0"/>
-			<enum name="Multicast and Unicast" code="1"/>
-		</avp>
-		<avp name="MBMS-GGSN-Address" code="916" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="MBMS-GGSN-IPv6-Address" code="917" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="MBMS-BMSC-SSM-IP-Address" code="918" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="MBMS-BMSC-SSM-IPv6-Address" code="919" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-			<type type-name="OctetString"/>
-		</avp>
-
 <!--
-Note: The AVP codes from 915 to 999 are reserved for TS 29.061
+Note: The AVP codes from 900 to 999 are reserved for TS 29.061
 29.210
+******** Found in TGPPGmb.xml ********
 -->
 		<avp name="Bearer-Usage" code="1000" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
@@ -2645,13 +2565,12 @@ http://www.3gcn.org/3gpp2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S00
 	<application id="16777216" name="3GPP Cx" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
 	</application>
 
-	<application id="16777223" name="3GPP Gmb" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
-	</application>
 	&nasreq;
 	&mobileipv4;
 	&chargecontrol;
 	&sunping;
 	&imscxdx;
+	&TGPPGmb;
 	&TGPPSh;
 	&sip;
 	&gqpolicy;
diff --git a/diameter/imscxdx.xml b/diameter/imscxdx.xml
index b93f39a935..28b9908bab 100644
--- a/diameter/imscxdx.xml
+++ b/diameter/imscxdx.xml
@@ -12,6 +12,10 @@
 		<command name="Push-Profile"             code="305" vendor-id="TGPP"/>
 
 		<!-- ************************** IMS Cx Dx AVPS ********************* -->
+<!--
+	These AVP:s collide(share AVP code number) with other 3GPP AVP:s (TGPPGmb.xml)
+	comment out 1 - 28 here and uncomment the ones in TGPPGmb.xml if you want to use them.
+-->
 		<avp name="Visited-Network-Identifier" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 			<type type-name="OctetString"/>
 		</avp>
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index ed041d7908..6f1c0539bd 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -401,6 +401,7 @@ File "..\..\diameter\mobileipv4.xml"
 File "..\..\diameter\nasreq.xml"
 File "..\..\diameter\sip.xml"
 File "..\..\diameter\sunping.xml"
+File "..\..\diameter\TGPPGmb.xml"
 File "..\..\diameter\TGPPSh.xml"
 SetOutPath $INSTDIR