Fix up indentation and white space.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@45432 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/diameter/AlcatelLucent.xml b/diameter/AlcatelLucent.xml
index 509d09e50b6a347ec1519639b14583b695852f1d..49f9da27936bf43ffbcffe3904e6d1bdef91d385 100644 (file)
--- a/diameter/AlcatelLucent.xml
+++ b/diameter/AlcatelLucent.xml
@@ -4,38 +4,34 @@
 <!-- NOTE the Application ID is not assigned by IANA http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml -->
 <application id="111" name="ALU Sy" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
 
+       <avp name="Detailed-Result" code="15" mandatory="mustnot" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
+               <grouped>
+                       <gavp name="Detailed-Result-Code"/>
+                       <gavp name="Detailed-Result-Cause"/>
+               </grouped>
+       </avp>
+       <avp name="Detailed-Result-Cause" code="16" mandatory="mustnot" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
+               <type type-name="UTF8String"/>
+       </avp>
+       <avp name="Detailed-Result-Code" code="17" mandatory="must" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
+               <type type-name="Unsigned32"/>
+       </avp>
+       <avp name="Policy-Counter" code="1135" mandatory="must" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
+               <grouped>
+                       <gavp name="Policy-Counter-Id"/>
+                       <gavp name="Policy-Counter-Value"/>
+               </grouped>
+       </avp>
+       <avp name="Charging-Policy-Report" code="1134" mandatory="mustnot" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
+               <grouped>
+                       <gavp name="Policy-Counter"/>
+               </grouped>
+       </avp>
+       <avp name="Policy-Counter-Id" code="1136" mandatory="mustnot" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
+               <type type-name="OctetString"/>
+       </avp>
+       <avp name="Policy-Counter-Value" code="1137" mandatory="mustnot" protected="may" vendor-bit="must" vendor-id="ALU" may-encrypt="yes">
+               <type type-name="Unsigned32"/>
+       </avp>
 
-  <!-- *********************** ALU AVPS ************************* -->
-  <avp name="Detailed-Result"                  code="15" mandatory="mustnot"   protected="may"         vendor-bit="must"       vendor-id="ALU" may-encrypt="yes">
-    <grouped>
-      <gavp name="Detailed-Result-Code"/>
-      <gavp name="Detailed-Result-Cause"/>
-    </grouped>
-  </avp>
-  <avp name="Detailed-Result-Cause"            code="16" mandatory="mustnot"   protected="may"         vendor-bit="must"       vendor-id="ALU" may-encrypt="yes">
-    <type type-name="UTF8String"/>
-  </avp>
-  <avp name="Detailed-Result-Code"             code="17" mandatory="must"      protected="may"         vendor-bit="must"       vendor-id="ALU" may-encrypt="yes">
-    <type type-name="Unsigned32"/>
-  </avp>
-  <avp name="Policy-Counter"           code="1135" mandatory="must"    protected="may"         vendor-bit="must"       vendor-id="ALU" may-encrypt="yes">
-    <grouped>
-      <gavp name="Policy-Counter-Id"/>
-      <gavp name="Policy-Counter-Value"/>
-    </grouped>
-  </avp>
-  <avp name="Charging-Policy-Report"           code="1134" mandatory="mustnot" protected="may"         vendor-bit="must"       vendor-id="ALU" may-encrypt="yes">
-    <grouped>
-      <gavp name="Policy-Counter"/>
-    </grouped>
-  </avp>
-  <avp name="Policy-Counter-Id"                code="1136" mandatory="mustnot" protected="may"         vendor-bit="must"       vendor-id="ALU" may-encrypt="yes">
-    <type type-name="OctetString"/>
-  </avp>
-  <avp name="Policy-Counter-Value"             code="1137" mandatory="mustnot" protected="may"         vendor-bit="must"       vendor-id="ALU" may-encrypt="yes">
-    <type type-name="Unsigned32"/>
-  </avp>
-  <!-- *********************** END ALU AVPS ********************* -->
 </application>
-
-

diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml
index 85391ad834675a011ce953116bd27310728d3756..9c4a21ebbb60912d71749288180e4c4ad441070b 100644 (file)
--- a/diameter/Nokia.xml
+++ b/diameter/Nokia.xml
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- $Id$ -->
-<!-- Nokia verndor-specific AVPs. Simple encoding, by old (oleksandr.darchuk@gmail.com). 02.03.2009 -->
+<!-- Nokia verndor-specific AVPs. Simple encoding, by old (oleksandr.darchuk[AT]gmail.com). 02.03.2009 -->
 
 <application id="4" name="Diameter Credit Control Application" uri="http://www.ietf.org/rfc/rfc4006.txt">
 
-               <avp name="Nokia-IMS-Media-Component-Id" code="5101" vendor-id="Nokia">
-                       <type type-name="Unsigned32"/>
-               </avp>
-
-               <avp name="Time-Of-First-Usage" code="5103" vendor-id="Nokia">
-                  <type type-name="Time"/>
-               </avp>
-
-               <avp name="Time-Of-Last-Usage" code="5104" vendor-id="Nokia">
-                  <type type-name="Time"/>
-               </avp>
-
-               <avp name="Session-Start-Indicator" code="5105" vendor-id="Nokia">
-                  <type type-name="OctetString"/>
-               </avp>
-
-               <avp name="Rulebase-Id" code="5106" vendor-id="Nokia">
-                  <type type-name="UTF8String"/>
-               </avp>
-
-               <avp name="Quota-Consumption-Time" code="5109" vendor-id="Nokia">
-                  <type type-name="Unsigned32"/>
-               </avp>
-
-               <avp name="Quota-Holding-Time" code="5110" vendor-id="Nokia">
-                  <type type-name="Unsigned32"/>
-               </avp>
-
-               <avp name="Default-Quota" code="5111" vendor-id="Nokia">
-                       <grouped>
-                               <gavp name="CC-Time"/>
-                               <gavp name="CC-Total-Octets"/>
-                               <gavp name="CC-Input-Octets"/>
-                               <gavp name="CC-Output-Octets"/>
-                               <gavp name="CC-Service-Specific-Units"/>
-                       </grouped>                                              
-               </avp>
-
-               <avp name="Nokia-URI" code="5112" vendor-id="Nokia">
-                  <type type-name="UTF8String"/>
-               </avp>
-
-               <avp name="NSN-Token-Value" code="5113" vendor-id="Nokia">
-                  <type type-name="OctetString"/>
-               </avp>
-
-       </application>
\ No newline at end of file
+       <avp name="Nokia-IMS-Media-Component-Id" code="5101" vendor-id="Nokia">
+               <type type-name="Unsigned32"/>
+       </avp>
+
+       <avp name="Time-Of-First-Usage" code="5103" vendor-id="Nokia">
+               <type type-name="Time"/>
+       </avp>
+
+       <avp name="Time-Of-Last-Usage" code="5104" vendor-id="Nokia">
+               <type type-name="Time"/>
+       </avp>
+
+       <avp name="Session-Start-Indicator" code="5105" vendor-id="Nokia">
+               <type type-name="OctetString"/>
+       </avp>
+
+       <avp name="Rulebase-Id" code="5106" vendor-id="Nokia">
+               <type type-name="UTF8String"/>
+       </avp>
+
+       <avp name="Quota-Consumption-Time" code="5109" vendor-id="Nokia">
+               <type type-name="Unsigned32"/>
+       </avp>
+
+       <avp name="Quota-Holding-Time" code="5110" vendor-id="Nokia">
+               <type type-name="Unsigned32"/>
+       </avp>
+
+       <avp name="Default-Quota" code="5111" vendor-id="Nokia">
+               <grouped>
+                       <gavp name="CC-Time"/>
+                       <gavp name="CC-Total-Octets"/>
+                       <gavp name="CC-Input-Octets"/>
+                       <gavp name="CC-Output-Octets"/>
+                       <gavp name="CC-Service-Specific-Units"/>
+               </grouped>
+       </avp>
+
+       <avp name="Nokia-URI" code="5112" vendor-id="Nokia">
+               <type type-name="UTF8String"/>
+       </avp>
+
+       <avp name="NSN-Token-Value" code="5113" vendor-id="Nokia">
+               <type type-name="OctetString"/>
+       </avp>
+
+</application>
\ No newline at end of file

diff --git a/diameter/NokiaSiemensNetworks.xml b/diameter/NokiaSiemensNetworks.xml
index aa9fa3032689c7f7cdc48da123c5d549025b4dd5..a4642f1799dff50cab041c0cdf7b0f9c2bbeecd1 100644 (file)
--- a/diameter/NokiaSiemensNetworks.xml
+++ b/diameter/NokiaSiemensNetworks.xml
@@ -4,10 +4,11 @@
 <!-- Nokia Siemens Networks verndor-specific AVPs.  -->
 
 <application id="16777238" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
-  
-  <avp name="User-Agent-Type" code="2016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSiemensNetworks">
-    <type type-name="Enumerated"/>
-    <enum name="NON_MOBILE_BROWSER" code="0"/>
-    <enum name="MOBILE_BROWSER"     code="1"/>
-  </avp>
+
+       <avp name="User-Agent-Type" code="2016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSiemensNetworks">
+               <type type-name="Enumerated"/>
+               <enum name="NON_MOBILE_BROWSER" code="0"/>
+               <enum name="MOBILE_BROWSER"     code="1"/>
+       </avp>
+
 </application>

diff --git a/diameter/Vodafone.xml b/diameter/Vodafone.xml
index fa02bd130a604dd36731bbec4dccbddd27a2a1ec..993bd849df2bcf1553fb1d03e8274b362f6afd56 100644 (file)
--- a/diameter/Vodafone.xml
+++ b/diameter/Vodafone.xml
@@ -3,78 +3,74 @@
 
 <application id="16777238" name="3GPP Gx" uri="http://www.ietf.org/internet-drafts/draft-ietf-aaa-diameter-cc-06.txt">
 
+       <avp name="Context-Type" code="256" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+               <enum name="PRIMARY" code="0"/>
+               <enum name="SECONDARY" code="1"/>
+       </avp>
+       <avp name="Quota-Consumption-Time" code="257" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+       </avp>
+       <avp name="Quota-Holding-Time" code="258" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+       </avp>
+       <avp name="Time-Quota-Threshold" code="259" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+       </avp>
+       <avp name="Radio-Access-Technology" code="260" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+               <enum name="UTRAN" code="0"/>
+               <enum name="GERAN" code="1"/>
+               <enum name="WLAN" code="2"/>
+       </avp>
+       <avp name="Reporting-Reason" code="261" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+               <enum name="THRESHOLD" code="0"/>
+               <enum name="QHT" code="1"/>
+               <enum name="FINAL" code="2"/>
+               <enum name="QUOTA_EXHAUSTED" code="3"/>
+               <enum name="VALIDITY_TIME" code="4"/>
+               <enum name="OTHER_QUOTA_TYPE" code="5"/>
+               <enum name="RATING_CONDITION_CHANGE" code="6"/>
+               <enum name="FORCED_REAUTHORISATION " code="7"/>
+       </avp>
+       <avp name="Rulebase-Id" code="262" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="UTF8String"/>
+       </avp>
+       <avp name="Time-Of-First-Usage" code="263" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Time"/>
+       </avp>
+       <avp name="Time-Of-Last-Usage" code="264" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Time"/>
+       </avp>
+       <avp name="Trigger" code="265" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <grouped>
+                       <gavp name="Trigger-Type"/>
+               </grouped>
+       </avp>
+       <avp name="Trigger-Type" code="266" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+               <enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
+               <enum name="CHANGEINQOS_ANY" code="2"/>
+               <enum name="CHANGEINLOCATION_ANY" code="3"/>
+               <enum name="CHANGEINRAT" code="4"/>
+               <enum name="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
+               <enum name="CHANGEINQOS_RELIABILITY_CLASS" code="11"/>
+               <enum name="CHANGEINQOS_DELAY_CLASS " code="12"/>
+               <enum name="CHANGEINQOS_PEAK_THROUGHPUT" code="13"/>
+               <enum name="CHANGEINQOS_PRECEDENCE_CLASS" code="14"/>
+               <enum name="CHANGEINQOS_MEAN_THROUGHPUT" code="15"/>
+               <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK" code="16"/>
+               <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK" code="17"/>
+               <enum name="CHANGEINQOS_RESIDUAL_BER" code="18"/>
+               <enum name="CHANGEINQOS_SDU_ERROR_RATIO" code="19"/>
+               <enum name="CHANGEINQOS_TRANSFER_DELAY" code="20"/>
+       </avp>
+       <avp name="User-Location-Information" code="267" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="OctetString"/>
+       </avp>
+       <avp name="Volume-Quota-Threshold" code="268" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+               <type type-name="Unsigned32"/>
+       </avp>
 
-  <!-- ************************ Vodafone AVPS ******************* -->
-  <avp name="Context-Type" code="256" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-    <enum name="PRIMARY" code="0"/>
-    <enum name="SECONDARY" code="1"/>
-  </avp>
-  <avp name="Quota-Consumption-Time" code="257" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-  </avp>
-  <avp name="Quota-Holding-Time" code="258" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-  </avp>
-  <avp name="Time-Quota-Threshold" code="259" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-  </avp>
-  <avp name="Radio-Access-Technology" code="260" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-    <enum name="UTRAN" code="0"/>
-    <enum name="GERAN" code="1"/>
-    <enum name="WLAN" code="2"/>
-  </avp>
-  <avp name="Reporting-Reason" code="261" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-    <enum name="THRESHOLD" code="0"/>
-    <enum name="QHT" code="1"/>
-    <enum name="FINAL" code="2"/>
-    <enum name="QUOTA_EXHAUSTED" code="3"/>
-    <enum name="VALIDITY_TIME" code="4"/>
-    <enum name="OTHER_QUOTA_TYPE" code="5"/>
-    <enum name="RATING_CONDITION_CHANGE" code="6"/>
-    <enum name="FORCED_REAUTHORISATION " code="7"/>
-  </avp>
-  <avp name="Rulebase-Id" code="262" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="UTF8String"/>
-  </avp>
-  <avp name="Time-Of-First-Usage" code="263" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Time"/>
-  </avp>
-  <avp name="Time-Of-Last-Usage" code="264" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Time"/>
-  </avp>
-  <avp name="Trigger" code="265" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <grouped>
-      <gavp name="Trigger-Type"/>
-    </grouped>
-  </avp>
-  <avp name="Trigger-Type" code="266" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-    <enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
-    <enum name="CHANGEINQOS_ANY" code="2"/>
-    <enum name="CHANGEINLOCATION_ANY" code="3"/>
-    <enum name="CHANGEINRAT" code="4"/>
-    <enum name="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
-    <enum name="CHANGEINQOS_RELIABILITY_CLASS" code="11"/>
-    <enum name="CHANGEINQOS_DELAY_CLASS " code="12"/>
-    <enum name="CHANGEINQOS_PEAK_THROUGHPUT" code="13"/>
-    <enum name="CHANGEINQOS_PRECEDENCE_CLASS" code="14"/>
-    <enum name="CHANGEINQOS_MEAN_THROUGHPUT" code="15"/>
-    <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK" code="16"/>
-    <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK" code="17"/>
-    <enum name="CHANGEINQOS_RESIDUAL_BER" code="18"/>
-    <enum name="CHANGEINQOS_SDU_ERROR_RATIO" code="19"/>
-    <enum name="CHANGEINQOS_TRANSFER_DELAY" code="20"/>
-  </avp>
-  <avp name="User-Location-Information" code="267" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="OctetString"/>
-  </avp>
-  <avp name="Volume-Quota-Threshold" code="268" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
-    <type type-name="Unsigned32"/>
-  </avp>
-  <!-- ********************** END Vodafone AVPS ***************** -->
 </application>
-
-

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index b7c36dd23418eb830039b90be77f973a7a7117e3..8d767520451c4ac133839de0b6d19472f99aca15 100644 (file)
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -6170,7 +6170,7 @@
        <application id="16777291"      name="3GPP SLh"                 uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
        <application id="16777292"      name="3GPP SGmb"                uri="http://www.3gpp.org/ftp/Specs/html-info/29061.htm"></application>
        <application id="16777302"      name="3GPP Sy"                  uri="http://www.3gpp.org/ftp/Specs/html-info/29219.htm"></application>
-       <application id="16777304"      name="Ericsson Sy"      uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
+       <application id="16777304"      name="Ericsson Sy"              uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml"></application>
 
        &nasreq;
        &eap;
@@ -6188,8 +6188,8 @@
        &Ericsson;
        &mobileipv6;
        &Cisco;
-  &Vodafone;
-  &AlcatelLucent;
-  &Nokia;
-  &NokiaSiemensNetworks;
+       &Vodafone;
+       &AlcatelLucent;
+       &Nokia;
+       &NokiaSiemensNetworks;
 </dictionary>