Remove (ancient) CVS log. Fix up indentation and remove trailing white space.

svn path=/trunk/; revision=45974

1 files changed, 126 insertions, 153 deletions

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 8c121882c2..42ced8d147 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -32,35 +32,6 @@
 ]>
 <dictionary>
 	<base uri="http://www.ietf.org/rfc/rfc3588.txt">
-		<!--
-		$Log: dictionary.xml,v $
-		Revision 1.1  2001/11/01 21:52:44  guy
-		From David Frascone: duUpdate to Diameter dissector to load the
-		dictionary as an XML file rather than building it in, and various
-		Diameter updates.
-
-		Revision 1.8  2008/01/06 02:49:24  grzegorz  Added missing RFC 3588
-		AVP 299 by Grzegorz Szczytowski
-
-		Revision 1.7  2001/08/24 18:03:24  chaos
-		Mark's Changes
-
-		Revision 1.6  2001/07/31 19:13:55  chaos
-		Missed a couple of MIP AVPs
-
-		Revision 1.5  2001/07/31 19:09:22  chaos
-		Added Mobile-Ip and Sun Ping Extension
-
-		Revision 1.4  2001/07/31 17:43:25  chaos
-		Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
-
-		Revision 1.3  2001/07/31 16:56:31  chaos
-		Added commands, and validated with xmllint
-
-		Revision 1.2  2001/07/31 16:29:34  chaos
-		Checking in some changes to verify log and ident strings
-		-->
-
 		<!-- ************************************************************** -->
 		<!-- *********************** Commands ***************************** -->
 		<!-- ************************************************************** -->
@@ -188,23 +159,23 @@
 		<vendor vendor-id="None" code="0" name="None"/>
 		<vendor vendor-id="HP"    code="11"    name="Hewlett Packard"/>
 		<vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
-    <vendor vendor-id="Merit" code="61" name="Merit Networks"/>
-    <vendor vendor-id="Nokia" code="94" name="Nokia"/>
-    <vendor vendor-id="NokiaSiemensNetworks" code="28458" name="Nokia Siemens Networks"/>
-    <vendor vendor-id="Ericsson"  code="193" name="Ericsson"/>
-    <vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
-    <vendor vendor-id="ALU" code="637" name="ALU Network"/>
-    <vendor vendor-id="Huawei" code="2011" name="Huawei"/>
-    <vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
-    <vendor vendor-id="Cisco" code="5771" name="Cisco"/>
+		<vendor vendor-id="Merit" code="61" name="Merit Networks"/>
+		<vendor vendor-id="Nokia" code="94" name="Nokia"/>
+		<vendor vendor-id="NokiaSiemensNetworks" code="28458" name="Nokia Siemens Networks"/>
+		<vendor vendor-id="Ericsson"  code="193" name="Ericsson"/>
+		<vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
+		<vendor vendor-id="ALU" code="637" name="ALU Network"/>
+		<vendor vendor-id="Huawei" code="2011" name="Huawei"/>
+		<vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
+		<vendor vendor-id="Cisco" code="5771" name="Cisco"/>
 		<vendor vendor-id="TGPP2" code="5535" name="3GPP2"/>
 		<vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
 		<vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
-    <vendor vendor-id="VerizonWireless" code="12951" name="Verizon Wireless"/>
-    <vendor vendor-id="ETSI"  code="13019" name="ETSI"/>
-    <vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
-    <vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
-    <!-- *********************** End Vendors ************************** -->
+		<vendor vendor-id="VerizonWireless" code="12951" name="Verizon Wireless"/>
+		<vendor vendor-id="ETSI"  code="13019" name="ETSI"/>
+		<vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
+		<vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
+		<!-- *********************** End Vendors ************************** -->
 
 
 		<!-- ************************************************************** -->
@@ -3038,10 +3009,10 @@
 			<enum name="AS" code="6"/>
 			<enum name="IBCF" code="7"/>
 			<enum name="S-GW" code="8"/>
-      <enum name="P-GW" code="9"/>
-      <enum name="HSGW" code="10"/>
-      <enum name="E-CSCF" code="11"/>
-    </avp>
+			<enum name="P-GW" code="9"/>
+			<enum name="HSGW" code="10"/>
+			<enum name="E-CSCF" code="11"/>
+		</avp>
 		<avp name="Service-Specific-Data" code="863" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="UTF8String"/>
 		</avp>
@@ -3078,7 +3049,7 @@
 			<enum name="CHANGE_IN_LOCATION" code="3"/>
 			<enum name="CHANGE_IN_RAT" code="4"/>
 			<enum name="CHANGE_IN_UE_TIMEZONE" code="5"/>
-      
+
 			<enum name="Undefined" code="6"/>
 			<enum name="Undefined" code="7"/>
 			<enum name="Undefined" code="8"/>
@@ -3113,7 +3084,7 @@
 			<enum name="CHANGEINLOCATION_CellId" code="34"/>
 			<enum name="CHANGEINLOCATION_TAC" code="35"/>
 			<enum name="CHANGEINLOCATION_ECGI" code="36"/>
-      
+
 			<enum name="Undefined" code="37"/>
 			<enum name="Undefined" code="38"/>
 			<enum name="Undefined" code="39"/>
@@ -3517,12 +3488,12 @@
 			<enum name="MAX_MBR_APN_AMBR_CHANGE"				  code="38"/>
 			<enum name="APPLICATION_START"					      code="39"/>
 			<enum name="APPLICATION_STOP"					        code="40"/>
-      <enum name="ADC_REVALIDATION_TIMEOUT"					code="41"/>
-      <enum name="CS_TO_PS_HANDOVER"					      code="42"/>
-      <enum name="UE_LOCAL_IP_ADDRESS_CHANGE"	      code="43"/>
-      <enum name="H(E)NB_LOCAL_IP_ADDRESS_CHANGE"   code="44"/>
-      <enum name="ACCESS_NETWORK_INFO_REPORT"	      code="45"/>
-      <enum name="TIME_CHANGE"					code="100"/>
+			<enum name="ADC_REVALIDATION_TIMEOUT"					code="41"/>
+			<enum name="CS_TO_PS_HANDOVER"					      code="42"/>
+			<enum name="UE_LOCAL_IP_ADDRESS_CHANGE"	      code="43"/>
+			<enum name="H(E)NB_LOCAL_IP_ADDRESS_CHANGE"   code="44"/>
+			<enum name="ACCESS_NETWORK_INFO_REPORT"	      code="45"/>
+			<enum name="TIME_CHANGE"					code="100"/>
 			<enum name="TFT DELETED"					code="1000"/>
 			<enum name="LOSS OF BEARER"					code="1001"/>
 			<enum name="RECOVERY OF BEARER"					code="1002"/>
@@ -3887,7 +3858,7 @@
 		</avp>
 		<avp name="CSG-Information-Reporting" code="1071" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
-			<enum name="CHANGE_CSG_CELL"  code="0"/>
+			<enum name="CHANGE_CSG_CELL"				code="0"/>
 			<enum name="CHANGE_CSG_SUBSCRIBED_HYBRID_CELL"		code="1"/>
 			<enum name="CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL"	code="2"/>
 		</avp>
@@ -4394,7 +4365,7 @@
 			<grouped>
 				<gavp name="Service-Specific-Data"/>
 				<gavp name="Service-Specific-Type"/>
-		</grouped>
+			</grouped>
 		</avp>
 		<avp name="Called-Asserted-Identity" code="1250" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="UTF8String"/>
@@ -5551,30 +5522,30 @@
 				<gavp name="Associated-Party-Address"/>
 			</grouped>
 		</avp>
-    <avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="Originating Identification Presentation (OIP)" code="0"/>
-      <enum name="Originating Identification Restriction (OIR)" code="1"/>
-      <enum name="Terminating Identification Presentation (TIP)" code="2"/>
-      <enum name="Terminating Identification Restriction (TIR)" code="3"/>
-      <enum name="Communication HOLD (HOLD)" code="4"/>
-      <enum name="Communications Barring (CB )" code="5"/>
-      <enum name="Communication Diversion (CDIV)" code="6"/>
-      <enum name="Communication Diversion Notification (CDIVN)" code="7"/>
-      <enum name="Communication Waiting (CW)" code="8"/>
-      <enum name="Message Waiting Indication (MWI)" code="9"/>
-      <enum name="Conference (CONF)" code="10"/>
-      <enum name="Flexible Alerting (FA)" code="11"/>
-      <enum name="Completion of Communication to Busy Subscriber (CCBS)" code="12"/>
-      <enum name="Completion of Communications on No Reply (CCNR)" code="13"/>
-      <enum name="Malicious Communication Identification (MCID)" code="14"/>
-      <enum name="Customized Alerting Tone” (CAT)" code="15"/>
-      <enum name="Closed User Group” (CUG)" code="16"/>
-      <enum name="Personal Network management” (PNM)" code="17"/>
-      <enum name="Customized Ringing Signal” (CRS)" code="18"/>
-      <enum name="Advice of Charge (AoC)”" code="19"/>
-    </avp>
-    <avp name="Service-Mode" code="2032" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="Originating Identification Presentation (OIP)" code="0"/>
+			<enum name="Originating Identification Restriction (OIR)" code="1"/>
+			<enum name="Terminating Identification Presentation (TIP)" code="2"/>
+			<enum name="Terminating Identification Restriction (TIR)" code="3"/>
+			<enum name="Communication HOLD (HOLD)" code="4"/>
+			<enum name="Communications Barring (CB )" code="5"/>
+			<enum name="Communication Diversion (CDIV)" code="6"/>
+			<enum name="Communication Diversion Notification (CDIVN)" code="7"/>
+			<enum name="Communication Waiting (CW)" code="8"/>
+			<enum name="Message Waiting Indication (MWI)" code="9"/>
+			<enum name="Conference (CONF)" code="10"/>
+			<enum name="Flexible Alerting (FA)" code="11"/>
+			<enum name="Completion of Communication to Busy Subscriber (CCBS)" code="12"/>
+			<enum name="Completion of Communications on No Reply (CCNR)" code="13"/>
+			<enum name="Malicious Communication Identification (MCID)" code="14"/>
+			<enum name="Customized Alerting Tone” (CAT)" code="15"/>
+			<enum name="Closed User Group” (CUG)" code="16"/>
+			<enum name="Personal Network management” (PNM)" code="17"/>
+			<enum name="Customized Ringing Signal” (CRS)" code="18"/>
+			<enum name="Advice of Charge (AoC)”" code="19"/>
+		</avp>
+		<avp name="Service-Mode" code="2032" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
 		</avp>
 		<avp name="Subscriber-Role" code="2033" vendor-bit="must" vendor-id="TGPP">
@@ -5784,13 +5755,13 @@
 		<avp name="SGW-Address" code="2067" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Address"/>
 		</avp>
-    <avp name="Dynamic-Address-Flag-Extension" code="2068" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="Static" code="0"/>
-      <enum name="Dynamic" code="1"/>
-    </avp>
+		<avp name="Dynamic-Address-Flag-Extension" code="2068" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="Static" code="0"/>
+			<enum name="Dynamic" code="1"/>
+		</avp>
 
-    <!-- Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299 -->
+		<!-- Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299 -->
 
 		<avp name="Reserved" code="2100" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
@@ -5848,19 +5819,19 @@
 		<avp name="Total-Number-Of-Messages-Sent" code="2114" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Unsigned32"/>
 		</avp>
-    <!-- The AVP is defined in OMA-DDS-Charging_Data 
-    <avp name="DCD-Information" code="2115" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name=""/>
-      </grouped>
-    </avp>
-    -->
-    <avp name="Content-ID" code="2116" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="UTF8String"/>
-    </avp>
-    <avp name="Content-provider-ID" code="2117" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="UTF8String"/>
-    </avp>
+		<!-- The AVP is defined in OMA-DDS-Charging_Data
+		-- <avp name="DCD-Information" code="2115" vendor-bit="must" vendor-id="TGPP">
+		--	<grouped>
+		--	<gavp name=""/>
+		--	</grouped>
+		-- </avp>
+		-->
+		<avp name="Content-ID" code="2116" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="Content-provider-ID" code="2117" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="UTF8String"/>
+		</avp>
 		<avp name="Charge-Reason-Code" code="2118" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
 			<enum name="UNKNOWN" code="0"/>
@@ -5870,8 +5841,8 @@
 			<enum name="ADD-ON-CHARGE" code="4"/>
 		</avp>
 
-    <!--
-    32.299 [5]
+		<!--
+		32.299 [5]
 		Note: The AVP codes from 2118 to 2199 are reserved for TS 32.299
 
 		Note: The AVP codes from 2200 to 2299 are reserved for TS 29.215
@@ -5915,45 +5886,45 @@
 		<avp name="Account-Expiration" code="2309" vendor-bit="must" vendor-id="TGPP">
 		<type type-name="Time"/>
 		</avp>
-    <avp name="AoC-Format" code="2310" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="MONETARY" code="0"/>
-      <enum name="NON_MONETARY" code="1"/>
-      <enum name="CAI" code="2"/>
-    </avp>
-    <avp name="AoC-Service" code="2311" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="AoC-Service-Obligatory-Type"/>
-        <gavp name="AoC-Service-Type"/>
-      </grouped>
-    </avp>
-    <avp name="AoC-Service-Obligatory-Type" code="2312" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="NON_BINDING" code="0"/>
-      <enum name="BINDING" code="1"/>
-    </avp>
-    <avp name="AoC-Service-Type" code="2313" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="NONE" code="0"/>
-      <enum name="AOC-S" code="1"/>
-      <enum name="AOC-D" code="2"/>
-      <enum name="AOC-E" code="3"/>
-    </avp>
-    <avp name="AoC-Subscription-Information" code="2314" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="AoC-Service"/>
-        <gavp name="AoC-Format"/>
-        <gavp name="Preferred-AoC-Currency"/>
-      </grouped>
-    </avp>
-    <!-- pecified by using the numeric values defined in the ISO 4217 standard, refer RFC 4006 XXX Add them as enum-->
-    <avp name="Preferred-AoC-Currency" code="2315" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-    </avp>
-
-    <!--
-		2316	Reason-Code	Enumerated
-    -->
+		<avp name="AoC-Format" code="2310" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="MONETARY" code="0"/>
+			<enum name="NON_MONETARY" code="1"/>
+			<enum name="CAI" code="2"/>
+		</avp>
+		<avp name="AoC-Service" code="2311" vendor-bit="must" vendor-id="TGPP">
+			<grouped>
+			<gavp name="AoC-Service-Obligatory-Type"/>
+			<gavp name="AoC-Service-Type"/>
+			</grouped>
+		</avp>
+		<avp name="AoC-Service-Obligatory-Type" code="2312" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="NON_BINDING" code="0"/>
+			<enum name="BINDING" code="1"/>
+		</avp>
+		<avp name="AoC-Service-Type" code="2313" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Enumerated"/>
+			<enum name="NONE" code="0"/>
+			<enum name="AOC-S" code="1"/>
+			<enum name="AOC-D" code="2"/>
+			<enum name="AOC-E" code="3"/>
+		</avp>
+		<avp name="AoC-Subscription-Information" code="2314" vendor-bit="must" vendor-id="TGPP">
+			<grouped>
+			<gavp name="AoC-Service"/>
+			<gavp name="AoC-Format"/>
+			<gavp name="Preferred-AoC-Currency"/>
+			</grouped>
+		</avp>
+		<!-- Specified by using the numeric values defined in the ISO 4217 standard, refer RFC 4006 XXX Add them as enum-->
+		<avp name="Preferred-AoC-Currency" code="2315" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Unsigned32"/>
+		</avp>
+
+		<!--
+			2316	Reason-Code	Enumerated
+		-->
 		<avp name="CSG-Access-Mode" code="2317" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
 			<enum name="Closed mode" code="0"/>
@@ -5964,20 +5935,21 @@
 			<enum name="Not CSG member" code="0"/>
 			<enum name="CSG Member" code="1"/>
 		</avp>
-    <avp name="User-CSG-Information" code="2319" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="CSG-Id"/>
-        <gavp name="CSG-Access-Mode"/>
-        <gavp name="CSG-Membership-Indication"/>
-      </grouped>
-    </avp>
-    <avp name="Outgoing-Session-Id" code="2320" vendor-bit="must" vendor-id="TGPP">
+		<avp name="User-CSG-Information" code="2319" vendor-bit="must" vendor-id="TGPP">
+			<grouped>
+				<gavp name="CSG-Id"/>
+				<gavp name="CSG-Access-Mode"/>
+				<gavp name="CSG-Membership-Indication"/>
+			</grouped>
+		</avp>
+		<avp name="Outgoing-Session-Id" code="2320" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="UTF8String"/>
 		</avp>
 		<avp name="Initial-IMS-Charging-Identifier" code="2321" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="UTF8String"/>
 		</avp>
-    <!--
+
+		<!--
 		Note: The AVP codes from 2322 to 2399 are reserved for TS 32.299
 
 		2400	LMSI	OctetString
@@ -6128,7 +6100,8 @@
 
 		32.299 [5]
 		2600 reserved -
-    -->
+		-->
+
 		<avp name="Reserved" code="2600" mandatory="must" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
@@ -6158,8 +6131,8 @@
 		<avp name="PDP-Address-Prefix-Length" code="2606" mandatory="must" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Unsigned32"/>
 		</avp>
-    <!--
-		Note: The AVP codes from 2605 to 2699 are reserved for TS 32.299
+		<!--
+		Note: The AVP codes from 2607 to 2699 are reserved for TS 32.299
 		-->
 
 		<avp name="Policy-Counter-Identifier" code="2901" mandatory="must" vendor-bit="must" vendor-id="TGPP">