Add SIP application AVP:s (Incomplete) and sortmobileipv4 in numerical order.

svn path=/trunk/; revision=19889

3 files changed, 108 insertions, 31 deletions

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index d6b2a05031..2886ff1a15 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -7,6 +7,7 @@
 	<!ENTITY sunping SYSTEM "sunping.xml">
 	<!ENTITY imscxdx SYSTEM "imscxdx.xml">
 	<!ENTITY TGPPSh SYSTEM "TGPPSh.xml">
+	<!ENTITY sip SYSTEM "sip.xml">
 ]>
 <dictionary>
 	<base uri="http://www.ietf.org/rfc/rfc3588.txt">
@@ -1566,4 +1567,5 @@
 	&sunping;
 	&imscxdx;
 	&TGPPSh;
+	&sip;
 </dictionary>
diff --git a/diameter/mobileipv4.xml b/diameter/mobileipv4.xml
index 26e7c82ed8..d7a5b9aea8 100644
--- a/diameter/mobileipv4.xml
+++ b/diameter/mobileipv4.xml
@@ -8,34 +8,12 @@
 		<command name="Home-Agent-MIP" code="262" vendor-id="None"/>
 
 		<!-- ************************** Mobile-IPv4 AVPS ********************* -->
-		<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-Authenticator-Length" code="339" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="MIP-Authenticator-Offset" code="340" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
+		<avp name="MIP-Reg-Request" code="320" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="MIPRegistrationRequest"/>
 		</avp>
-		<avp name="MIP-FA-Challenge" code="344" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+		<avp name="MIP-Reg-Reply" code="321" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="MIP-Feature-Vector" code="337" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="MIP-Foreign-Agent-Host" code="330" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
-			<type type-name="DiameterIdentity"/>
-		</avp>
-		<avp name="MIP-Home-Agent-Address" code="334" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
-			<type type-name="IPAddress"/>
-		</avp>
 		<avp name="MIP-MN-AAA-Auth" code="322" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
 			<grouped>
 				<gavp name="MIP-MN-AAA-SPI"/>
@@ -44,30 +22,52 @@
 				<gavp name="MIP-Authenticator-Offset"/>
 			</grouped>
 		</avp>
-		<avp name="MIP-MN-AAA-SPI" code="341" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
-			<type type-name="Unsigned32"/>
+		<avp name="MIP-Foreign-Agent-Host" code="330" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="DiameterIdentity"/>
 		</avp>
 		<avp name="MIP-Mobile-Node-Address" code="333" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
 			<type type-name="IPAddress"/>
 		</avp>
-		<avp name="MIP-Previous-FA-Addr" code="336" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+		<avp name="MIP-Home-Agent-Address" code="334" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
 			<type type-name="IPAddress"/>
 		</avp>
 		<avp name="MIP-Previous-FA-Host" code="335" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
 			<type type-name="DiameterIdentity"/>
 		</avp>
-		<avp name="MIP-Reg-Request" code="320" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
-			<type type-name="MIPRegistrationRequest"/>
+		<avp name="MIP-Previous-FA-Addr" code="336" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="IPAddress"/>
 		</avp>
-		<avp name="MIP-Reg-Reply" code="321" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+		<avp name="MIP-Feature-Vector" code="337" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="Unsigned32"/>
+		</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-Authenticator-Length" code="339" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="MIP-Authenticator-Offset" code="340" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="MIP-MN-AAA-SPI" code="341" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="MIP-FA-Challenge" code="344" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
 			<type type-name="OctetString"/>
 		</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-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>
+		<avp name="MIP-Filter-Rule" code="347" mandatory="must" vendor-bit="mustnot" may-encrypt="yes">
+			<type type-name="IPFilterRule"/>
+		</avp>
 		<!-- ************************ END Mobile-IPv4 AVPS ******************* -->
 
 	</application>
diff --git a/diameter/sip.xml b/diameter/sip.xml
new file mode 100644
index 0000000000..ed4684508e
--- /dev/null
+++ b/diameter/sip.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+
+
+	<application id="6" name="Diameter Session Initiation Protocol (SIP) Application" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-sip-app-12.txt">
+
+		<command name="User-Authorization" code="283" vendor-id="None"/>
+		<command name="Server-Assignment" code="284" vendor-id="None"/>
+		<command name="Location-Info" code="285" vendor-id="None"/>
+		<command name="Multimedia-Auth" code="286" vendor-id="None"/>
+		<command name="Registration-Termination" code="287" vendor-id="None"/>
+		<command name="Push-Profile" code="288" vendor-id="None"/>
+
+		<!-- ************************* SIP AVPs ************************ -->
+                <!-- This list is not complete yet -->
+		<avp name="SIP-Accounting-Information" code="368" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
+			<grouped>
+				<gavp name="SIP-Accounting-Server-URI"/>
+				<gavp name="SIP-Credit-Control-Server-URI"/>
+			</grouped>
+		</avp>
+		<avp name="SIP-Accounting-Server-URI" code="369" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
+			<type type-name="DiameterURI"/>
+		</avp>
+		<avp name="SIP-Credit-Control-Server-URI" code="370" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
+			<type type-name="DiameterURI"/>
+		</avp>
+		<avp name="SIP-Server-URI" code="371" mandatory="must" vendor-bit="mustnot" vendor-id="TGPP" may-encrypt="yes">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="SIP-Server-Capabilities" code="372" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
+			<grouped>
+				<gavp name="SIP-Mandatory-Capability"/>
+				<gavp name="SIP-Optional-Capability"/>
+				<gavp name="SIP-Server-URI"/>
+			</grouped>
+		</avp>
+		<avp name="SIP-Mandatory-Capability" code="373" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="SIP-Optional-Capability" code="374" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="SIP-Server-Assignment-Type" code="375" mandatory="must" may-encrypt="yes">
+			<type type-name="Enumerated"/>
+			<enum name="NO_ASSIGNMENT" code="0"/>
+			<enum name="REGISTRATION" code="1"/>
+			<enum name="RE_REGISTRATION" code="2"/>
+			<enum name="UNREGISTERED_USER" code="3"/>
+			<enum name="TIMEOUT_DEREGISTRATION" code="4"/>
+			<enum name="USER_DEREGISTRATION" code="5"/>
+			<enum name="TIMEOUT_DEREGISTRATION_STORE_SERVER_NAME" code="6"/>
+			<enum name="USER_DEREGISTRATION_STORE_SERVER_NAME" code="7"/>
+			<enum name="ADMINISTRATIVE_DEREGISTRATION" code="8"/>
+			<enum name="AUTHENTICATION_FAILURE" code="9"/>
+			<enum name="AUTHENTICATION_TIMEOUT" code="10"/>
+			<enum name="DEREGISTRATION_TOO_MUCH_DATA" code="11"/>
+		</avp>
+		<avp name="SIP-Auth-Data-Item" code="376" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
+			<grouped>
+				<gavp name="SIP-Authentication-Scheme"/>
+				<gavp name="SIP-Item-Number"/>
+				<gavp name="SIP-Authenticate"/>
+				<gavp name="SIP-Authorization "/>
+				<gavp name="SIP-Authentication-Info"/>
+			</grouped>
+		</avp>
+		<avp name="SIP-Authentication-Scheme" code="377" mandatory="must" may-encrypt="yes">
+			<type type-name="Enumerated"/>
+			<enum name="DIGEST" code="0"/>
+		</avp>
+		<avp name="SIP-Item-Number" code="378" mandatory="may" may-encrypt="no" protected="may" vendor-bit="mustnot">
+			<type type-name="Unsigned32"/>
+		</avp>
+	</application>