osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From: "Jacques, Olivier : 

- Added new RFC 3588 header format support (vendor-Id is replaced by
application-Id) and command code has its own separated name space. The
Draft v16 behaviour is maintained (through Preferences menu).
- Added 3GPP IMS Cx/Dx interface decoding (new imscxdx.xml)
- Fixed some issues in dictionary.xml
- Refreshed Diameter applications in embedded AVPs (that do not rely on
XML dictionary)

svn path=/trunk/; revision=12234
This commit is contained in:
Anders Broman 2004-10-08 09:35:02 +00:00
parent ce577d4eff
commit 2486f4fa90
2 changed files with 210 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dictionary.xml
View File

@ -3,9 +3,10 @@
<!ENTITY nasreq SYSTEM "nasreq.xml">
<!ENTITY mobileipv4 SYSTEM "mobileipv4.xml">
<!ENTITY sunping SYSTEM "sunping.xml">
<!ENTITY imscxdx SYSTEM "imscxdx.xml">
]>
<dictionary>
<base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-07.txt">
<base uri="http://www.ietf.org/rfc/rfc3588.txt">
<!--
$Log: dictionary.xml,v $
Revision 1.1 2001/11/01 21:52:44 guy
@ -47,9 +48,11 @@
<!-- ************************* Vendors **************************** -->
<vendor vendor-id="None" code="0" name="None"/>
<vendor vendor-id="HP" code="11" name="Hewlett Packard"/>
<vendor vendor-id="Merit" code="61" name="Merit Networks"/>
<vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
<vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
<vendor vendor-id="TGPP" code="10415" name="3GPP"/>
<!-- *********************** End Vendors ************************** -->
<!-- ************************ typedefn's ************************** -->
@ -518,7 +521,7 @@
<avp name="Auth-Session-State" code="277" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
<enum name="State Maintained" code="0"/>
<enum name="No State Maintained" code="0"/>
<enum name="No State Maintained" code="1"/>
</avp>
<avp name="Re-Auth-Request-Type" code="285" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
@ -534,7 +537,7 @@
<avp name="Disconnect-Cause" code="273" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
<enum name="Rebooting" code="0"/>
<enum name="Busy" code="2"/>
<enum name="Busy" code="1"/>
<enum name="Do not want to talk to you" code="2"/>
</avp>
<avp name="Error-Message" code="281" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
@ -590,6 +593,62 @@
</avp>
<avp name="Result-Code" code="268" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
<enum name="DIAMETER_MULTI_ROUND_AUTH" code="1001"/>
<enum name="DIAMETER_SUCCESS" code="2001"/>
<enum name="DIAMETER_LIMITED_SUCCESS" code="2002"/>
<enum name="DIAMETER_COMMAND_UNSUPPORTED" code="3001"/>
<enum name="DIAMETER_UNABLE_TO_DELIVER" code="3002"/>
<enum name="DIAMETER_REALM_NOT_SERVED" code="3003"/>
<enum name="DIAMETER_TOO_BUSY" code="3004"/>
<enum name="DIAMETER_LOOP_DETECTED" code="3005"/>
<enum name="DIAMETER_REDIRECT_INDICATION" code="3006"/>
<enum name="DIAMETER_APPLICATION_UNSUPPORTED" code="3007"/>
<enum name="DIAMETER_INVALID_HDR_BITS" code="3008"/>
<enum name="DIAMETER_INVALID_AVP_BITS" code="3009"/>
<enum name="DIAMETER_UNKNOWN_PEER" code="3010"/>
<enum name="DIAMETER_AUTHENTICATION_REJECTED" code="4001"/>
<enum name="DIAMETER_OUT_OF_SPACE" code="4002"/>
<enum name="DIAMETER_ELECTION_LOST" code="4003"/>
<enum name="DIAMETER_AVP_UNSUPPORTED" code="5001"/>
<enum name="DIAMETER_UNKNOWN_SESSION_ID" code="5002"/>
<enum name="DIAMETER_AUTHORIZATION_REJECTED" code="5003"/>
<enum name="DIAMETER_INVALID_AVP_VALUE" code="5004"/>
<enum name="DIAMETER_MISSING_AVP" code="5005"/>
<enum name="DIAMETER_RESOURCES_EXCEEDED" code="5006"/>
<enum name="DIAMETER_CONTRADICTING_AVPS" code="5007"/>
<enum name="DIAMETER_AVP_NOT_ALLOWED" code="5008"/>
<enum name="DIAMETER_AVP_OCCURS_TOO_MANY_TIMES" code="5009"/>
<enum name="DIAMETER_NO_COMMON_APPLICATION " code="5010"/>
<enum name="DIAMETER_UNSUPPORTED_VERSION" code="5011"/>
<enum name="DIAMETER_UNABLE_TO_COMPLY" code="5012"/>
<enum name="DIAMETER_INVALID_BIT_IN_HEADER" code="5013"/>
<enum name="DIAMETER_INVALID_AVP_LENGTH" code="5014"/>
<enum name="DIAMETER_INVALID_MESSAGE_LENGTH" code="5015"/>
<enum name="DIAMETER_INVALID_AVP_BIT_COMBO" code="5016"/>
<enum name="DIAMETER_NO_COMMON_SECURITY" code="5017"/>
</avp>
<avp name="Experimental-Result" code="297" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
<grouped>
<gavp name="Vendor-Id"/>
<gavp name="Experimental-Result-Code"/>
</grouped>
</avp>
<avp name="Experimental-Result-Code" code="298" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
<type type-name="Unsigned32"/>
<enum name="First Registration" code="2001"/>
<enum name="Subsequent Registration" code="2002"/>
<enum name="Unregistered Service" code="2003"/>
<enum name="Success Server Name Not Stored" code="2004"/>
<enum name="Server Selection" code="2005"/>
<enum name="Error User Unknown" code="5001"/>
<enum name="Error Identities Dont Match" code="5002"/>
<enum name="Error Identity Not Registered" code="5003"/>
<enum name="Error Roaming Not Allowed" code="5004"/>
<enum name="Error Roaming Identity Already Registered" code="5005"/>
<enum name="Error Roaming Auth Scheme Not Supported" code="5006"/>
<enum name="Error In Assignment Type" code="5007"/>
<enum name="Error Too Much Data" code="5008"/>
<enum name="Error Not Supported User Data" code="5009"/>
</avp>
<avp name="Route-Record" code="282" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
<type type-name="DiameterIdentity"/>
@ -643,5 +702,6 @@
&nasreq;
&mobileipv4;
&sunping;
&imscxdx;
</dictionary>

147
imscxdx.xml Normal file
View File

@ -0,0 +1,147 @@
<?xml version="1.0" encoding="UTF-8"?>
<application id="167772151" name="IMS_Cx_Dx" uri="http://www.3GPP.org/ftp/Specs/html-info/29229.htm">
<!-- IMS Cx Dx Application -->
<command name="User-Authorization" code="300" vendor-id="TGPP"/>
<command name="Server-Assignment" code="301" vendor-id="TGPP"/>
<command name="Location-Info" code="302" vendor-id="TGPP"/>
<command name="Multimedia-Auth" code="303" vendor-id="TGPP"/>
<command name="Registration-Termination" code="304" vendor-id="TGPP"/>
<command name="Push-Profile" code="305" vendor-id="TGPP"/>
<!-- ************************** IMS Cx Dx AVPS ********************* -->
<avp name="Visited-Network-Identifier" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
<type type-name="OctetString"/>
</avp>
<avp name="Public-Identity" code="2" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="UTF8String"/>
</avp>
<avp name="Server-Name" code="3" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="UTF8String"/>
</avp>
<avp name="Server-Capabilities" code="4" 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="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="Optional-Capability" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="User-Data" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="SIP-Number-Auth-Items" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="SIP-Authentication-Scheme" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="UTF8String"/>
</avp>
<avp name="SIP-Authenticate" code="10" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="SIP-Authorization" code="11" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="SIP-Authentication-Context" code="12" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<!-- GROUPED -->
<avp name="SIP-Auth-Data-Item" code="13" 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"/>
</grouped>
</avp>
<avp name="SIP-Item-Number" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="Unsigned32"/>
</avp>
<avp name="Server-Assignment-Type" code="15" 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="16" 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="17" 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="18" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="UTF8String"/>
</avp>
<!-- GROUPED -->
<avp name="Charging-Information" code="19" 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="20" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="DiameterIdentity"/>
</avp>
<avp name="Secondary-Event-Charging-Function-Name" code="21" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="DiameterIdentity"/>
</avp>
<avp name="Primary-Charging-Collection-Function-Name" code="22" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="DiameterIdentity"/>
</avp>
<avp name="Secondary-Charging-Collection-Function-Name" code="23" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="DiameterIdentity"/>
</avp>
<avp name="User-Authorization-Type" code="24" 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-Request-Type" code="25" 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>
<avp name="User-Data-Already-Available" code="26" 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="27" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<avp name="Integrity-Key" code="28" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
<type type-name="OctetString"/>
</avp>
<!-- ************************ END IMS Cx Dx AVPS ******************* -->
</application>