From David Wei:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 11 Feb 2012 09:09:27 +0000 (09:09 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 11 Feb 2012 09:09:27 +0000 (09:09 +0000)
Udate AVP:s

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40968 f5534014-38df-0310-8fa8-9805f1628bb7

diameter/TGPPGmb.xml
diameter/dictionary.xml

index bb875f5..9a244b8 100644 (file)
       <type type-name="OctetString"/>
     </avp>
 -->
-    <avp name="TMGI" code="900" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <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-MBMS-Bearer-Capabilities" code="901" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <enum name="uncompressed-header" code="0"/>
                        <enum name="compressed-header" code="1"/>
                </avp>
+               <avp name="MBMS-Access-Indicator" code="923" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UTRAN" code="0"/>
+                       <enum name="E-UTRAN" code="1"/>
+                       <enum name="UTRAN-AND-E-UTRAN" code="2"/>
+               </avp>
+               <avp name="MBMS-GW-SSM-IP-Address" code="924" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="MBMS-GW-SSM-IPv6-Address" code="925" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="MBMS-BMSC-SSM-UDP-Port" code="926" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="MBMS-GW-UDP-Port" code="927" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="MBMS-GW-UDP-Port-Indicator" code="928" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UDP-PORT-REQUIRED" code="1"/>
+               </avp>
 <!--
-Note: The AVP codes from 923 to 999 are reserved for TS 29.061
+Note: The AVP codes from 929 to 999 are reserved for TS 29.061
 -->
        </application>
index 07d0e05..7c877dd 100644 (file)
@@ -3358,99 +3358,8 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                        <enum name="Alphanumeric Shortcode" code="5"/>
                        <enum name="Other" code="6"/>
                </avp>
-               <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-MBMS-Bearer-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-Indicatio" 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"/>
-                       <enum name="UPDATE" code="2"/>
-               </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="Unsigned32"/>
-               </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" 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="MBMS-Session-Identity" code="908" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
-               </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-Transfe" code="911" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
-               </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" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="MBMS-Counting-Information" code="914" mandatory="must" 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" mandatory="must" 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="UTF8String"/>
-               </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="UTF8String"/>
-               </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="UTF8String"/>
-               </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="UTF8String"/>
-               </avp>
-               <avp name="MBMS-Flow-Identifier" code="920" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
-               </avp>
-               <avp name="CN-IP-Multicast-Distribution" code="921" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="NO-IP-MULTICAST" code="0"/>
-                       <enum name="IP-MULTICAST" code="1"/>
-               </avp>
-               <avp name="CN-IP-Multicast-Distribution" code="922" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="uncompressed-header" code="0"/>
-                       <enum name="compressed-header" code="1"/>
-               </avp>
-               <avp name="MBMS-Access-Indicator" code="923" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="UTRAN" code="0"/>
-                       <enum name="E-UTRAN" code="1"/>
-                       <enum name="UTRAN-AND-E-UTRAN" code="2"/>
-               </avp>
 <!--
-Note: The AVP codes from 924 to 999 are reserved for TS 29.061
+Note: The AVP codes from 900 to 999 are reserved for TS 29.061
 29.210 -> 3GPP TS 29.212
 ******** Found in TGPPGmb.xml ********
 -->