From 06d84872c995dbc02e0ac2998cab70ba44f741dc Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date: Wed, 14 Nov 2012 20:50:54 +0000
Subject: Add SVN Id. Fix up indentation some and remove some not-very-useful
 comments which also made one of these files hard to read.

svn path=/trunk/; revision=46033
---
 diameter/Ericsson.xml |   1 +
 diameter/nasreq.xml   | 195 +++++++++++++++++++++++++-------------------------
 diameter/sunping.xml  |  39 +++++-----
 3 files changed, 118 insertions(+), 117 deletions(-)

(limited to 'diameter')

diff --git a/diameter/Ericsson.xml b/diameter/Ericsson.xml
index 51075a2f29..fc940ad8f4 100644
--- a/diameter/Ericsson.xml
+++ b/diameter/Ericsson.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
 
 <application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
 <!-- *********** Last updated 2007-04-12 ************ -->
diff --git a/diameter/nasreq.xml b/diameter/nasreq.xml
index eb18b3901e..694302270e 100644
--- a/diameter/nasreq.xml
+++ b/diameter/nasreq.xml
@@ -1,100 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
 
-	<application id="1" name="NASREQ Application" uri="http://www.ietf.org/rfc/rfc4005.txt">
+<application id="1" name="NASREQ Application" uri="http://www.ietf.org/rfc/rfc4005.txt">
 
-		<command name="AA" code="265" vendor-id="None"/>
+	<command name="AA" code="265" vendor-id="None"/>
 
-		<avp name="Accounting-Input-Octets" code="363" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="Unsigned64"/>
-		</avp>
-		<avp name="Accounting-Output-Octets" code="364" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="Unsigned64"/>
-		</avp>
-		<avp name="Accounting-Input-Packets" code="365" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="Unsigned64"/>
-		</avp>
-		<avp name="Accounting-Output-Packets" code="366" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="Unsigned64"/>
-		</avp>
-<!--
-368 - 393 is in sip.xml
-368 SIP-Accounting-Information [RFC4740] 
-369 SIP-Accounting-Server-URI [RFC4740] 
-370 SIP-Credit-Control-Server-URI [RFC4740] 
-371 SIP-Server-URI [RFC4740] 
-372 SIP-Server-Capabilities [RFC4740] 
-373 SIP-Mandatory-Capability [RFC4740] 
-374 SIP-Optional-Capability [RFC4740] 
-375 SIP-Server-Assignment-Type [RFC4740] 
-376 SIP-Auth-Data-Item [RFC4740] 
-377 SIP-Authentication-Scheme [RFC4740] 
-378 SIP-Item-Number [RFC4740] 
-379 SIP-Authenticate [RFC4740] 
-380 SIP-Authorization [RFC4740] 
-381 SIP-Authentication-Info [RFC4740] 
-382 SIP-Number-Auth-Items [RFC4740] 
-383 SIP-Deregistration-Reason [RFC4740] 
-384 SIP-Reason-Code [RFC4740] 
-385 SIP-Reason-Info [RFC4740] 
-386 SIP-Visited-Network-Id [RFC4740] 
-387 SIP-User-Authorization-Type [RFC4740] 
-388 SIP-Supported-User-Data-Type [RFC4740] 
-389 SIP-User-Data [RFC4740] 
-390 SIP-User-Data-Type [RFC4740] 
-391 SIP-User-Data-Contents [RFC4740] 
-392 SIP-User-Data-Already-Available [RFC4740] 
-393 SIP-Method [RFC4740] 
-394-399 Unassigned 
--->    
-		<avp name="NAS-Filter-Rule" code="400" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="IPFilterRule"/>
-		</avp>
-		<avp name="Tunneling" code="401" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
-			<grouped>
-				<gavp name="Tunnel-Type"/>
-				<gavp name="Tunnel-Medium-Type"/>
-				<gavp name="Tunnel-Client-Endpoint"/>
-				<gavp name="Tunnel-Server-Endpoint"/>
-				<gavp name="Tunnel-Preference"/>
-				<gavp name="Tunnel-Client-Auth-Id"/>
-				<gavp name="Tunnel-Server-Auth-Id"/>
-				<gavp name="Tunnel-Assignment-Id"/>
-				<gavp name="Tunnel-Password"/>
-				<gavp name="Tunnel-Private-Group-Id"/>
-			</grouped>
-		</avp>
-		<avp name="CHAP-Auth" code="402" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<grouped>
-				<gavp name="CHAP-Algorithm"/>
-				<gavp name="CHAP-Ident"/>
-				<gavp name="CHAP-Response"/>
-			</grouped>
-		</avp>
-		<avp name="CHAP-Algorithm" code="403" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="Enumerated"/>
-			<enum name="CHAP with MD5" code="5"/>
-		</avp>
-		<avp name="CHAP-Ident" code="404" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="CHAP-Response" code="405" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Accounting-Auth-Method" code="406" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="Enumerated"/>
-			<enum name="PAP" code="1"/>
-			<enum name="CHAP" code="2"/>
-			<enum name="MS-CHAP-1" code="3"/>
-			<enum name="MS-CHAP-2" code="4"/>
-			<enum name="EAP" code="5"/>
-      <enum name="Undefined" code="6"/>
-			<enum name="None" code="7"/>
-		</avp>
-		<avp name="QoS-Filter-Rule" code="407">
-			<type type-name="QoSFilterRule"/>
-		</avp>
-		<avp name="Origin-AAA-Protocol" code="408" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
-			<type type-name="Enumerated"/>
-			<enum name="RADIUS" code="1"/>
-		</avp>
-	</application>
+	<avp name="Accounting-Input-Octets" code="363" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="Accounting-Output-Octets" code="364" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="Accounting-Input-Packets" code="365" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="Accounting-Output-Packets" code="366" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="Unsigned64"/>
+	</avp>
+
+	<!--
+	368 - 393 is in sip.xml
+	368 SIP-Accounting-Information [RFC4740] 
+	369 SIP-Accounting-Server-URI [RFC4740] 
+	370 SIP-Credit-Control-Server-URI [RFC4740] 
+	371 SIP-Server-URI [RFC4740] 
+	372 SIP-Server-Capabilities [RFC4740] 
+	373 SIP-Mandatory-Capability [RFC4740] 
+	374 SIP-Optional-Capability [RFC4740] 
+	375 SIP-Server-Assignment-Type [RFC4740] 
+	376 SIP-Auth-Data-Item [RFC4740] 
+	377 SIP-Authentication-Scheme [RFC4740] 
+	378 SIP-Item-Number [RFC4740] 
+	379 SIP-Authenticate [RFC4740] 
+	380 SIP-Authorization [RFC4740] 
+	381 SIP-Authentication-Info [RFC4740] 
+	382 SIP-Number-Auth-Items [RFC4740] 
+	383 SIP-Deregistration-Reason [RFC4740] 
+	384 SIP-Reason-Code [RFC4740] 
+	385 SIP-Reason-Info [RFC4740] 
+	386 SIP-Visited-Network-Id [RFC4740] 
+	387 SIP-User-Authorization-Type [RFC4740] 
+	388 SIP-Supported-User-Data-Type [RFC4740] 
+	389 SIP-User-Data [RFC4740] 
+	390 SIP-User-Data-Type [RFC4740] 
+	391 SIP-User-Data-Contents [RFC4740] 
+	392 SIP-User-Data-Already-Available [RFC4740] 
+	393 SIP-Method [RFC4740] 
+	394-399 Unassigned 
+	-->    
+
+	<avp name="NAS-Filter-Rule" code="400" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="IPFilterRule"/>
+	</avp>
+	<avp name="Tunneling" code="401" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+		<grouped>
+			<gavp name="Tunnel-Type"/>
+			<gavp name="Tunnel-Medium-Type"/>
+			<gavp name="Tunnel-Client-Endpoint"/>
+			<gavp name="Tunnel-Server-Endpoint"/>
+			<gavp name="Tunnel-Preference"/>
+			<gavp name="Tunnel-Client-Auth-Id"/>
+			<gavp name="Tunnel-Server-Auth-Id"/>
+			<gavp name="Tunnel-Assignment-Id"/>
+			<gavp name="Tunnel-Password"/>
+			<gavp name="Tunnel-Private-Group-Id"/>
+		</grouped>
+	</avp>
+	<avp name="CHAP-Auth" code="402" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<grouped>
+			<gavp name="CHAP-Algorithm"/>
+			<gavp name="CHAP-Ident"/>
+			<gavp name="CHAP-Response"/>
+		</grouped>
+	</avp>
+	<avp name="CHAP-Algorithm" code="403" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="Enumerated"/>
+		<enum name="CHAP with MD5" code="5"/>
+	</avp>
+	<avp name="CHAP-Ident" code="404" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="CHAP-Response" code="405" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="Accounting-Auth-Method" code="406" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="Enumerated"/>
+		<enum name="PAP" code="1"/>
+		<enum name="CHAP" code="2"/>
+		<enum name="MS-CHAP-1" code="3"/>
+		<enum name="MS-CHAP-2" code="4"/>
+		<enum name="EAP" code="5"/>
+		<enum name="Undefined" code="6"/>
+		<enum name="None" code="7"/>
+	</avp>
+	<avp name="QoS-Filter-Rule" code="407">
+		<type type-name="QoSFilterRule"/>
+	</avp>
+	<avp name="Origin-AAA-Protocol" code="408" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+		<type type-name="Enumerated"/>
+		<enum name="RADIUS" code="1"/>
+	</avp>
+</application>
diff --git a/diameter/sunping.xml b/diameter/sunping.xml
index fa3cbc96f2..2b0ed7a656 100644
--- a/diameter/sunping.xml
+++ b/diameter/sunping.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<application id="555" name="Sun Ping Application" uri="ftp://ftp.ietf.org/internet-drafts/draft-calhoun-diameter-sun-ping-02.txt">
-		<!-- *********************** Commands ***************************** -->
-		<!-- Sun Ping Extension -->
-		<command name="Ping" code="511" vendor-id="Sun"/>
-		<!-- ********************** End Commands ************************** -->
-		<!-- ************************ Sun Ping Extension AVPS ******************* -->
-		<avp name="Ping-Timestamp-Secs" code="1" vendor-id="Sun" mandatory="mustnot" vendor-bit="must">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Ping-Timestamp-Usecs" code="2" vendor-id="Sun" mandatory="mustnot" vendor-bit="must">
-			<type type-name="Unsigned32"/>
-		</avp>
-		<avp name="Ping-Timestamp" code="3" vendor-id="Sun" mandatory="mustnot" vendor-bit="must">
-			<grouped>
-				<gavp name="Ping-Timestamp-Secs"/>
-				<gavp name="Ping-Timestamp-Usecs"/>
-			</grouped>
-		</avp>
-		<!-- ********************** End Sun Ping Extension AVPS ***************** -->
-		<!-- ************************ Sun PING Extension AVPs ***************************-->
-	</application>
+<!-- $Id$ -->
+
+<application id="555" name="Sun Ping Application" uri="ftp://ftp.ietf.org/internet-drafts/draft-calhoun-diameter-sun-ping-02.txt">
+	<command name="Ping" code="511" vendor-id="Sun"/>
+
+	<avp name="Ping-Timestamp-Secs" code="1" vendor-id="Sun" mandatory="mustnot" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Ping-Timestamp-Usecs" code="2" vendor-id="Sun" mandatory="mustnot" vendor-bit="must">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Ping-Timestamp" code="3" vendor-id="Sun" mandatory="mustnot" vendor-bit="must">
+		<grouped>
+			<gavp name="Ping-Timestamp-Secs"/>
+			<gavp name="Ping-Timestamp-Usecs"/>
+		</grouped>
+	</avp>
+</application>
-- 
cgit v1.2.3