diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-05-08 14:05:58 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-05-09 07:20:48 +0000 |
| commit | 2ad4bfedfb5f6b2b1a64449d60c75eeba0be6a7f (patch) | |
| tree | 5761ecb973dd21bcd13d3788b5af01c055ab9e29 /diameter | |
| parent | 9f613e33055fdea2476996002895000498c2de71 (diff) | |
Eliminate a couple of empty Diameter grouped AVP lists.
Use Session-ID as a place holder for grouped AVPs that can hold any AVP and
look up the contents of a couple grouped AVPs whose contents wasn't specified.
Also, update the DTD to allow vendors to not add any AVPs.
Change-Id: Id2852e31cecbcfaf64efb46918101b3a81ed5bdb
Reviewed-on: https://code.wireshark.org/review/8355
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'diameter')
| -rw-r--r-- | diameter/Starent.xml | 8 | ||||
| -rw-r--r-- | diameter/dictionary.dtd | 2 | ||||
| -rw-r--r-- | diameter/dictionary.xml | 9 |
3 files changed, 15 insertions, 4 deletions
diff --git a/diameter/Starent.xml b/diameter/Starent.xml index 7e2821e272..80833f71da 100644 --- a/diameter/Starent.xml +++ b/diameter/Starent.xml @@ -95,7 +95,13 @@ <avp name="SN-Total-Used-Service-Unit" code="504" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> <grouped> - <gavp name=""/> + <gavp name="Tariff-Change-Usage"/> + <gavp name="CC-Time"/> + <gavp name="CC-Total-Octets"/> + <gavp name="CC-Input-Octets"/> + <gavp name="CC-Output-Octets"/> + <gavp name="CC-Service-Specific-Units"/> + <gavp name="3GPP-Reporting-Reason"/> </grouped> </avp> diff --git a/diameter/dictionary.dtd b/diameter/dictionary.dtd index b8837f3b56..82c6fa8aff 100644 --- a/diameter/dictionary.dtd +++ b/diameter/dictionary.dtd @@ -34,7 +34,7 @@ code CDATA #REQUIRED vendor-id IDREF #IMPLIED > -<!ELEMENT vendor (avp+)> +<!ELEMENT vendor (avp*)> <!ATTLIST vendor vendor-id ID #REQUIRED code CDATA #REQUIRED diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index a418726f18..d49bcbb0eb 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -1760,7 +1760,8 @@ </avp> <avp name="Failed-AVP" code="279" mandatory="must" may-encrypt="no" vendor-bit="mustnot"> <grouped> - + <!-- This grouped AVP holds any AVP --> + <gavp name="Session-Id"/> </grouped> </avp> <avp name="Proxy-Host" code="280" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> @@ -4354,7 +4355,11 @@ </avp> <avp name="Service-Generic-Information" code="1256" vendor-bit="must" vendor-id="TGPP"> <grouped> - <!-- The AVP is defined in OMA-DDS-Charging_Data --> + <!-- From OMA-DDS-Charging_Data --> + <gavp name="Application-Server-ID"/> + <gavp name="Application-Service-Type"/> + <gavp name="Application-Session-ID"/> + <gavp name="Delivery-Status"/> </grouped> </avp> <avp name="Service-Specific-Type" code="1257" vendor-bit="must" vendor-id="TGPP"> |