diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-07-08 14:27:21 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-07-08 14:27:21 +0000 |
commit | 3815134a61e6898a37ac364694d519fa440a7f3a (patch) | |
tree | 1df64aa5676f9acf1dc3f20f4dce6ff691f4862f /diameter | |
parent | a909a692de0984f452fa7f4b0acf2d98e36a0318 (diff) |
From Magnus Sörman:
Correct AVP properties.
svn path=/trunk/; revision=29022
Diffstat (limited to 'diameter')
-rw-r--r-- | diameter/dictionary.xml | 32 | ||||
-rw-r--r-- | diameter/etsie2e4.xml | 7 | ||||
-rw-r--r-- | diameter/gqpolicy.xml | 6 |
3 files changed, 24 insertions, 21 deletions
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index a80bd99522..dda618d8ed 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -551,7 +551,7 @@ <enum name="X25" code="259"/> <enum name="Xylogics" code="5"/> </avp> - <avp name="Framed-IP-Address" code="8" mandatory="may"> + <avp name="Framed-IP-Address" code="8" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot""> <type type-name="IPAddress"/> </avp> <avp name="Framed-IP-Netmask" code="9" mandatory="may"> @@ -867,7 +867,7 @@ <avp name="Framed-Interface-Id" code="96" mandatory="may"> <type type-name="Unsigned64"/> </avp> - <avp name="Framed-IPv6-Prefix" code="97" mandatory="may"> + <avp name="Framed-IPv6-Prefix" code="97" mandatory="must" may-encrypt="yes" protected="may"> <type type-name="OctetString"/> </avp> <!-- @@ -969,7 +969,7 @@ http://www.iana.org/assignments/radius-types --> <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ --> - <avp name="Host-IP-Address" code="257" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> + <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"> @@ -1076,8 +1076,8 @@ http://www.iana.org/assignments/radius-types <gavp name="Acct-Application-Id"/> </grouped> </avp> - <avp name="Redirect-Host-Usage" code="261" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> - <type type-name="Unsigned32"/> + <avp name="Redirect-Host-Usage" code="261" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> + <type type-name="Enumerated"/> <enum name="Don't Care" code="0"/> <enum name="All Session" code="1"/> <enum name="All Realm" code="2"/> @@ -1092,16 +1092,16 @@ http://www.iana.org/assignments/radius-types <avp name="Session-Id" code="263" mandatory="must" protected="mustnot" vendor-bit="mustnot"> <type type-name="UTF8String"/> </avp> - <avp name="Origin-Host" code="264" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> + <avp name="Origin-Host" code="264" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> <type type-name="DiameterIdentity"/> </avp> - <avp name="Supported-Vendor-Id" code="265" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> + <avp name="Supported-Vendor-Id" code="265" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> <type type-name="VendorId"/> </avp> - <avp name="Vendor-Id" code="266" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> + <avp name="Vendor-Id" code="266" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> <type type-name="VendorId"/> </avp> - <avp name="Firmware-Revision" code="267" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> + <avp name="Firmware-Revision" code="267" mandatory="mustnot" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> <type type-name="Unsigned32"/> </avp> <avp name="Result-Code" code="268" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> @@ -1193,7 +1193,7 @@ http://www.iana.org/assignments/radius-types <type type-name="Unsigned32"/> </avp> <avp name="Disconnect-Cause" code="273" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> - <type type-name="Unsigned32"/> + <type type-name="Enumerated"/> <enum name="REBOOTING" code="0"/> <enum name="BUSY" code="1"/> <enum name="DO_NOT_WANT_TO_TALK_TO_YOU" code="2"/> @@ -1227,7 +1227,7 @@ http://www.iana.org/assignments/radius-types <avp name="Proxy-Host" code="280" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> <type type-name="DiameterIdentity"/> </avp> - <avp name="Error-Message" code="281" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> + <avp name="Error-Message" code="281" mandatory="mustnot" protected="may" may-encrypt="no" vendor-bit="mustnot"> <type type-name="UTF8String"/> </avp> <avp name="Route-Record" code="282" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot"> @@ -1254,17 +1254,17 @@ http://www.iana.org/assignments/radius-types <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="mustnot" vendor-bit="mustnot"> - <type type-name="DiameterIdentity"/> + <avp name="Redirect-Host" code="292" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> + <type type-name="DiameterURI"/> </avp> <avp name="Destination-Host" code="293" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> <type type-name="DiameterIdentity"/> </avp> - <avp name="Error-Reporting-Host" code="294" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot"> + <avp name="Error-Reporting-Host" code="294" mandatory="mustnot" protected="may" may-encrypt="no" 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"/> + <avp name="Termination-Cause" code="295" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot"> + <type type-name="Enumerated"/> <enum name="DIAMETER_LOGOUT" code="1"/> <enum name="DIAMETER_SERVICE_NOT_PROVIDED" code="2"/> <enum name="DIAMETER_BAD_ANSWER" code="3"/> diff --git a/diameter/etsie2e4.xml b/diameter/etsie2e4.xml index 5084c0116e..534158535f 100644 --- a/diameter/etsie2e4.xml +++ b/diameter/etsie2e4.xml @@ -170,10 +170,11 @@ <enum name="LATCH" code="0"/> <enum name="RELATCH" code="1"/> </avp> - <avp name="Reservation-priority" code="458" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> + <avp name="Reservation-Priority" code="458" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes"> <type type-name="Enumerated"/> - <enum name="PRIORITY-ONE" code="1"/> - <enum name="PRIORITY-TWO" code="2"/> + <enum name="DEFAULT" code="0"/> + <enum name="PRIORITY-ONE" code="1"/> + <enum name="PRIORITY-TWO" code="2"/> <enum name="PRIORITY-THREE" code="3"/> <enum name="PRIORITY-FOUR" code="4"/> <enum name="PRIORITY-FIVE" code="5"/> diff --git a/diameter/gqpolicy.xml b/diameter/gqpolicy.xml index 980305ea8c..424b585dc1 100644 --- a/diameter/gqpolicy.xml +++ b/diameter/gqpolicy.xml @@ -6,7 +6,7 @@ <!-- ************************** Gq AVPS ********************* --> <!-- ETSI TS 129 209 V6.7.0 (2007-06) --> - <avp name="Abort-Cause" code="500" vendor-bit="must" may-encrypt="no" vendor-id="TGPP"> + <avp name="Abort-Cause" code="500" mandatory="must" vendor-bit="must" may-encrypt="yes" vendor-id="TGPP"> <type type-name="Enumerated"/> <enum name="BEARER_RELEASED" code="0"/> <enum name="INSUFFICIENT_SERVER_RESOURCES" code="1"/> @@ -76,7 +76,7 @@ <enum name="RTCP" code="1"/> </avp> - <avp name="Specific-Action" code="513" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no"> + <avp name="Specific-Action" code="513" mandatory="must" protected="may" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> <type type-name="Enumerated"/> <enum name="SERVICE_INFORMATION_REQUEST" code="0"/> <enum name="CHARGING_CORRELATION_EXCHANGE" code="1"/> @@ -84,6 +84,8 @@ <enum name="INDICATION_OF_RECOVERY_OF_BEARER" code="3"/> <enum name="INDICATION_OF_RELEASE_OF_BEARER" code="4"/> <enum name="INDICATION_OF_ESTABLISHMENT_OF_BEARER" code="5"/> + <enum name="INDICATION_OF_SUBSCRIBER_DETACHMENT" code="6"/> + <enum name="INDICATION_OF_RESERVATION_EXPIRATION" code="7"/> </avp> <avp name="Max-Requested-Bandwidth-DL" code="515" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes"> |