From 1bc6d4e96573f89ecdd719cb3cac92754b91f52c Mon Sep 17 00:00:00 2001
From: Jeff Dyer <jmasterfunk@gmail.com>
Date: Fri, 27 Oct 2017 12:33:50 -0600
Subject: [PATCH] Diameter: Add Huawei DCC AVPs

Change-Id: I480e58a1676677bb362bb4e9dc866c5d5f0814e1
Reviewed-on: https://code.wireshark.org/review/24111
Reviewed-by: Jeff Dyer <jmasterfunk@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 Makefile.am                  |  1 +
 diameter/Huawei.xml          | 57 ++++++++++++++++++++++++++++++++++++
 diameter/dictionary.xml      |  2 ++
 packaging/nsis/wireshark.nsi |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 diameter/Huawei.xml

diff --git a/Makefile.am b/Makefile.am
index a182ed0900..f5aef660a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,6 +100,7 @@ dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
 	diameter/Nokia.xml \
 	diameter/NokiaSolutionsAndNetworks.xml \
 	diameter/HP.xml \
+	diameter/Huawei.xml \
 	diameter/Oracle.xml
 
 #
diff --git a/diameter/Huawei.xml b/diameter/Huawei.xml
new file mode 100644
index 0000000000..ca68610282
--- /dev/null
+++ b/diameter/Huawei.xml
@@ -0,0 +1,57 @@
+<vendor vendor-id="Huawei"                    code="2011"      name="Huawei">
+  <avp name="P2PSMS-Information" code="20400" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <grouped>
+      <gavp name="SMSC-Address"/>
+      <gavp name="SM-Id"/>
+      <gavp name="SM-Length"/>
+    </grouped>
+  </avp>
+  <avp name="SMSC-Address" code="20401" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="UTF8String"/>
+  </avp>
+  <avp name="SM-Id" code="20402" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="UTF8String"/>
+  </avp>
+  <avp name="SM-Length" code="20403" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="Unsigned32"/>
+  </avp>
+  <avp name="MO-MSC-Address" code="20404" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="UTF8String"/>
+  </avp>
+  <avp name="MT-MSC-Address" code="20405" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="UTF8String"/>
+  </avp>
+  <avp name="Source-Addr" code="20406" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="UTF8String"/>
+  </avp>
+  <avp name="Dest-Addr" code="20407" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="UTF8String"/>
+  </avp>
+  <avp name="Fee-Flag" code="20409" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="Enumerated"/>
+    <enum name="Charge in the original mode" code="0"/>
+    <enum name="Charge the calling number" code="1"/>
+    <enum name="Charge the called number" code="2"/>
+    <enum name="Charge the charging number" code="3"/>
+  </avp>
+  <avp name="Fee-Type" code="20410" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="Enumerated"/>
+    <enum name="Charge by default mode" code="0"/>
+    <enum name="Charge by item" code="1"/>
+    <enum name="Charge by month (with authentication and fee deduction)" code="2"/>
+    <enum name="Charge by month (with authentication but no fee deduction)" code="3"/>
+    <enum name="Charge upper limit amount by the number of SMs" code="4"/>
+    <enum name="Charge by month with limited number of SMs (with authentication and fee deduction)" code="5"/>
+    <enum name="Charge by month with limited number of SMs (with authentication but no fee deduction)" code="6"/>
+  </avp>
+  <avp name="Status-Report-Requested" code="20415" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="Enumerated"/>
+    <enum name="No" code="0"/>
+    <enum name="Yes" code="1"/>
+    <enum name="Refund on Failure" code="2"/>
+  </avp>
+  <avp name="Send-Result" code="20418" mandatory="no" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="Huawei">
+    <type type-name="Enumerated"/>
+    <enum name="Delivered" code="0"/>
+  </avp>
+</vendor>
\ No newline at end of file
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 4a8e0de08d..a0f1d3dd83 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -29,6 +29,7 @@
 	<!ENTITY Oracle			SYSTEM "Oracle.xml">
 	<!ENTITY Juniper		SYSTEM "Juniper.xml">
 	<!ENTITY Inovar			SYSTEM "Inovar.xml">
+	<!ENTITY Huawei			SYSTEM "Huawei.xml">
 	<!ENTITY Custom			SYSTEM "Custom.xml">
 ]>
 <dictionary>
@@ -7990,5 +7991,6 @@
 	&CiscoSystems;
 	&Juniper;
 	&Inovar;
+	&Huawei;
 	&Custom;
 </dictionary>
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 422c1ea646..0bf1a25225 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -517,6 +517,7 @@ File "${STAGING_DIR}\diameter\eap.xml"
 File "${STAGING_DIR}\diameter\Ericsson.xml"
 File "${STAGING_DIR}\diameter\etsie2e4.xml"
 File "${STAGING_DIR}\diameter\HP.xml"
+File "${STAGING_DIR}\diameter\Huawei.xml"
 File "${STAGING_DIR}\diameter\Inovar.xml"
 File "${STAGING_DIR}\diameter\Juniper.xml"
 File "${STAGING_DIR}\diameter\mobileipv4.xml"