aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-02-24 05:39:13 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-02-24 05:39:13 +0000
commit0badfa1224ee43086e184bc1247dbe3121af0299 (patch)
treeabc8a8ac7b684cab9d01dceb2dcc6a12efe041d2
parent174d06e4c64b70c9a276f2bad1ba7a550cec8e7f (diff)
From Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6867
svn path=/trunk/; revision=41169
-rw-r--r--diameter/TGPPRx.xml3
-rw-r--r--diameter/dictionary.xml18
-rw-r--r--diameter/mobileipv4.xml6
3 files changed, 18 insertions, 9 deletions
diff --git a/diameter/TGPPRx.xml b/diameter/TGPPRx.xml
index a976470860..9690b2b6a0 100644
--- 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 e8b514e04d..4473dbb626 100644
--- 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 4e0bdb78f3..9c1ea6c19e 100644
--- 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