diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-03-20 22:07:39 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-03-20 22:07:39 +0000 |
commit | 1e5d08bcf6a679386c9c2e9f196042cfcbf7eac0 (patch) | |
tree | 4d67511cba908ce3755215d4c8baecc36f9f6b24 /diameter | |
parent | 18af769765fe04318dc4ffd60ada68ff0b2e1a42 (diff) |
From KATAOKA Toshihiro:
Update Cx/Dx dictionary.
Only part of the patch applied, leaving the obsoleted AVP:s for now.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4602
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32252 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'diameter')
-rw-r--r-- | diameter/imscxdx.xml | 353 |
1 files changed, 182 insertions, 171 deletions
diff --git a/diameter/imscxdx.xml b/diameter/imscxdx.xml index 9dd7103da8..010f546b14 100644 --- a/diameter/imscxdx.xml +++ b/diameter/imscxdx.xml @@ -150,179 +150,182 @@ <!-- ************************ END IMS Cx Dx AVPS ******************* --> <!-- ************************** IMS Cx Dx AVPS 3GPP TS 29.229 version 6.7.0 Release 6 ********************* --> <!-- Note: The AVP codes from 633 to 699 are reserved for TS 29.229. --> - <avp name="Visited-Network-Identifier" code="600" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> - <type type-name="OctetString"/> - </avp> - <avp name="Public-Identity" code="601" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="UTF8String"/> - </avp> - <avp name="Server-Name" code="602" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="UTF8String"/> - </avp> - <avp name="Server-Capabilities" code="603" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <grouped> - <gavp name="Mandatory-Capability"/> - <gavp name="Optional-Capability"/> - <gavp name="Server-Name"/> - </grouped> - </avp> - <avp name="Mandatory-Capability" code="604" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - </avp> - <avp name="Optional-Capability" code="605" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - </avp> - <avp name="User-Data" code="606" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString"/> - </avp> - <avp name="SIP-Number-Auth-Items" code="607" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - </avp> - <avp name="SIP-Authentication-Scheme" code="608" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="UTF8String"/> - </avp> - <avp name="SIP-Authenticate" code="609" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString"/> - </avp> - <avp name="SIP-Authorization" code="610" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString"/> - </avp> - <avp name="SIP-Authentication-Context" code="611" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString"/> - </avp> - <!-- GROUPED --> - <avp name="SIP-Auth-Data-Item" code="612" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <grouped> - <gavp name="SIP-Item-Number"/> - <gavp name="SIP-Authentication-Scheme"/> - <gavp name="SIP-Authenticate"/> - <gavp name="SIP-Authorization"/> - <gavp name="SIP-Authentication-Context"/> - <gavp name="Confidentiality-Key"/> - <gavp name="Integrity-Key"/> - <gavp name="SIP-Digest-Authenticate"/> - <gavp name="Line-Identifier"/> - </grouped> - </avp> - <avp name="SIP-Item-Number" code="613" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - </avp> - <avp name="Server-Assignment-Type" code="614" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - <enum name="No-Assignment" code="0"/> - <enum name="Registration" code="1"/> - <enum name="Re-Registration" code="2"/> - <enum name="Unregistered-User" code="3"/> - <enum name="Timeout-Deregistration" code="4"/> - <enum name="User-Deregistration" code="5"/> - <enum name="Timeout-Deregistration-Store-Server-Name" code="6"/> - <enum name="User-Deregistration-Store-Server-Name" code="7"/> - <enum name="Administrative-Deregistration" code="8"/> - <enum name="Authentication-Failure" code="9"/> - <enum name="Authentication-Timeout" code="10"/> - <enum name="Deregistration-Too-Much-Data" code="11"/> - </avp> - <!-- GROUPED --> - <avp name="Deregistration-Reason" code="615" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <grouped> - <gavp name="Reason-Code"/> - <gavp name="Reason-Info"/> - </grouped> - </avp> - <avp name="Reason-Code" code="616" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - <enum name="Permanent-Termination" code="0"/> - <enum name="New-Server-Assigned" code="1"/> - <enum name="Server-Change" code="2"/> - <enum name="Remove-S-CSCF" code="3"/> - </avp> - <avp name="Reason-Info" code="617" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="UTF8String"/> - </avp> - <!-- GROUPED --> - <avp name="Charging-Information" code="618" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <grouped> - <gavp name="Primary-Event-Charging-Function-Name"/> - <gavp name="Secondary-Event-Charging-Function-Name"/> - <gavp name="Primary-Charging-Collection-Function-Name"/> - <gavp name="Secondary-Charging-Collection-Function-Name"/> - </grouped> - </avp> - <avp name="Primary-Event-Charging-Function-Name" code="619" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="DiameterURI"/> - </avp> - <avp name="Secondary-Event-Charging-Function-Name" code="620" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="DiameterURI"/> - </avp> - <avp name="Primary-Charging-Collection-Function-Name" code="621" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="DiameterURI"/> - </avp> - <avp name="Secondary-Charging-Collection-Function-Name" code="622" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="DiameterURI"/> - </avp> - <avp name="User-Authorization-Type" code="623" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - <enum name="Registration" code="0"/> - <enum name="De-Registration" code="1"/> - <enum name="Registration-And-Capabilities" code="2"/> - </avp> - <avp name="User-Data-Already-Available" code="624" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - <enum name="User-Data-Not-Available" code="0"/> - <enum name="User-Data-Already-Available" code="1"/> - </avp> - <avp name="Confidentiality-Key" code="625" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString"/> - </avp> - <avp name="Integrity-Key" code="626" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="OctetString"/> - </avp> - <avp name="User-Data-Request-Type" code="627" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> - <type type-name="Unsigned32"/> - <enum name="Complete-Profile" code="0"/> - <enum name="Registered-Profile" code="1"/> - <enum name="Unregistered-Profile" code="2"/> - </avp> - <!-- GROUPED --> - <avp name="Supported-Features" code="628" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> - <grouped> - <gavp name="Vendor-ID"/> - <gavp name="Feature-List-ID"/> - <gavp name="Feature-List"/> - </grouped> - </avp> - <avp name="Feature-List-ID" code="629" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> - <type type-name="Unsigned32"/> - </avp> - <avp name="Feature-List" code="630" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> - <type type-name="Unsigned32"/> - </avp> - <!-- GROUPED --> - <avp name="Supported-Applications" code="631" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <avp name="Visited-Network-Identifier" code="600" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <type type-name="OctetString"/> + </avp> + <avp name="Public-Identity" code="601" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="UTF8String"/> + </avp> + <avp name="Server-Name" code="602" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="UTF8String"/> + </avp> + <avp name="Server-Capabilities" code="603" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <grouped> + <gavp name="Mandatory-Capability"/> + <gavp name="Optional-Capability"/> + <gavp name="Server-Name"/> + </grouped> + </avp> + <avp name="Mandatory-Capability" code="604" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Optional-Capability" code="605" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Unsigned32"/> + </avp> + <avp name="User-Data" code="606" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="SIP-Number-Auth-Items" code="607" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Unsigned32"/> + </avp> + <avp name="SIP-Authentication-Scheme" code="608" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="UTF8String"/> + </avp> + <avp name="SIP-Authenticate" code="609" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="SIP-Authorization" code="610" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="SIP-Authentication-Context" code="611" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <!-- GROUPED --> + <avp name="SIP-Auth-Data-Item" code="612" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <grouped> + <gavp name="SIP-Item-Number"/> + <gavp name="SIP-Authentication-Scheme"/> + <gavp name="SIP-Authenticate"/> + <gavp name="SIP-Authorization"/> + <gavp name="SIP-Authentication-Context"/> + <gavp name="Confidentiality-Key"/> + <gavp name="Integrity-Key"/> + <gavp name="SIP-Digest-Authenticate"/> + <gavp name="Framed-IP-Address"/> + <gavp name="Framed-IPv6-Prefix"/> + <gavp name="Framed-Interface-Id"/> + <gavp name="Line-Identifier"/> + </grouped> + </avp> + <avp name="SIP-Item-Number" code="613" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Server-Assignment-Type" code="614" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Enumerated"/> + <enum name="NO_ASSIGNMENT" code="0"/> + <enum name="REGISTRATION" code="1"/> + <enum name="RE_REGISTRATION" code="2"/> + <enum name="UNREGISTERED_USER" code="3"/> + <enum name="TIMEOUT_DEREGISTRATION" code="4"/> + <enum name="USER_DEREGISTRATION" code="5"/> + <enum name="TIMEOUT_DEREGISTRATION_STORE_SERVER_NAME" code="6"/> + <enum name="USER_DEREGISTRATION_STORE_SERVER_NAME" code="7"/> + <enum name="ADMINISTRATIVE_DEREGISTRATION" code="8"/> + <enum name="AUTHENTICATION_FAILURE" code="9"/> + <enum name="AUTHENTICATION_TIMEOUT" code="10"/> + <enum name="DEREGISTRATION_TOO_MUCH_DATA" code="11"/> + <enum name="AAA_USER_DATA_REQUEST" code="12"/> + <enum name="PGW_UPDATE" code="13"/> + </avp> + <!-- GROUPED --> + <avp name="Deregistration-Reason" code="615" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <grouped> + <gavp name="Reason-Code"/> + <gavp name="Reason-Info"/> + </grouped> + </avp> + <avp name="Reason-Code" code="616" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Enumerated"/> + <enum name="PERMANENT_TERMINATION" code="0"/> + <enum name="NEW_SERVER_ASSIGNED" code="1"/> + <enum name="SERVER_CHANGE" code="2"/> + <enum name="REMOVE_S-CSCF" code="3"/> + </avp> + <avp name="Reason-Info" code="617" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="UTF8String"/> + </avp> + <!-- GROUPED --> + <avp name="Charging-Information" code="618" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <grouped> - <gavp name="Auth-Application-Id"/> - <gavp name="Acct-Application-Id"/> - <gavp name="Vendor-Specific-Application-Id"/> - <gavp name="Secondary-Charging-Collection-Function-Name"/> + <gavp name="Primary-Event-Charging-Function-Name"/> + <gavp name="Secondary-Event-Charging-Function-Name"/> + <gavp name="Primary-Charging-Collection-Function-Name"/> + <gavp name="Secondary-Charging-Collection-Function-Name"/> </grouped> - </avp> - <!-- GROUPED --> - <avp name="Associated-Identities" code="632" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + </avp> + <avp name="Primary-Event-Charging-Function-Name" code="619" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="DiameterURI"/> + </avp> + <avp name="Secondary-Event-Charging-Function-Name" code="620" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="DiameterURI"/> + </avp> + <avp name="Primary-Charging-Collection-Function-Name" code="621" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="DiameterURI"/> + </avp> + <avp name="Secondary-Charging-Collection-Function-Name" code="622" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="DiameterURI"/> + </avp> + <avp name="User-Authorization-Type" code="623" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Enumerated"/> + <enum name="REGISTRATION" code="0"/> + <enum name="REGISTRATION" code="1"/> + <enum name="REGISTRATION_AND_CAPABILITIES" code="2"/> + </avp> + <avp name="User-Data-Already-Available" code="624" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Enumerated"/> + <enum name="USER_DATA_NOT_AVAILABLE" code="0"/> + <enum name="USER_DATA_ALREADY_AVAILABLE" code="1"/> + </avp> + <avp name="Confidentiality-Key" code="625" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Integrity-Key" code="626" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="User-Data-Request-Type(Obsolete)" code="627" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> + <type type-name="Unsigned32"/> + <enum name="Complete-Profile" code="0"/> + <enum name="Registered-Profile" code="1"/> + <enum name="Unregistered-Profile" code="2"/> + </avp> + <!-- GROUPED --> + <avp name="Supported-Features" code="628" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <grouped> + <gavp name="Vendor-ID"/> + <gavp name="Feature-List-ID"/> + <gavp name="Feature-List"/> + </grouped> + </avp> + <avp name="Feature-List-ID" code="629" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Feature-List" code="630" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <type type-name="Unsigned32"/> + </avp> + <!-- GROUPED --> + <avp name="Supported-Applications" code="631" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <grouped> + <gavp name="Auth-Application-Id"/> + <gavp name="Acct-Application-Id"/> + <gavp name="Vendor-Specific-Application-Id"/> + </grouped> + </avp> + <!-- GROUPED --> + <avp name="Associated-Identities" code="632" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <grouped> <gavp name="User-Name"/> </grouped> - </avp> - <avp name="Originating-Request" code="633" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> - <type type-name="Enumerated"/> - <enum name="ORIGINATING" code="0"/> - </avp> - <avp name="Wildcarded-PSI" code="634" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> - <type type-name="UTF8String"/> - </avp> + </avp> + <avp name="Originating-Request" code="633" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <type type-name="Enumerated"/> + <enum name="ORIGINATING" code="0"/> + </avp> + <avp name="Wildcarded-PSI" code="634" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <type type-name="UTF8String"/> + </avp> <avp name="SIP-Digest-Authenticate AVP" code="635" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <grouped> <gavp name="Digest-Realm"/> - <gavp name="Digest-Domain"/> <gavp name="Digest-Algorithm"/> <gavp name="Digest-QoP"/> <gavp name="Digest-HA1"/> @@ -336,15 +339,15 @@ </avp> <avp name="Loose-Route-Indication" code="638" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="Enumerated"/> - <enum name="LOOSE_ROUTE_NOT_REQUIRED" code="0"/> - <enum name="LOOSE_ROUTE_REQUIRED" code="1"/> + <enum name="LOOSE_ROUTE_NOT_REQUIRED" code="0"/> + <enum name="LOOSE_ROUTE_REQUIRED" code="1"/> </avp> <avp name="SCSCF-Restoration-Info" code="639" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <grouped> <gavp name="User-Name"/> <gavp name="Restoration-Info"/> </grouped> - </avp> + </avp> <avp name="Path" code="640" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="OctetString"/> </avp> @@ -379,8 +382,8 @@ </avp> <avp name="Multiple-Registration-Indication" code="648" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="Enumerated"/> - <enum name="NOT_MULTIPLE_REGISTRATION" code="0"/> - <enum name="MULTIPLE_REGISTRATION" code="1"/> + <enum name="NOT_MULTIPLE_REGISTRATION" code="0"/> + <enum name="MULTIPLE_REGISTRATION" code="1"/> </avp> <avp name="Restoration-Info" code="649" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <grouped> @@ -388,7 +391,15 @@ <gavp name="Contact"/> <gavp name="Subscription-Info"/> </grouped> - </avp> + </avp> + <avp name="Session-Priority" code="650" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <type type-name="Enumerated"/> + <enum name="PRIORITY-0" code="0"/> + <enum name="PRIORITY-1" code="1"/> + <enum name="PRIORITY-2" code="2"/> + <enum name="PRIORITY-3" code="3"/> + <enum name="PRIORITY-4" code="4"/> + </avp> <!-- ************************ END IMS Cx Dx AVPS ******************* --> </application> |