Add CiscoSystems, vendor id 9 AVPs

Bug 12459
Change-Id: I9ebe7f4a9e6ae03539bd74e535c95c85a8efa55b
Reviewed-on: https://code.wireshark.org/review/15506
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

4 files changed, 72 insertions, 0 deletions

diff --git a/Makefile.am b/Makefile.am
index a7387d6f8e..85a30dc827 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,6 +74,7 @@ include diameter/Custom.make
 dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
 	diameter/chargecontrol.xml \
 	diameter/Cisco.xml \
+	diameter/CiscoSystems.xml \
 	diameter/Custom.xml \
 	diameter/dictionary.dtd \
 	diameter/dictionary.xml \
diff --git a/diameter/CiscoSystems.xml b/diameter/CiscoSystems.xml
new file mode 100644
index 0000000000..a44c1a6aed
--- /dev/null
+++ b/diameter/CiscoSystems.xml
@@ -0,0 +1,68 @@
+<!--
+Ref:
+http://www.cisco.com/c/dam/en/us/td/docs/wireless/asr_5000/20/AAA/20-AAA-Reference.pdf
+-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<vendor vendor-id="CiscoSystems" code="9" name="Cisco">
+  <avp name="DSCP" vendor-id="CiscoSystems" code="131178" >
+    <type type-name="Unsigned32" />
+  </avp>
+
+  <avp name="Rate-Limit-Action" code="131177" vendor-id="CiscoSystems" >
+    <type type-name="Unsigned32"/>
+    <enum name="FORWARD" code="0"></enum>
+    <enum name="DROP" code="1"></enum>
+    <enum name="MARK_DSCP" code="2"></enum>
+  </avp>
+
+  <avp name="QoS-Group-Rule-Install" vendor-id="CiscoSystems" code="132001" >
+    <grouped>
+      <gavp name="QoS-Group-Rule-Definition" />
+    </grouped>
+  </avp>
+
+
+  <avp name="QoS-Group-Rule-Definition" code="132003" vendor-id="CiscoSystems">
+    <grouped>
+      <gavp name="QoS-Group-Rule-Name" />
+      <gavp name="Flow-Status" />
+      <gavp name="QoS-Information" />
+      <gavp name="Redirect-Server" />
+      <gavp name="Monitoring-Key" />
+      <gavp name="Precedence" />
+    </grouped>
+  </avp>
+
+  <avp name="QoS-Group-Rule-Name" vendor-id="CiscoSystems" code="132004" >
+    <type type-name="OctetString" />
+  </avp>
+
+  <avp name="MBR-Limit-Exceed-Action-UL" vendor-id="CiscoSystems" code="132006" >
+    <grouped>
+      <gavp name="Rate-Limit-Action" />
+      <gavp name="DSCP" />
+    </grouped>
+  </avp>
+
+  <avp name="MBR-Limit-Exceed-Action-DL" vendor-id="CiscoSystems" code="132008" >
+    <grouped>
+      <gavp name="Rate-Limit-Action" />
+      <gavp name="DSCP" />
+    </grouped>
+  </avp>
+
+  <avp name="MBR-Burst-Size-UL" vendor-id="CiscoSystems" code="132009" >
+    <type type-name="Unsigned32" />
+  </avp>
+
+  <avp name="MBR-Burst-Size-DL" vendor-id="CiscoSystems" code="132010" >
+    <type type-name="Unsigned32" />
+  </avp>
+
+  <avp name="QoS-Level" code="132011" vendor-id="CiscoSystems" >
+    <type type-name="Unsigned32"></type>
+    <enum name="SUBSCRIBER_LEVEL" code="1"></enum>
+  </avp>
+
+</vendor>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 5abbc1bde5..b8bcaf2fd8 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -25,6 +25,7 @@
 	<!ENTITY Nokia			SYSTEM "Nokia.xml">
 	<!ENTITY NokiaSolutionsAndNetworks	SYSTEM "NokiaSolutionsAndNetworks.xml">
 	<!ENTITY HP			SYSTEM "HP.xml">
+	<!ENTITY CiscoSystems			SYSTEM "CiscoSystems.xml">
 	<!ENTITY Oracle			SYSTEM "Oracle.xml">
 	<!ENTITY Custom			SYSTEM "Custom.xml">
 ]>
@@ -6988,5 +6989,6 @@
 	&NokiaSolutionsAndNetworks;
 	&HP;
 	&Oracle;
+	&CiscoSystems;
 	&Custom;
 </dictionary>
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 48a9484e06..c2a27f9a0d 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -437,6 +437,7 @@ SetOutPath $INSTDIR\diameter
 File "${STAGING_DIR}\diameter\AlcatelLucent.xml"
 File "${STAGING_DIR}\diameter\chargecontrol.xml"
 File "${STAGING_DIR}\diameter\Cisco.xml"
+File "${STAGING_DIR}\diameter\CiscoSystems.xml"
 File "${STAGING_DIR}\diameter\Custom.xml"
 File "${STAGING_DIR}\diameter\dictionary.dtd"
 File "${STAGING_DIR}\diameter\dictionary.xml"