From Tamas Regos:

diameter dictionary.xml update

AVP 1003:
- typo: Flow-Informatio <-> Flow-Information
- added: Monitoring-Key and AF-Signalling-Protocol
- whitespace corrections

AVP 1006:
- added code: 24-28 and 100
- whitespace correction

AVP 1001, 1007, 1013-1020: whitespace corrections
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4765

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

1 files changed, 87 insertions, 78 deletions

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index d8ead1788a..3156df1735 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -599,8 +599,9 @@
 		</avp>
 		<avp name="Service-Type" code="6">
 			<type type-name="Unsigned32"/>
-			<enum name="Login" code="1"/>
-			<enum name="Framed" code="2"/>
+      <enum name="Unknown" code="0"/>
+      <enum name="Login" code="1"/>
+      <enum name="Framed" code="2"/>
 			<enum name="Callback-Login" code="3"/>
 			<enum name="Callback-Framed" code="4"/>
 			<enum name="Outbound" code="5"/>
@@ -2314,11 +2315,11 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
 				<gavp name="Charging-Rule-Definition"/>
 				<gavp name="Charging-Rule-Name"/>
 				<gavp name="Charging-Rule-Base-Name"/>
-        <gavp name="Bearer-Identifier"/>
-        <gavp name="Rule-Activation-Time"/>
-        <gavp name="Rule-Deactivation-Time"/>
-        <gavp name="Resource-Allocation-Notification"/>
-      </grouped>
+				<gavp name="Bearer-Identifier"/>
+				<gavp name="Rule-Activation-Time"/>
+				<gavp name="Rule-Deactivation-Time"/>
+				<gavp name="Resource-Allocation-Notification"/>
+			</grouped>
 		</avp>
 		<avp name="Charging-Rule-Remove" code="1002" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<grouped>
@@ -2328,21 +2329,23 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
 		</avp>
 		<avp name="Charging-Rule-Definition" code="1003" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<grouped>
-        <gavp name="Charging-Rule-Name"/>
-        <gavp name="Service-Identifier"/>
-        <gavp name="Rating-Group"/>
-        <gavp name="Flow-Description"/>
-        <gavp name="Flow-Informatio"/>
-        <gavp name="Flow-Status"/>
-        <gavp name="QoS-Information"/>
-        <gavp name="Reporting-Level"/>
-        <gavp name="Online"/>
-        <gavp name="Offline"/>
-        <gavp name="Metering-Method"/>
-        <gavp name="Precedence"/>
-        <gavp name="AF-Charging-Identifier"/>
-        <gavp name="Flows"/>
-      </grouped>
+				<gavp name="Charging-Rule-Name"/>
+				<gavp name="Service-Identifier"/>
+				<gavp name="Rating-Group"/>
+				<gavp name="Flow-Description"/>
+				<gavp name="Flow-Information"/>
+				<gavp name="Flow-Status"/>
+				<gavp name="QoS-Information"/>
+				<gavp name="Reporting-Level"/>
+				<gavp name="Online"/>
+				<gavp name="Offline"/>
+				<gavp name="Metering-Method"/>
+				<gavp name="Precedence"/>
+				<gavp name="AF-Charging-Identifier"/>
+				<gavp name="Flows"/>
+				<gavp name="Monitoring-Key"/>
+				<gavp name="AF-Signalling-Protocol"/>
+			</grouped>
 		</avp>
 		<avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="UTF8String"/>
@@ -2352,40 +2355,46 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
 		</avp>
 		<avp name="Event-Trigger" code="1006" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
-			  <enum name="SGSN CHANGE" code="0"/>
-			  <enum name="QOS CHANGE" code="1"/>
-			  <enum name="RAT CHANGE" code="2"/>
-			  <enum name="TFT CHANGE" code="3"/>
-			  <enum name="PLMN CHANGE" code="4"/>
-        <enum name="LOSS_OF_BEARER" 				code="5"/>
-        <enum name="RECOVERY_OF_BEARER" 			code="6"/>
-        <enum name="IP-CAN_CHANGE"				code="7"/>
-        <enum name="GW-PCEF-MALFUNCTION"			code="8"/>
-        <enum name="RESOURCES_LIMITATION"			code="9"/>
-        <enum name="MAX_NR_BEARERS_REACHED"			code="10"/>
-        <enum name="QOS_CHANGE_EXCEEDING_AUTHORIZATION"		code="11"/>
-        <enum name="NO_EVENT_TRIGGER"				code="12"/>
-      <enum name="USER_LOCATION_CHANGE"				code="13"/>
-      <enum name="NO_EVENT_TRIGGERS"				code="14"/>
-      <enum name="OUT_OF_CREDIT"				code="15"/>
-      <enum name="REALLOCATION_OF_CREDIT"				code="16"/>
-      <enum name="REVALIDATION_TIMEOUT"				code="17"/>
-      <enum name="UE_IP_ADDRESS_ALLOCATE"				code="18"/>
-      <enum name="UE_IP_ADDRESS_RELEASE"				code="19"/>
-      <enum name="DEFAULT_EPS_BEARER_QOS_CHANGE"				code="20"/>
-      <enum name="AN_GW_CHANGE"				code="21"/>
-      <enum name="SUCCESSFUL_RESOURCE_ALLOCATION"				code="22"/>
-      <enum name="RESOURCE_MODIFICATION_REQUEST"				code="23"/>
-      <enum name="TFT DELETED" code="1000"/>
-			  <enum name="LOSS OF BEARER" code="1001"/>
-			  <enum name="RECOVERY OF BEARER" code="1002"/>
-			  <enum name="POLICY ENFORCEMENT FAILED" code="1003"/>
+			<enum name="SGSN CHANGE"				code="0"/>
+			<enum name="QOS CHANGE"					code="1"/>
+			<enum name="RAT CHANGE"					code="2"/>
+			<enum name="TFT CHANGE"					code="3"/>
+			<enum name="PLMN CHANGE"				code="4"/>
+			<enum name="LOSS_OF_BEARER" 				code="5"/>
+			<enum name="RECOVERY_OF_BEARER" 			code="6"/>
+			<enum name="IP-CAN_CHANGE"				code="7"/>
+			<enum name="GW-PCEF-MALFUNCTION"			code="8"/>
+			<enum name="RESOURCES_LIMITATION"			code="9"/>
+			<enum name="MAX_NR_BEARERS_REACHED"			code="10"/>
+			<enum name="QOS_CHANGE_EXCEEDING_AUTHORIZATION"		code="11"/>
+			<enum name="NO_EVENT_TRIGGER"				code="12"/>
+			<enum name="USER_LOCATION_CHANGE"			code="13"/>
+			<enum name="NO_EVENT_TRIGGERS"				code="14"/>
+			<enum name="OUT_OF_CREDIT"				code="15"/>
+			<enum name="REALLOCATION_OF_CREDIT"			code="16"/>
+			<enum name="REVALIDATION_TIMEOUT"			code="17"/>
+			<enum name="UE_IP_ADDRESS_ALLOCATE"			code="18"/>
+			<enum name="UE_IP_ADDRESS_RELEASE"			code="19"/>
+			<enum name="DEFAULT_EPS_BEARER_QOS_CHANGE"		code="20"/>
+			<enum name="AN_GW_CHANGE"				code="21"/>
+			<enum name="SUCCESSFUL_RESOURCE_ALLOCATION"		code="22"/>
+			<enum name="RESOURCE_MODIFICATION_REQUEST"		code="23"/>
+			<enum name="PGW_TRACE_CONTROL"				code="24"/>
+			<enum name="UE_TIME_ZONE_CHANGE"			code="25"/>
+			<enum name="USAGE_REPORT"				code="26"/>
+			<enum name="TAI_CHANGE"					code="27"/>
+			<enum name="ECGI_CHANGE"				code="28"/>
+			<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"/>
+			<enum name="POLICY ENFORCEMENT FAILED"			code="1003"/>
 		</avp>
 		<avp name="Metering-Method" code="1007" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
-			<enum name="DURATION" code="0" /> 
-			<enum name="VOLUME" code="1" />							
-			<enum name="DURATION_VOLUME" code="1" />			
+			<enum name="DURATION" code="0"/>
+			<enum name="VOLUME" code="1"/>
+			<enum name="DURATION_VOLUME" code="2"/>
 		</avp>
 		<avp name="Offline" code="1008" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
@@ -2412,17 +2421,17 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
 			<grouped>
 				<gavp name="Precedence"/>
 				<gavp name="TFT-Filter"/>
-        <gavp name="TOS-Traffic-Class"/>
-        <gavp name="Security-Parameter-Index"/>
-        <gavp name="Flow-Label"/>
-      </grouped>		
+				<gavp name="TOS-Traffic-Class"/>
+				<gavp name="Security-Parameter-Index"/>
+				<gavp name="Flow-Label"/>
+			</grouped>
 		</avp>
 		<avp name="ToS-Traffic-Class" code="1014" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
-		<type type-name="OctetString"/>
+			<type type-name="OctetString"/>
 		</avp>
 		<avp name="PDP-Session-operation" code="1015" vendor-id="TGPP" protected="may" mandatory="must"	may-encrypt="yes" vendor-bit="must">
 			<type type-name="Unsigned32" />	
-			<enum name="PDP-SESSION-TERMINATION" code="0" />								
+			<enum name="PDP-SESSION-TERMINATION" code="0"/>
 		</avp>
 		<avp name="QoS-Information" code="1016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<grouped>
@@ -2432,30 +2441,30 @@ Note: The AVP codes from 920 to 999 are reserved for TS 29.061
 				<gavp name="Guaranteed-Bitrate-UL"/>
 				<gavp name="Guaranteed-Bitrate-DL"/>
 				<gavp name="Bearer-Identifier"/>
-        <gavp name="Allocation-Retention-Priority"/>
-        <gavp name="APN-Aggregate-Max-Bitrate-UL"/>
-        <gavp name="APN-Aggregate-Max-Bitrate-DL"/>
-      </grouped>
+				<gavp name="Allocation-Retention-Priority"/>
+				<gavp name="APN-Aggregate-Max-Bitrate-UL"/>
+				<gavp name="APN-Aggregate-Max-Bitrate-DL"/>
+			</grouped>
 		</avp>
-   		<avp name="Charging-Rule-Report" code="1018" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Charging-Rule-Report" code="1018" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
 			<grouped>
 				<gavp name="Charging-Rule-Base-Name"/>
 				<gavp name="Charging-Rule-Name"/>
-        <gavp name="Bearer-Identifier"/>
-        <gavp name="PCC-Rule-Status"/>
-        <gavp name="Rule-Failure-Code"/>
-        <gavp name="Final-Unit-Indication"/>
-      </grouped>
+				<gavp name="Bearer-Identifier"/>
+				<gavp name="PCC-Rule-Status"/>
+				<gavp name="Rule-Failure-Code"/>
+				<gavp name="Final-Unit-Indication"/>
+			</grouped>
+		</avp>
+		<avp name="PCC-Rule-Status" code="1019" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="Unsigned32"/>
+			<enum name="ACTIVE"		code="0"/>
+			<enum name="INACTIVE"		code="1"/>
+			<enum name="TEMPORARY_INACTIVE"	code="2"/>
+		</avp>
+		<avp name="Bearer-Identifier" code="1020" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+			<type type-name="OctetString"/>
 		</avp>
-    <avp name="PCC-Rule-Status" code="1019" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-      <enum name="ACTIVE" 			code="0"/>
-      <enum name="INACTIVE" 	code="1"/>
-      <enum name="TEMPORARY_INACTIVE" 	code="2"/>
-    </avp>
-    <avp name="Bearer-Identifier" code="1020" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="OctetString"/>
-    </avp>
     <avp name="Bearer-Operation" code="1021" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
       <type type-name="Enumerated"/>
       <enum name="TERMINATION" 			code="0"/>