From Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs...

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

diff --git a/diameter/TGPPRx.xml b/diameter/TGPPRx.xml
index a9764708603063f41155d4ce764fdc56abf9126c..9690b2b6a098c101b1a4fee5ff6a4101ab8f046b 100644 (file)
--- a/diameter/TGPPRx.xml
+++ b/diameter/TGPPRx.xml
@@ -30,10 +30,11 @@ Is defined in gqpolicy.xml
     </avp>
 
     <avp name="Acceptable-Service-Info" code="526" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-       <type type-name="Grouped" /> 
+       <grouped> 
           <gavp name="Media-Component-Description"/>
           <gavp name="Max-Requested-Bandwidth-UL"/>
           <gavp name="Max-Requested-Bandwidth-DL"/>
+       </grouped> 
     </avp>
 
     <avp name="Service-Info-Status" code="527" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index e8b514e04df7bf43d1450225eeeee6c97e647ac0..4473dbb6266b6a776fe5d8b1f1ccbd2e890db8c5 100644 (file)
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -5624,10 +5624,12 @@ Note: The AVP codes from 2408 to 2499 are reserved for TS 29.173
       </avp>
 
       <avp name="LCS-QoS" code="2504" vendor-bit="must" vendor-id="TGPP">
-        <gavp name="LCS-QoS-Class"/>
-        <gavp name="Vertical-Accuracy "/>
-        <gavp name="Vertical-Requested"/>
-        <gavp name="Response-Time"/>
+        <grouped>
+          <gavp name="LCS-QoS-Class"/>
+          <gavp name="Vertical-Accuracy "/>
+          <gavp name="Vertical-Requested"/>
+          <gavp name="Response-Time"/>
+        </grouped>
       </avp>
 
       <!--      
@@ -5684,11 +5686,15 @@ Note: The AVP codes from 2408 to 2499 are reserved for TS 29.173
       </avp>
 
       <avp name="LCS-Privacy-Check-Non-Session" code="2521" vendor-bit="must" vendor-id="TGPP">
-        <gavp name="LCS-Privacy-Check"/>
+        <grouped>
+          <gavp name="LCS-Privacy-Check"/>
+        </grouped>
       </avp>
 
       <avp name="LCS-Privacy-Check-Session" code="2522" vendor-bit="must" vendor-id="TGPP">
-        <gavp name="LCS-Privacy-Check"/>
+        <grouped>
+          <gavp name="LCS-Privacy-Check"/>
+        </grouped>
       </avp>
 
       <avp name="LCS-QoS-Class" code="2523" vendor-bit="must" vendor-id="TGPP">

diff --git a/diameter/mobileipv4.xml b/diameter/mobileipv4.xml
index 4e0bdb78f360a933cfb806aeada4c2c7811e59ee..9c1ea6c19eb40b0d93da1b1e051dbd5f0bb0d622 100644 (file)
--- a/diameter/mobileipv4.xml
+++ b/diameter/mobileipv4.xml
@@ -153,16 +153,18 @@ http://www.iana.org/assignments/aaa-parameters
                        <enum name="Nonces" code="3"/>
                </avp>
                <avp name="MIP-Originating-Foreign-AAA" code="347" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes">
-                       <type type-name="Grouped"/>
+                       <grouped>
                                <gavp name="Origin-Realm"/>
                                <gavp name="Origin-Host"/>
                                <gavp name="AVP"/>
+                       </grouped>
                </avp>
                <avp name="MIP-Home-Agent-Host" code="348" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="no">
-                       <type type-name="Grouped"/>
+                       <grouped>
                                <gavp name="Destination-Realm"/>
                                <gavp name="Destination-Host"/>
                                <gavp name="AVP"/>
+                       </grouped>
                </avp>
 <!--
 349-362        Unassigned