diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-09 17:23:57 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-09 17:23:57 +0000 |
| commit | 7fd8943076ddff52eebcf8df133ea8996fd1b98c (patch) | |
| tree | 4c2ec79892bb3e2eb96dcc1aa3b8c960d23a6c5f /diameter | |
| parent | 9bfb6dd7ec7d742b535fa784eed725585be9509f (diff) | |
Define unused AVP:s to make it possible to use value_string_ext for
common AVP:s.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34824 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'diameter')
| -rw-r--r-- | diameter/TGPPGmb.xml | 105 | ||||
| -rw-r--r-- | diameter/TGPPSh.xml | 68 | ||||
| -rw-r--r-- | diameter/dictionary.xml | 819 | ||||
| -rw-r--r-- | diameter/etsie2e4.xml | 543 | ||||
| -rw-r--r-- | diameter/mobileipv4.xml | 30 |
5 files changed, 1442 insertions, 123 deletions
diff --git a/diameter/TGPPGmb.xml b/diameter/TGPPGmb.xml index 1aa089af21..adffed65ff 100644 --- a/diameter/TGPPGmb.xml +++ b/diameter/TGPPGmb.xml @@ -7,6 +7,7 @@ These AVP:s collide(share AVP code number) with other 3GPP AVP:s (3GPP Cx imscxdx.xml) comment out these if you want to use them. --> + <!-- <avp name="3GPP-IMSI" code="1" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> <type type-name="UTF8String"/> </avp> @@ -88,8 +89,108 @@ <avp name="3GPP-Allocate-IP-Type" code="27" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> <type type-name="OctetString"/> </avp> - - <avp name="TMGI" code="900" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + --> + <!-- Note: The AVP codes from 1 to 255 are reserved for backwards compatibility with 3GPP RADIUS Vendor Specific + Attributes (See TS 29.061 [13]) --> + <!-- + <avp name="Reserved" code="28" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="29" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="30" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="31" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="32" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="33" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="34" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="35" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="36" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="37" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="38" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="39" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="40" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="41" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="42" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="43" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="44" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="45" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="46" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="47" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="48" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="49" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="50" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="51" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="52" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="53" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="54" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="55" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="56" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="57" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="58" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="59" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> +--> + <avp name="TMGI" code="900" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> <type type-name="OctetString"/> </avp> <avp name="Required-MBMS-Bearer-Capabilities" code="901" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> diff --git a/diameter/TGPPSh.xml b/diameter/TGPPSh.xml index f859874f3a..91aea0148f 100644 --- a/diameter/TGPPSh.xml +++ b/diameter/TGPPSh.xml @@ -13,10 +13,10 @@ <!-- ************************** 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> + <grouped> + <gavp name="Public-Identity"/> + <gavp name="MSISDN"/> + </grouped> </avp> <avp name="MSISDN" code="701" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="OctetString"/> @@ -26,42 +26,48 @@ </avp> <avp name="Data-Reference" code="703" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <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"/> - <enum name="MSISDN" code="17"/> - <enum name="PSIActivation" code="18"/> - </avp> + <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"/> + <enum name="MSISDN" code="17"/> + <enum name="PSIActivation" code="18"/> + <enum name="DSAI" code="19"/> + <enum name="ServiceLevelTraceInfo" code="21"/> + <enum name="IPAddressSecureBindingInformation" code="22"/> + <enum name="ServicePriorityLevel" code="23"/> + <enum name="SMSRegistrationInfo" code="24"/> + <enum name="UEReachabilityForIP" code="25"/> + <enum name="TADSinformation" code="26"/> + </avp> <avp name="Service-Indication" code="704" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="no"> <type type-name="OctetString"/> </avp> <avp name="Subs-Req-Type" code="705" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="Unsigned32"/> - <enum name="Subscribe" code="0"/> - <enum name="Unsubscribe" code="1"/> + <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="no"> <type type-name="Unsigned32"/> - <enum name="CS-Domain" code="0"/> - <enum name="PS-Domain" code="1"/> + <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="no"> <type type-name="Unsigned32"/> - <enum name="DoNotNeedInitiateActiveLocationRetrieval" code="0"/> - <enum name="InitiateActiveLocationRetrieval" code="1"/> + <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="no"> <type type-name="Unsigned32"/> - <enum name="ALL_IDENTITIES" code="0"/> - <enum name="REGISTERED_IDENTITIES" code="1"/> - <enum name="IMPLICIT_IDENTITIES" code="2"/> + <enum name="ALL_IDENTITIES" code="0"/> + <enum name="REGISTERED_IDENTITIES" code="1"/> + <enum name="IMPLICIT_IDENTITIES" code="2"/> </avp> - <avp name="Expiry-Time" code="709" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="Time"/> </avp> @@ -71,9 +77,15 @@ <avp name="DSAI-Tag" code="711" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> <type type-name="OctetString"/> </avp> -<!-- -712 One-Time-Notification Enumerated ---> + <avp name="One-Time-Notification" code="713" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="ONE_TIME_NOTIFICATION_REQUESTED" code="0"/> + </avp> + <avp name="Requested-Nodes" code="714" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <type type-name="Unsigned32"/> + </avp> + + <!-- Note: The AVP codes from 714 to799 are reserved for TS 29.329. --> <!-- ************************ END 3GPP Sh AVPS ******************* --> </application> diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index 1621e2d57f..e20218030d 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -96,7 +96,7 @@ 307 Profile-Update-Request/-Answer PUR/PUA 308 Subscribe-Notifications-Request/-Answer SNR/SNA 309 Push-Notification-Request/-Answer PNR/PNA - --> + --> <command name="Boostrapping-Info" code="310" vendor-id="None"/> <!-- BIR/BIA 29.109 [7] --> <command name="Message-Process" code="311" vendor-id="None"/> <!-- MPR/MPA 29.140 [16] --> @@ -675,10 +675,14 @@ <enum name="X25-T3POS" code="6"/> <enum name="TCP Clear Quiet (suppresses any NAS-generated connect string)" code="8"/> </avp> - <avp name="Login-TCP-Port" code="16" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot"> + <avp name="Login-TCP-Port" code="16" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot"> <type type-name="Unsigned32"/> </avp> - <avp name="Reply-Message" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> + <!-- 17 Unassigned --> + <avp name="Unassigned" code="17" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reply-Message" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> <type type-name="UTF8String"/> </avp> <avp name="Callback-Number" code="19" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> @@ -687,7 +691,11 @@ <avp name="Callback-Id" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> <type type-name="UTF8String"/> </avp> - <avp name="Framed-Route" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> + <!-- 21 Unassigned --> + <avp name="Unassigned" code="21" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Framed-Route" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> <type type-name="UTF8String"/> </avp> <avp name="Framed-IPX-Network" code="23" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot"> @@ -1150,6 +1158,9 @@ <avp name="Location-Capable" code="131" mandatory="may"> <type type-name="OctetString"/> </avp> + <avp name="Requested-Location-Info" code="132" mandatory="may"> + <type type-name="OctetString"/> + </avp> <avp name="Framed-Management-Protocol" code="133" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> <type type-name="Enumerated"/> <enum name="SNMP" code="1"/> @@ -1194,18 +1205,352 @@ <avp name="PKM-Auth-Key" code="143" mandatory="may"> <type type-name="OctetString"/> </avp> - <!-- + <!-- 144-191 Unassigned --> <avp name="Unassigned" code="144" mandatory="may"> <type type-name="OctetString"/> </avp> - -144-191 Unassigned -192-223 Experimental Use [RFC3575] -224-240 Implementation Specific [RFC3575] -241-255 Reserved [RFC3575] - --> - <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ --> - <avp name="Host-IP-Address" code="257" mandatory="must" protected="may" may-encrypt="no" vendor-bit="mustnot"> + <avp name="Unassigned" code="145" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="146" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="147" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="148" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="149" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="150" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="151" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="152" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="153" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="154" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="155" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="156" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="157" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="158" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="159" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="160" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="161" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="162" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="163" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="164" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="165" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="166" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="167" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="168" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="169" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="170" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="171" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="172" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="173" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="174" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="175" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="176" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="177" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="178" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="179" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="180" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="181" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="182" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="183" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="184" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="185" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="186" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="187" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="188" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="189" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="190" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="191" mandatory="may"> + <type type-name="OctetString"/> + </avp> + + <!-- 192-223 Experimental Use [RFC3575] --> + <avp name="Experimental-Use" code="192" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="193" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="194" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="195" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="196" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="197" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="198" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="199" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="200" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="201" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="202" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="203" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="204" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="205" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="206" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="207" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="208" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="209" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="210" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="211" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="212" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="213" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="214" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="215" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="216" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="217" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="218" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="219" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="220" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="221" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="222" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Experimental-Use" code="223" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <!-- 224-240 Implementation Specific [RFC3575] --> + <avp name="Implementation-Specific" code="224" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="225" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="226" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="227" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="228" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="229" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="230" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="231" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="232" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="233" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="234" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="235" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="236" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="237" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="238" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="239" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Implementation-Specific" code="240" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <!--241-255 Reserved [RFC3575] --> + <avp name="Reserved" code="241" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="242" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="243" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="244" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="245" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="246" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="247" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="248" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="249" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="250" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="251" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="252" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="253" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="254" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="255" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ --> + <avp name="Unassigned" code="256" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Host-IP-Address" code="257" mandatory="must" protected="may" may-encrypt="no" vendor-bit="mustnot"> <type type-name="IPAddress"/> </avp> <avp name="Auth-Application-Id" code="258" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> @@ -1532,11 +1877,23 @@ <enum name="AUTHORIZE_AUTHENTICATE" code="1"/> </avp> <!-- 286 Unassigned --> - <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot"> + <avp name="Unassigned" code="286" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot"> <type type-name="Unsigned64"/> </avp> <!-- 288-290 Unallocated http://www.iana.org/assignments/aaa-parameters --> - <avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot"> + <avp name="Unallocated" code="288" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="289" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="290" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot"> <type type-name="Integer32"/> </avp> <avp name="Redirect-Host" code="292" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> @@ -1657,7 +2014,58 @@ </grouped> </avp> <!-- 301-317 Unallocated --> -<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml + <avp name="Unallocated" code="301" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="302" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="303" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="304" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="305" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="306" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="307" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="308" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="309" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="310" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="311" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="312" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="313" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="314" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="315" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="316" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unallocated" code="317" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml 318 MIP-FA-to-HA-SPI [RFC4004] 319 MIP-FA-to-MN-SPI [RFC4004] 320 MIP-Reg-Request [RFC4004] @@ -1690,7 +2098,50 @@ 348 MIP-Home-Agent-Host [RFC4004] --> <!-- AVP:s 349-362 Unassigned --> -<!-- AVP:s 368 - 393 is in sip.xml + <avp name="Unassigned" code="349" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="350" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="351" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="352" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="353" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="354" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="355" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="356" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="357" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="358" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="359" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="360" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="361" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="362" mandatory="may"> + <type type-name="OctetString"/> + </avp> + + <!-- AVP:s 368 - 393 is in sip.xml 363 Accounting-Input-Octets [RFC4005][RFC4004] 364 Accounting-Output-Octets [RFC4005][RFC4004] 365 Accounting-Input-Packets [RFC4005][RFC4004] @@ -1723,8 +2174,27 @@ 392 SIP-User-Data-Already-Available [RFC4740] 393 SIP-Method [RFC4740] --> -<!-- 394-399 Unassigned --> -<!-- 400 408 is defined in nasreq.xml +<!-- 394-399 Unassigned --> + <avp name="Unassigned" code="394" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="395" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="396" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="397" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="398" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="399" mandatory="may"> + <type type-name="OctetString"/> + </avp> + + <!-- 400 408 is defined in nasreq.xml 400 NAS-Filter-Rule [RFC4005] 401 Tunneling [RFC4005] 402 CHAP-Auth [RFC4005] @@ -1736,8 +2206,14 @@ 408 Origin-AAA-Protocol [RFC4005] --> <!-- 409-410 Unassigned --> ---> -<!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml + <avp name="Unassigned" code="409" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="410" mandatory="may"> + <type type-name="OctetString"/> + </avp> + + <!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml 411 CC-Correlation-Id [RFC4006] 412 CC-Input-Octets [RFC4006] 413 CC-Money [RFC4006] @@ -1798,7 +2274,49 @@ 465 Accounting-EAP-Auth-Method [RFC4072] --> <!-- 466-479 Unallocated --> - <avp name="Accounting-Record-Type" code="480" mandatory="must" may-encrypt="yes" vendor-bit="mustnot"> + <avp name="Unassigned" code="466" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="467" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="468" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="469" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="470" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="471" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="472" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="473" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="474" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="475" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="476" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="477" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="478" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="479" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Accounting-Record-Type" code="480" mandatory="must" may-encrypt="yes" vendor-bit="mustnot"> <type type-name="Enumerated"/> <enum name="Event Record" code="1"/> <enum name="Start Record" code="2"/> @@ -1806,7 +2324,13 @@ <enum name="Stop Record" code="4"/> </avp> <!-- 481-482 Unallocated http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml --> - <avp name="Accounting-Realtime-Required" code="483" mandatory="must" may-encrypt="yes" vendor-bit="mustnot"> + <avp name="Unassigned" code="481" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Unassigned" code="482" mandatory="may"> + <type type-name="OctetString"/> + </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"/> @@ -1814,23 +2338,54 @@ <enum name="GRANT_AND_LOSE" code="3"/> </avp> <!-- 484 unallocated --> - <avp name="Accounting-Record-Number" code="485" mandatory="must" may-encrypt="yes" vendor-bit="mustnot"> + <avp name="Unassigned" code="484" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="Accounting-Record-Number" code="485" mandatory="must" may-encrypt="yes" vendor-bit="mustnot"> <type type-name="Unsigned32"/> </avp> <!-- 486 - 494 in mobileipv6.xml --> -<!-- -495 TMOD-1 [RFC5624] -496 Token-Rate [RFC5624] -497 Bucket-Depth [RFC5624] -498 Peak-Traffic-Rate [RFC5624] -499 Minimum-Policed-Unit [RFC5624] -500 Maximum-Packet-Size [RFC5624] -501 TMOD-2 [RFC5624] -502 Bandwidth [RFC5624] -503 PHB-Class [RFC5624] ---> + <avp name="TMOD-1" code="495" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> + <grouped> + <gavp name="Token-Rate"/> + <gavp name="Bucket-Depth"/> + <gavp name="Peak-Traffic-Rate"/> + <gavp name="Minimum-Policed-Unit"/> + <gavp name="Maximum-Packet-Size"/> + </grouped> + </avp> + <avp name="Token-Rate" code="496" mandatory="may"> + <type type-name="Float32"/> + </avp> + <avp name="Bucket-Depth" code="497" mandatory="may"> + <type type-name="Float32"/> + </avp> + <avp name="Peak-Traffic-Rate" code="498" mandatory="may"> + <type type-name="Float32"/> + </avp> + <avp name="Minimum-Policed-Unit" code="499" mandatory="may"> + <type type-name="Unsigned32"/> + </avp> + <avp name="Maximum-Packet-Size" code="500" mandatory="may"> + <type type-name="Unsigned32"/> + </avp> + <avp name="TMOD-2" code="501" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> + <grouped> + <gavp name="Token-Rate"/> + <gavp name="Bucket-Depth"/> + <gavp name="Peak-Traffic-Rate"/> + <gavp name="Minimum-Policed-Unit"/> + <gavp name="Maximum-Packet-Size"/> + </grouped> + </avp> + <avp name="Bandwidth" code="502" mandatory="may"> + <type type-name="Float32"/> + </avp> + <avp name="PHB-Class" code="503" mandatory="may"> + <type type-name="Unsigned32"/> + </avp> <!-- 504 - 507 in mobileipv6.xml --> @@ -1909,13 +2464,6 @@ 579 QoS-Authorization-Data [RFC-ietf-dime-diameter-qos-15] 580 Bound-Auth-Session-Id [RFC-ietf-dime-diameter-qos-15] 581-0xffffff Unassigned ---> - <avp name="Example-AVP" code="999999" mandatory="mustnot" vendor-bit="may"> - <grouped> - <gavp name="Origin-Host"/> - <gavp name="Host-IP-Address"/> - </grouped> - </avp> <!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* --> <!-- 3GPP TS 29.230 version 8.7.0 Release 8 Table 7.1: 3GPP specific AVP codes @@ -1985,18 +2533,100 @@ Note: The AVP codes from 320 to 399 are reserved for TS 29.234 <avp name="UE-Id" code="411" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> <type type-name="OctetString"/> </avp> - <!-- -412 UE-Id-Type Enumerated -413 UICC-App-Label OctectString -414 UICC-ME Enumerated -415 Requested-Key-Lifetime Time -416 Private-Identity-Request Enumerated -417 GBA-Push-Info OctectString -418 NAF-SA-Identifier OctectString -419 Security-Feature-Request OctetString -420 Security-Feature-Response OctetString + <avp name="UE-Id-Type" code="412" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="Private user identity" code="0"/> + <enum name="Public user identity" code="1"/> + </avp> + <avp name="UICC-App-Label" code="413" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="UICC-ME" code="414" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="GBA_ME" code="0"/> + <enum name="GBA_U" code="1"/> + </avp> + <avp name="Requested-Key-Lifetime" code="415" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Time"/> + </avp> + <avp name="Private-Identity-Request" code="416" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="Private identity requested" code="0"/> + <enum name="Private identity not requested" code="1"/> + </avp> + <avp name="GBA-Push-Info" code="417" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="NAF-SA-Identifier" code="418" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Security-Feature-Request" code="419" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Security-Feature-Response" code="420" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <!-- Note: The AVP codes from 421 to 499 are reserved for TS 29.109 + + <avp name="Reserved for TS 29.109" code="421" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="422" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="423" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="424" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="425" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="426" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="427" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="428" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="429" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="430" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="431" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="432" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="433" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="434" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="435" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="436" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="437" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="438" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> + <avp name="Reserved for TS 29.109" code="439" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <type type-name="OctectString"/> + </avp> 29.109 [7] -Note: TThe AVP codes from 419 to 499 are reserved for TS 29.109 +Note: The AVP codes from 421 to 499 are reserved for TS 29.109 --> <!-- Ref 3GPP TS 29.209 version 6.7.0 Release 6 NOTE AVP 500 - 523 is in gqpolicy.xml @@ -2008,8 +2638,8 @@ Note: The AVP codes from 651 to 699 are reserved for TS 29.229. ************************** 3GPP Sh AVPS ************************** ************************** NOTE see TGPPSh.xml ************************** ************************** 3GPP TS 29.329 ************************** - ************************** 700 - 712 ************************** -Note: The AVP codes from 712 to799 are reserved for TS 29.329. + ************************** 700 - 713 ************************** +Note: The AVP codes from 714 to799 are reserved for TS 29.329. Note: The AVP codes from 800 to 822 are reserved for TS 32.299. --> <!-- 3GPP Diameter charging applications (3GPP TS 32.299 version 7.0.0 Release 7)--> @@ -2557,8 +3187,12 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299. 916 MBMS-GGSN-Address UTF8String 917 MBMS-GGSN-IPv6-Address UTF8String 918 MBMS-BMSC-SSM-IP-Address UTF8String -919 MBMS-BMSC-SSM-IPv6-Address UTF8Strin -Note: The AVP codes from 920 to 999 are reserved for TS 29.061 +919 MBMS-BMSC-SSM-IPv6-Address UTF8String +920 MBMS-Flow-Identifier OctetString +921 CN-IP-Multicast-Distribution Enumerated +922 MBMS-HC-Indicator Enumerated +923 MBMS-Access-Indicator Enumerated +Note: The AVP codes from 924 to 999 are reserved for TS 29.061 29.210 ******** Found in TGPPGmb.xml ******** --> @@ -3004,7 +3638,22 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061 <enum name="CHANGE_CSG_SUBSCRIBED_HYBRID_CELL" code="1"/> <enum name="CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL" code="2"/> </avp> -<!-- Note: The AVP codes from 1072 to 1099 are reserved for TS 29.212 --> + <avp name="Packet-Filter-Usage" code="1072" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="SEND_TO_UE" code="0"/> + </avp> + <avp name="Flow-Direction" code="1073" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="UNSPECIFIED" code="0"/> + <enum name="DOWNLINK" code="1"/> + <enum name="UPLINK" code="2"/> + <enum name="BIDIRECTIONAL" code="3"/> + </avp> + <avp name="QoS-Rule-Base-Name" code="1074" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> + <type type-name="UTF8String"/> + </avp> + + <!-- Note: The AVP codes from 1072 to 1099 are reserved for TS 29.212 --> <!-- ETSI TS 129 140 V6.3.0 (2005-12) --> <avp name="Served-User-Identity" code="1100" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP"> <grouped> @@ -4195,7 +4844,25 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273 <avp name="Routing-Area-Identity" code="1605" vendor-bit="must" vendor-id="TGPP"> <type type-name="OctetString"/> </avp> + <avp name="Location-Area-Identity" code="1606" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Service-Area-Identity" code="1607" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Geographical-Information" code="1608" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Geodetic-Information" code="1609" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <!-- +1610 Current-Location-Retrieved Enumerated +1611 Age-Of-Location-Information Unsigned32 +1612 Active-APN Grouped +Note: The AVP codes from 1621 to 1699 are reserved for TS 29.272. +--> <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP"> <grouped> <gavp name="SMS-Node"/> @@ -4580,10 +5247,10 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273 <!-- Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299 --> -<!-- -2100 reserved - 32.299 [5] ---> - <avp name="Application-Server-ID" code="2101" vendor-bit="must" vendor-id="TGPP"> + <avp name="Reserved" code="2100" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Application-Server-ID" code="2101" vendor-bit="must" vendor-id="TGPP"> <type type-name="Unsigned32"/> </avp> <avp name="Application-Service-Type" code="2102" vendor-bit="must" vendor-id="TGPP"> @@ -4601,13 +5268,21 @@ Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299 <avp name="Delivery-Status" code="2104" vendor-bit="must" vendor-id="TGPP"> <type type-name="UTF8String"/> </avp> -<!-- -2105 reserved - -2106 reserved - -2107 reserved - -2108 reserved - -2109 reserved - ---> + <avp name="Reserved" code="2105" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="2106" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="2107" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="2108" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="Reserved" code="2109" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> <avp name="IM-Information" code="2110" vendor-bit="must" vendor-id="TGPP"> <grouped> <gavp name="Interface-Id"/> @@ -4638,10 +5313,14 @@ Note: The AVP codes from 2118 to 2199 are reserved for TS 32.299 2201 Subsession-Enforcement-Info Grouped 2202 Subsession-Id Unsigned32 2203 Subsession-Operation Enumerated +2204 Multiple-BBERF-Action Enumerated 29.215 [22] Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215 --> - <avp name="SIP-Request-Timestamp-Fraction" code="2301" vendor-bit="must" vendor-id="TGPP"> + <avp name="Reserved" code="2300" vendor-bit="must" vendor-id="TGPP"> + <type type-name="OctetString"/> + </avp> + <avp name="SIP-Request-Timestamp-Fraction" code="2301" vendor-bit="must" vendor-id="TGPP"> <type type-name="Unsigned32"/> </avp> <avp name="SIP-Response-Timestamp-Fraction" code="2302" vendor-bit="must" vendor-id="TGPP"> diff --git a/diameter/etsie2e4.xml b/diameter/etsie2e4.xml index ea4737fed4..66b1b81304 100644 --- a/diameter/etsie2e4.xml +++ b/diameter/etsie2e4.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- $Id$ --> -<!-- ETSI ES 283 034 V1.2.0 (2007-05) --> -<!-- ETSI ES 283 035 V1.2.1 (2007-06) --> +<!-- ETSI ES 283 034 V2.2.0 --> +<!-- ETSI ES 283 035 V2.5.1 (2008-08) --> <application id="16777231" name="Diameter e2e4 Application" uri="http://pda.etsi.org"> @@ -21,10 +21,12 @@ <enum name="PRIORITY_NOT_GRANTED" code="4047"/> <enum name="MODIFICATION_FAILURE" code="5041"/> </avp> +<!-- dummy AVP to fill out the range --> + <avp name="Not defined in .xml" code="299" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> - <!-- User-Data (306) already defined by Sh --> - - <!-- ************************* e4 AVPs ************************ --> + <!-- ************************* e4 AVPs ************************ --> <avp name="Globally-Unique-Address" code="300" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <grouped> @@ -79,11 +81,10 @@ <avp name="Maximum-Allowed-Bandwidth-DL" code="309" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> - <!-- Removed from ETSI ES 283 034 V1.2.0 (2007-05) - <avp name="Maximum-Priority" code="310" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <!-- Removed from ETSI ES 283 034 V1.2.0 (2007-05) --> + <avp name="Maximum-Priority(deprecated)" code="310" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> - --> <avp name="Transport-Class" code="311" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> @@ -93,9 +94,121 @@ <avp name="Physical-Access-ID" code="313" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="UTF8String"/> </avp> + <avp name="Initial-Gate-Setting-ID" code="314" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="Unsigned32"/> + </avp> + <avp name="QoS-Profile-ID" code="315" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="Unsigned32"/> + </avp> + <!-- dummy AVP:s to fill out the range --> + <avp name="Not defined in .xml" code="315" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="316" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="317" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="318" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="319" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="320" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="321" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="322" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="323" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="324" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="325" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="326" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="327" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="328" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="329" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="330" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="331" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="332" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="333" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="334" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="335" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="336" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="337" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="338" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="339" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="340" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="341" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="342" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="343" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="344" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="345" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="346" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="347" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="348" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="349" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> - <!-- ************************* e2 AVPs ************************ --> + <!-- ************************* e2 AVPs ************************ --> <avp name="Location-Information" code="350" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <grouped> @@ -144,11 +257,296 @@ <avp name="Geospatial-Location" code="356" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="OctetString"/> </avp> + <!-- dummy AVP:s to fill out the range --> + <avp name="Not defined in .xml" code="357" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="358" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="359" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="360" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="361" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="362" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="363" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="364" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="365" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="366" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="367" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="368" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="369" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="370" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="371" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="372" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="373" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="374" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="375" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="376" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="377" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="378" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="379" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="380" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="381" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="382" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="383" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="384" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="385" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="386" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="387" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="388" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="389" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="390" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="391" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="392" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="393" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="394" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="395" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="396" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="397" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="398" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="399" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <!--- ETSI ES 283 026 V1.6.0 (2008-02) --> <avp name="Session-Bundle-Id" code="400" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> - <!-- ETSI TS 183 017 V1.4.0 (2007-08) --> + <!-- dummy AVP:s to fill out the range --> + <avp name="Not defined in .xml" code="401" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="402" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="403" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="404" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="405" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="406" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="407" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="408" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="409" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="410" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="411" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="412" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="413" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="414" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="415" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="416" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="417" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="418" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="419" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <!--- ETSI TS 183 066 V2.1.1 (2009-01) --> + <avp name="Event-Type" code="420" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="Enumerated"/> + <enum name="UPDATE" code="0"/> + <enum name="REMOVE" code="1"/> + </avp> + + <!-- dummy AVP:s to fill out the range --> + <avp name="Not defined in .xml" code="421" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="422" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="423" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="424" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="425" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="426" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="427" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="428" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="429" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="430" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="431" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="432" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="433" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="434" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="435" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="436" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="437" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="438" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="439" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="440" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="441" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="442" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="443" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="444" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="445" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="446" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="447" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="448" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="449" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + + <!-- ETSI TS 183 017 V1.4.0 (2007-08) --> <avp name="Binding-information" code="450" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <grouped> <gavp name="Binding-Input-List"/> @@ -204,7 +602,130 @@ <avp name="Service-Class" code="459" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="UTF8String"/> </avp> - <!--- ETSI TS 183 033 V1.2.0 (2007-10) --> + + <!-- dummy AVP:s to fill out the range --> + <avp name="Not defined in .xml" code="460" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="461" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="462" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="463" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="464" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="465" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="466" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="467" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="468" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="469" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="470" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="471" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="472" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="473" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="474" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="475" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="476" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="477" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="478" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="479" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="480" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="481" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="482" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="483" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="484" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="485" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="486" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="487" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="488" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="489" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="490" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="491" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="492" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="493" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="494" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="495" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="496" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="497" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="498" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + <avp name="Not defined in .xml" code="499" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <type type-name="OctetString"/> + </avp> + + <!--- ETSI TS 183 033 V1.2.0 (2007-10) --> <!-- The Line-Identifier AVP has a Vendor-Id header set to ETSI (13019). 6.3.34 Line-Identifier AVP The Line-Identifier AVP is of type OctetString. This AVP contains a fixed broadband access line identifier diff --git a/diameter/mobileipv4.xml b/diameter/mobileipv4.xml index 7730f8b6d2..4e0bdb78f3 100644 --- a/diameter/mobileipv4.xml +++ b/diameter/mobileipv4.xml @@ -34,10 +34,11 @@ http://www.iana.org/assignments/aaa-parameters <avp name="MIP-HA-to-FA-SPI" code="323" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes"> <type type-name="Unsigned32"/> </avp> -<!-- -324 Unassigned ---> - <avp name="MIP-MN-to-FA-MSA" code="325" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes"> +<!-- 324 Unassigned --> + <avp name="Unassigned" code="324" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="MIP-MN-to-FA-MSA" code="325" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes"> <grouped> <gavp name="MIP-MN-AAA-SPI"/> <gavp name="MIP-Algorithm-Type"/> @@ -53,10 +54,11 @@ http://www.iana.org/assignments/aaa-parameters <gavp name="AVP"/> </grouped> </avp> -<!-- -327 Unassigned ---> - <avp name="MIP-FA-to-HA-MSA" code="328" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes"> +<!-- 327 Unassigned --> + <avp name="Unassigned" code="327" mandatory="may"> + <type type-name="OctetString"/> + </avp> + <avp name="MIP-FA-to-HA-MSA" code="328" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes"> <grouped> <gavp name="MIP-FA-to-HA-SPI"/> <gavp name="MIP-Algorithm-Type"/> @@ -72,10 +74,12 @@ http://www.iana.org/assignments/aaa-parameters <gavp name="AVP"/> </grouped> </avp> -<!-- -330 Unassigned ---> - <avp name="MIP-MN-to-HA-MSA" code="331" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes"> +<!-- 330 Unassigned --> + <avp name="Unassigned" code="330" mandatory="may"> + <type type-name="OctetString"/> + </avp> + + <avp name="MIP-MN-to-HA-MSA" code="331" mandatory="must" protected="may" vendor-bit="mustnot" may-encrypt="yes"> <grouped> <gavp name="MIP-MN-HA-SPI"/> <gavp name="MIP-Algorithm-Type"/> @@ -162,10 +166,12 @@ http://www.iana.org/assignments/aaa-parameters </avp> <!-- 349-362 Unassigned +in dictionary.xml 363 Accounting-Input-Octets [RFC4005][RFC4004] 364 Accounting-Output-Octets [RFC4005][RFC4004] 365 Accounting-Input-Packets [RFC4005][RFC4004] 366 Accounting-Output-Packets [RFC4005][RFC4004] +in SIP.xml --> <avp name="MIP-MSA-Lifetime" code="367" mandatory="must" vendor-bit="mustnot" may-encrypt="yes"> <type type-name="Unsigned32"/> |