Update some 3GPP AVP:s
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Nov 2005 16:40:55 +0000 (16:40 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Nov 2005 16:40:55 +0000 (16:40 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16498 f5534014-38df-0310-8fa8-9805f1628bb7

diameter/3GPPSh.xml [new file with mode: 0644]
diameter/dictionary.xml
diameter/imscxdx.xml
diameter/mobileipv4.xml
diameter/nasreq.xml

diff --git a/diameter/3GPPSh.xml b/diameter/3GPPSh.xml
new file mode 100644 (file)
index 0000000..6be83c9
--- /dev/null
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id:$ -->
+
+       <application id="16777217" name="3GPP Sh" uri="http://webapp.etsi.org/exchangefolder/ts_129329v060600p.pdf">
+       <!-- 3GPP TS 29.329 version 6.6.0 Release 6, ETSI TS 129 329 V6.6.0 (2005-09)-->
+
+               <!-- 3GPP Sh Application -->
+               <command name="User-Data"                                                       code="306" vendor-id="TGPP"/>
+               <command name="Profile-Update"                                          code="307" vendor-id="TGPP"/>
+               <command name="Subscribe-Notifications"                         code="308" vendor-id="TGPP"/>
+               <command name="Push-Notification"                                       code="309" vendor-id="TGPP"/>
+
+               <!-- ************************** 3GPP Sh AVPS ********************* -->
+               <avp name="User-Identity" code="700" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+                        <grouped>
+                                <gavp name="Public-Identity"/>
+                                <gavp name="MSISDN"/>
+                        </grouped>
+               </avp>
+               <avp name="MSISDN" code="701" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="User-Data" code="702" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Data-Reference" code="703" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+                        <enum name="RepositoryData" code="0"/>
+                        <enum name="IMSPublicIdentity" code="10"/>
+                        <enum name="IMSUserState" code="11"/>
+                        <enum name="S-CSCFName" code="12"/>
+                        <enum name="InitialFilterCriteria" code="13"/>
+                        <enum name="LocationInformation" code="14"/>
+                        <enum name="UserState" code="15"/>
+                        <enum name="ChargingInformation" code="16"/>
+               </avp>
+               <avp name="Service-Indication" code="704" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Subs-Req-Type" code="705" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+                        <enum name="Subscribe" code="0"/>
+                        <enum name="Unsubscribe" code="1"/>
+               </avp>
+               <avp name="Requested-Domain" code="706" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+                        <enum name="CS-Domain" code="0"/>
+                        <enum name="PS-Domain" code="1"/>
+               </avp>
+               <avp name="Current-Location" code="707" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+                        <enum name="DoNotNeedInitiateActiveLocationRetrieval" code="0"/>
+                        <enum name="InitiateActiveLocationRetrieval" code="1"/>
+               </avp>
+               <avp name="Identity-Set" code="708" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+                        <enum name="ALL_IDENTITIES" code="0"/>
+                        <enum name="REGISTERED_IDENTITIES" code="1"/>
+                        <enum name="IMPLICIT_IDENTITIES" code="2"/>
+               </avp>
+
+               <!-- ************************ END 3GPP Sh AVPS ******************* -->
+
+       </application>
index 8a6ea12f2cc3ce7f95a4c5402e9bb760830e57d6..8fb2b8be641c36bcd93916106d8413c75ab68f34 100644 (file)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id:$ -->
 <!DOCTYPE dictionary SYSTEM "dictionary.dtd" [
        <!ENTITY nasreq SYSTEM "nasreq.xml">
        <!ENTITY mobileipv4 SYSTEM "mobileipv4.xml">
        <!ENTITY sunping SYSTEM "sunping.xml">
        <!ENTITY imscxdx SYSTEM "imscxdx.xml">
+       <!ENTITY 3GPPSh SYSTEM "3GPPSh.xml">
 ]>
 <dictionary>
        <base uri="http://www.ietf.org/rfc/rfc3588.txt">
                <avp name="Accounting-Multi-Session-Id" code="50" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                </avp>
+               <avp name="Accounting-Realtime-Required" code="483 mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="Reserved" code="0">
+                       <enum name="DELIVER_AND_GRANT" code="1"/>
+                       <enum name="GRANT_AND_STORE" code="2">
+                       <enum name="GRANT_AND_LOSE" code="3"
+               </avp>
                <avp name="Accounting-Record-Number" code="485" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                </avp>
                        <enum name="3GPP Zh" code="16777221"/>
                        <enum name="3GPP Gq" code="16777222"/>
                        <enum name="3GPP Gmb" code="16777223"/>
+                       <enum name="3GPP Gx" code="16777224/>
+                       <enum name="3GPP Gx over Gy" code="16777225/>
+                       <enum name="3GPP MM10" code="16777226/>
+                       <enum name="Ericsson MSI" code="16777227/>
+                       <enum name="Ericsson Zx" code="16777228/>
+                       <enum name="3GPP Rx" code="16777229/>
                </avp>
                <avp name="Alternate-Peer" code="275" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
                        <type type-name="DiameterIdentity"/>
                </avp>
                <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="1"/>
+                       <enum name="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"/>
-                       <enum name="Authorize Only" code="0"/>
-                       <enum name="Authorize Authenticate" code="1"/>
+                       <enum name="AUTHORIZE_ONLY" code="0"/>
+                       <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
                </avp>
                <avp name="Destination-Host" code="293" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
                        <type type-name="DiameterIdentity"/>
                </avp>
                <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="1"/>
-                       <enum name="Do not want to talk to you" code="2"/>
+                       <enum name="REBOOTING" code="0"/>
+                       <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">
                        <type type-name="UTF8String"/>
                                <gavp name="Experimental-Result-Code"/>
                        </grouped>
                </avp>
+               <!-- 3GPP TS 29.230 version 6.5.0 Release 6, ETSI TS 129 230 V6.5.0 (2005-09) -->
                <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"/>
+                       <enum name="DIAMETER_FIRST_REGISTRATION" code="2001"/>
+                       <enum name="DIAMETER_SUBSEQUENT_REGISTRATION" code="2002"/>
+                       <enum name="DIAMETER_UNREGISTERED_SERVICE" code="2003"/>
+                       <enum name="DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED" code="2004"/>
+                       <enum name="SDIAMETER_SERVER_SELECTION" code="2005"/>
+                       <enum name="DIAMETER_USER_DATA_NOT_AVAILABLE" code="4100"/>
+                       <enum name="DIAMETER_PRIOR_UPDATE_IN_PROGRESS" code="4101"/>
+                       <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5001"/>
+                       <enum name="DIAMETER_ERROR_IDENTITIES_DONT_MATCH" code="5002"/>
+                       <enum name="DIAMETER_ERROR_IDENTITY_NOT_REGISTERED" code="5003"/>
+                       <enum name="DIAMETER_ERROR_ROAMING_NOT_ALLOWED" code="5004"/>
+                       <enum name="DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED" code="5005"/>
+                       <enum name="DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED" code="5006"/>
+                       <enum name="DIAMETER_ERROR_IN_ASSIGNMENT_TYPE" code="5007"/>
+                       <enum name="DIAMETER_ERROR_TOO_MUCH_DATA" code="5008"/>
+                       <enum name="DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA" code="5009"/>
                        <enum name="DIAMETER_MISSING_USER_ID" code="5010"/>
                        <enum name="DIAMETER_ERROR_FEATURE_UNSUPPORTED" code="5011"/>
+                       <enum name="DIAMETER_ERROR_USER_NO_WLAN_SUBSCRIPTION" code="5041"/>
+                       <enum name="DIAMETER_ERROR_W-APN_UNUSED_BY_USER" code="5042"/>
+                       <enum name="DIAMETER_ERROR_W-DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION" code="5043"/>
+                       <enum name="DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION" code="5044"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_NOT_RECOGNIZED" code="5100"/>
+                       <enum name="DIAMETER_ERROR_OPERATION_NOT_ALLOWED" code="5101"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ" code="5102"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED" code="5103"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_NOTIFIED" code="5104"/>
+                       <enum name="DIAMETER_ERROR_TRANSPARENT_DATA_OUT_OF_SYNC" code="5105"/>
+                       <enum name="DIAMETER_ERROR_START_INDICATION" code="5120"/>
+                       <enum name="DIAMETER_ERROR_STOP_INDICATION" code="5121"/>
+                       <enum name="DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE" code="5122"/>
+                       <enum name="DIAMETER_ERROR_INITIAL_PARAMETERS" code="5140"/>
+                       <enum name="DIAMETER_ERROR_TRIGGER_EVENT" code="5141"/>
                </avp>
                <avp name="Route-Record" code="282" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="DiameterIdentity"/>
                </avp>
                <avp name="Session-Binding" code="270" mandatory="must" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
+                       <enum name="RE_AUTH" code="1"/>
+                       <enum name="STR" code="2"/>
+                       <enum name="Unallocated" code="3"/>
+                       <enum name="ACCOUNTING" code="4"/>
                </avp>
                <avp name="Session-Server-Failover" code="271" mandatory="must" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
-                       <enum name="Refuse Service" code="0"/>
-                       <enum name="Try Again" code="1"/>
-                       <enum name="Allow Service" code="2"/>
-                       <enum name="Try Again / Allow Service" code="3"/>
+                       <enum name="REFUSE_SERVICE" code="0"/>
+                       <enum name="TRY_AGAIN" code="1"/>
+                       <enum name="ALLOW_SERVICE" code="2"/>
+                       <enum name="TRY_AGAIN_ALLOW_SERVICE" code="3"/>
                </avp>
                <avp name="Source-Route" code="286" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="DiameterIdentity"/>
                </avp>
                <avp name="Termination-Cause" code="295" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
-                       <enum name="Logout" code="1"/>
-                       <enum name="Service Not Provided" code="2"/>
-                       <enum name="Bad Answer" code="3"/>
-                       <enum name="Administrative" code="4"/>
-                       <enum name="Link Broken" code="5"/>
+                       <enum name="DIAMETER_LOGOUT" code="1"/>
+                       <enum name="DIAMETER_SERVICE_NOT_PROVIDED" code="2"/>
+                       <enum name="DIAMETER_BAD_ANSWER" code="3"/>
+                       <enum name="DIAMETER_ADMINISTRATIVE" code="4"/>
+                       <enum name="DIAMETER_LINK_BROKEN" code="5"/>
+                       <enum name="DIAMETER_AUTH_EXPIRED" code="6"/>
+                       <enum name="DIAMETER_USER_MOVED" code="7"/>
+                       <enum name="DIAMETER_SESSION_TIMEOUT" code="8"/>
                </avp>
                <avp name="Vendor-Id" code="266" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="VendorId"/>
        &mobileipv4;
        &sunping;
        &imscxdx;
+       &3GPPSh;
 </dictionary>
index d884339331c7a7c7deb45a1e481b73f4c0926c97..28e67ee76bd5a7948b52e6ce2d307be36808e625 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id:$ -->
 
-       <application id="167772151" name="IMS_Cx_Dx" uri="http://www.3GPP.org/ftp/Specs/html-info/29229.htm">
+       <application id="16777215" 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"/>
                        <type type-name="OctetString"/>
                </avp>
                <!-- ************************ END IMS Cx Dx AVPS ******************* -->
+               <!-- ************************** IMS Cx Dx AVPS 3GPP TS 29.229 version 6.3.0 Release 6, ETSI TS 129 229 V6.3.0 (2004-12)********************* -->
+               <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"/>
+                        </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="DiameterIdentity"/>
+               </avp>
+               <avp name="Secondary-Event-Charging-Function-Name" code="620" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Primary-Charging-Collection-Function-Name" code="621" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Secondary-Charging-Collection-Function-Name" code="622" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="DiameterIdentity"/>
+               </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="yes">
+                        <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="yes">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Feature-List" code="630" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <!-- GROUPED -->
+               <avp name="Supported-Applications" code="631" 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"/>
+                        </grouped>
+               </avp>
+
+               <!-- ************************ END IMS Cx Dx AVPS ******************* -->
 
        </application>
index 37566a8c57a88cae362ef75c8417353ae52568b3..5fa8bc6d8e75332e8fec201f35da8c692927a1a1 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id:$ -->
 
        <application id="4" name="Mobile IPv4 Application" uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-mobileip-07.txt">
 
                <avp name="MIP-Filter-Rule" code="347" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
                        <type type-name="IPFilterRule"/>
                </avp>
+               <avp name="MIP-Algorithm-Type" code="345" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+                       <enum name="HMAC-SHA-1" code="2"/>
+               </avp>
                <avp name="MIP-Auth-Input-Data-Length" code="338" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="MIP-Reg-Reply" code="321" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
                        <type type-name="OctetString"/>
                </avp>
+               <avp name="MIP-Replay-Mode" code="346" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+                       <type type-name="Unsigned32"/>
+                       <enum name="None" code="1"/>
+                       <enum name="Timestamps" code="2"/>
+                       <enum name="Nonces" code="3"/>
+               </avp>
                <!-- ************************ END Mobile-IPv4 AVPS ******************* -->
 
        </application>
index 30f36a954cbbace5a1019e489ee7f335da1458f4..715af4848596f662db6c1ef0aa556f9c290a2557 100644 (file)
                <avp name="Tunnel-Assignment-Id" code="82">
                        <type type-name="OctetString"/>
                </avp>
-
+               <avp name="Accounting-Auth-Method" code="406">
+                       <type type-name="Unsigned32"/>
+                       <enum name="PAP" code="1"/>
+                       <enum name="CHAP" code="2"/>
+                       <enum name="MS-CHAP-1" code="3"/>
+                       <enum name="MS-CHAP-2" code="4"/>
+                       <enum name="EAP" code="5"/>
+                       <enum name="None" code="7"/>
+               </avp>
+               <avp name="Origin-AAA-Protocol" code="408
+                       <type type-name="Unsigned32"/>
+                       <enum name="RADIUS" code="1"/>
+               </avp>
        </application>