Add an SKT.xml file.

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

diff --git a/Makefile.am b/Makefile.am
index 6331a24fd7a3507b635d85776071dad4af2304f3..87db9dec6853c21e392bc5ba85004cdbb13a1d6f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,8 @@ diameter_DATA = \
        diameter/Vodafone.xml \
        diameter/AlcatelLucent.xml \
        diameter/Nokia.xml \
-       diameter/NokiaSiemensNetworks.xml
+       diameter/NokiaSiemensNetworks.xml \
+       diameter/SKT.xml
 
 #
 # Install the DTDs directory files in the "dtds" subdirectory

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 9e601e3219e3774f6015663a0f35e9d159800f63..93a870934775fc76004503d5bf77404cd8e9e52f 100644 (file)
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -28,7 +28,8 @@
        <!ENTITY Vodafone                     SYSTEM "Vodafone.xml">
        <!ENTITY AlcatelLucent          SYSTEM "AlcatelLucent.xml">
        <!ENTITY Nokia                        SYSTEM "Nokia.xml">
-       <!ENTITY NokiaSiemensNetworks   SYSTEM "NokiaSiemensNetworks.xml">
+  <!ENTITY NokiaSiemensNetworks        SYSTEM "NokiaSiemensNetworks.xml">
+  <!ENTITY SKT              SYSTEM "SKT.xml">
 ]>
 <dictionary>
        <base uri="http://www.ietf.org/rfc/rfc3588.txt">
@@ -2595,7 +2596,38 @@
                584 Key-Lifetime [RFC-ietf-dime-local-keytran-14]
                585 Key-SPI [RFC-ietf-dime-local-keytran-14]
                586 Key-Name [RFC-ietf-dime-local-keytran-14]
-               587-0xffffff Unassigned -->
+    587 IKEv2-Nonces [RFC6738] 
+    588 Ni [RFC6738] 
+    589 Nr [RFC6738] 
+    590 IKEv2-Identity [RFC6738] 
+    591 Initiator-Identity [RFC6738] 
+    592 ID-Type [RFC6738] 
+    593 Identification-Data [RFC6738] 
+    594 Responder-Identity [RFC6738] 
+    595 NC-Request-Type [RFC6736] 
+    596 NAT-Control-Install [RFC6736] 
+    597 NAT-Control-Remove [RFC6736] 
+    598 NAT-Control-Definition [RFC6736] 
+    599 NAT-Internal-Address [RFC6736] 
+    600 NAT-External-Address [RFC6736] 
+    601 Max-NAT-Bindings [RFC6736] 
+    602 NAT-Control-Binding-Template [RFC6736] 
+    603 Duplicate-Session-Id [RFC6736] 
+    604 NAT-External-Port-Style [RFC6736] 
+    605 NAT-Control-Record [RFC6736] 
+    606 NAT-Control-Binding-Status [RFC6736] 
+    607 Current-NAT-Bindings [RFC6736] 
+    608 Dual-Priority [RFC6735] 
+    609 Preemption-Priority [RFC6735] 
+    610 Defending-Priority [RFC6735] 
+    611 Admission-Priority [RFC6735] 
+    612 SIP-Resource-Priority [RFC6735] 
+    613 SIP-Resource-Priority-Namespace [RFC6735] 
+    614 SIP-Resource-Priority-Value [RFC6735] 
+    615 Application-Level-Resource-Priority [RFC6735] 
+    616 ALRP-Namespace [RFC6735] 
+    617 ALRP-Value [RFC6735] 
+    618-0xffffff Unassigned  -->
 
                <!-- **************************************************************************** -->
                <!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* -->
@@ -6291,4 +6323,5 @@
        &AlcatelLucent;
        &Nokia;
        &NokiaSiemensNetworks;
+  &SKT;
 </dictionary>

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index c38f3c63920241f6f144564b8794a9ea542eaca6..e974bb988648eb8a8f520b63bff85c4ed5d8cd35 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -425,6 +425,7 @@ File "..\..\diameter\Ericsson.xml"
 File "..\..\diameter\etsie2e4.xml"
 File "..\..\diameter\gqpolicy.xml"
 File "..\..\diameter\imscxdx.xml"
+File "..\..\diameter\SKT.xml"
 File "..\..\diameter\mobileipv4.xml"
 File "..\..\diameter\mobileipv6.xml"
 File "..\..\diameter\nasreq.xml"