Added Diameter AVP decode details for Override Control AVPs in the Cisco Systems XML file. Added a new file for Verizon specific AVPs via Verizon.xml. Added calls to Verizon XML in hte dictional XML file.

Change-Id: I30e9d80e6304b1b5c79367a752e239091c6ec171
Reviewed-on: https://code.wireshark.org/review/26594
Reviewed-by: Anders Broman <a.broman58@gmail.com>

3 files changed, 77 insertions, 8 deletions

diff --git a/diameter/CiscoSystems.xml b/diameter/CiscoSystems.xml
index 582f5321fb..bbf739dfad 100644
--- a/diameter/CiscoSystems.xml
+++ b/diameter/CiscoSystems.xml
@@ -68,37 +68,76 @@ http://www.cisco.com/c/dam/en/us/td/docs/wireless/asr_5000/20/AAA/20-AAA-Referen
 
   <avp name="Override-Control" code="132017" vendor-id="CiscoSystems">
     <grouped>
+      <gavp name="Override-Control-Name" />
+      <gavp name="Override-Rule-Name" />
       <gavp name="Override-Charging-Action-Parameters" />
     </grouped>
   </avp>
 
+  <avp name="Override-Rule-Name" code="132018" vendor-id="CiscoSystems" >
+    <type type-name="OctetString">
+  </avp>
+
   <avp name="Override-Charging-Action-Parameters" code="132019" vendor-id="CiscoSystems">
     <grouped>
+      <gavp name="Execution-Time" />
+      <gavp name="Override-Control-Pending-Queue-Action" />
+      <gavp name="Override-Charging-Action-Name" />
       <gavp name="Override-Charging-Action-Exclude-Rule" />
       <gavp name="Override-Charging-Parameters" />
+      <gavp name="Override-Policy-Parameters" />
     </grouped>
   </avp>
 
-  <avp name="Override-Charging-Action-Exclude-Rule" code="132021" vendor-id="CiscoSystems">
-    <type type-name="UTF8String"></type>
+  <avp name="Override-Charging-Action-Name" code="132020" vendor-id="CiscoSystems" >
+    <type type-name="OctetString">
+  </avp>
+
+  <avp name="Override-Charging-Action-Exclude-Rule" code="132021" vendor-id="CiscoSystems" >
+    <type type-name="UTF8String">
   </avp>
 
-  <avp name="Override-Charging-Parameters" code="132022" vendor-id="CiscoSystems">
+   <avp name="Override-Charging-Parameters" code="132022" vendor-id="CiscoSystems">
     <grouped>
+      <gavp name="Override-Service-Identifier" />
       <gavp name="Override-Rating-Group" />
+      <gavp name="Override-Online" />
+      <gavp name="Override-Offline" />
     </grouped>
   </avp>
 
-  <avp name="Override-Rating-Group" code="132024" vendor-id="CiscoSystems">
+  <avp name="Override-Service-Identifier" code="132023" vendor-id="CiscoSystems" >
     <type type-name="Unsigned32"></type>
   </avp>
 
-  <avp name="Override-Online" code="132026" vendor-id="CiscoSystems">
+  <avp name="Override-Rating-Group" code="132024" vendor-id="CiscoSystems" >
     <type type-name="Unsigned32"></type>
   </avp>
 
-  <avp name="Override-Offline" code="132027" vendor-id="CiscoSystems">
-    <type type-name="Unsigned32"></type>
+  <avp name="Execution-Time" code="132025" vendor-id="CiscoSystems" >
+    <type type-name="OctetString"></type>
+  </avp>
+
+  <avp name="Override-Online" code="132026" vendor-id="CiscoSystems" >
+  <type type-name="Enumerated"/>
+    <enum name="Disable-Online" code="0"/>
+    <enum name="Enable-Online" code="1"/>
+  </avp>
+
+  <avp name="Override-Offline" code="132027" vendor-id="CiscoSystems" >
+  <type type-name="Enumerated"/>
+    <enum name="Disable-Offline" code="0"/>
+    <enum name="Enable-Offline" code="1"/>
+  </avp>
+
+  <avp name="Override-Control-Name" code="132052" vendor-id="CiscoSystems" >
+    <type type-name="OctetString">
+  </avp>
+
+  <avp name="Override-Control-Pending-Queue-Action" code="132078" vendor-id="CiscoSystems" >
+  <type type-name="Enumerated"/>
+    <enum name="Flush" code="0"/>
+    <enum name="Retain" code="1"/>
   </avp>
 
 </vendor>
diff --git a/diameter/VerizonWireless.xml b/diameter/VerizonWireless.xml
new file mode 100755
index 0000000000..55acce9cf4
--- /dev/null
+++ b/diameter/VerizonWireless.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<vendor vendor-id="VerizonWireless" code="12951" name="Verizon Wireless">
+
+
+  <avp name="Charging-Gateway-Function-Host" vendor-id="VerizonWireless" code="6068" >
+    <type type-name="OctetString"/>
+  </avp>
+
+  <avp name="Charging-Group-ID" vendor-id="VerizonWireless" code="6069" >
+    <type type-name="OctetString"/>
+  </avp>
+
+  <avp name="Self-Activation-Status" code="6115" vendor-id="VerizonWireless" >
+    <type type-name="Enumerated"/>
+    <enum name="Continue" code="0"/>
+    <enum name="Reactivation-Disallowed-To-APN" code="1"/>
+  </avp>
+
+  <avp name="Origination-Timestamp" vendor-id="VerizonWireless" code="7102" >
+    <type type-name="Unsigned64"/>
+  </avp>
+
+  <avp name="Max-Wait-Time" code="7103" vendor-id="VerizonWireless" >
+    <type type-name="Unsigned32"/>
+  </avp>
+
+</vendor>
+
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 63b564d725..48d67da3d5 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -30,6 +30,7 @@
 	<!ENTITY Juniper		SYSTEM "Juniper.xml">
 	<!ENTITY Inovar			SYSTEM "Inovar.xml">
 	<!ENTITY Huawei			SYSTEM "Huawei.xml">
+	<!ENTITY VerizonWireless	SYSTEM "VerizonWireless.xml">
 	<!ENTITY Custom			SYSTEM "Custom.xml">
 ]>
 <dictionary>
@@ -8045,7 +8046,6 @@
 	<vendor vendor-id="Acision"			code="3830"	name="Acision"/>
 	<vendor vendor-id="SKT"				code="5806"	name="SK Telecom"/>
 	<vendor vendor-id="TGPP"			code="10415"	name="3GPP"/>
-	<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="ChinaTelecom"		code="81000"	name="China Telecom"/>
@@ -8076,4 +8076,5 @@
 	&Inovar;
 	&Huawei;
 	&Custom;
+	&Verizon;
 </dictionary>