Make it easier to add custom (proprietary) Diameter XML files.
authorJeff Morriss <jeff.morriss.ws@gmail.com>
Thu, 25 Jul 2013 15:40:39 +0000 (15:40 -0000)
committerJeff Morriss <jeff.morriss.ws@gmail.com>
Thu, 25 Jul 2013 15:40:39 +0000 (15:40 -0000)
svn path=/trunk/; revision=50889

Makefile.am
diameter/Custom.xml [new file with mode: 0644]
diameter/dictionary.xml
packaging/nsis/wireshark.nsi

index 0a1707f66339af1432ab99e09f59e9153f410128..586c2b17f14a7ffb41df03fc151b848166be7417 100644 (file)
@@ -75,6 +75,7 @@ dist_diameter_DATA = \
        diameter/chargecontrol.xml \
        diameter/ChinaTelecom.xml \
        diameter/Cisco.xml \
+       diameter/Custom.xml \
        diameter/dictionary.dtd \
        diameter/dictionary.xml \
        diameter/eap.xml \
diff --git a/diameter/Custom.xml b/diameter/Custom.xml
new file mode 100644 (file)
index 0000000..7b672c0
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Id$ -->
+
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd" [
+       <!-- Any files added here need to be added to Makefile.am and
+            packaging/nsis/wireshark.nsi if you want them to be distributed
+       -->
+
+    <!-- create entities like this:
+       <!ENTITY myEntity               SYSTEM "myFile.xml">
+    -->
+]>
+
+<dictionary>
+    <!-- and then add the entity here:
+       &myEntity;
+    -->
+</dictionary>
index f9243ded19b21058e5ed12ae6167e8c92d1946ce..a73b17005de014a6941b8b879174f60090850d0d 100644 (file)
@@ -31,7 +31,8 @@
        <!ENTITY NokiaSiemensNetworks   SYSTEM "NokiaSiemensNetworks.xml">
        <!ENTITY SKT                    SYSTEM "SKT.xml">
        <!ENTITY ChinaTelecom           SYSTEM "ChinaTelecom.xml">
-       <!ENTITY VerizonWireless                SYSTEM "VerizonWireless.xml">
+       <!ENTITY VerizonWireless        SYSTEM "VerizonWireless.xml">
+       <!ENTITY Custom                 SYSTEM "Custom.xml">
 ]>
 <dictionary>
        <base uri="http://www.ietf.org/rfc/rfc3588.txt">
        &SKT;
        &ChinaTelecom;
        &VerizonWireless;
+       &Custom;
 </dictionary>
index 8577fbf2d6dfed6648304611d41a31cd0c4df6ec..e32b782a4ab10cee1e9cbc99a2ce74239afd15f4 100644 (file)
@@ -174,7 +174,7 @@ Function Associate
 !insertmacro PushFileExtensions
 
        Pop $EXTENSION
-       
+
        ${DoUntil} $EXTENSION == ${FILE_EXTENSION_MARKER}
                ReadRegStr $R0 HKCR $EXTENSION ""
                StrCmp $R0 "" Associate.doRegister
@@ -420,6 +420,7 @@ File "..\..\diameter\AlcatelLucent.xml"
 File "..\..\diameter\chargecontrol.xml"
 File "..\..\diameter\ChinaTelecom.xml"
 File "..\..\diameter\Cisco.xml"
+File "..\..\diameter\Custom.xml"
 File "..\..\diameter\dictionary.dtd"
 File "..\..\diameter\dictionary.xml"
 File "..\..\diameter\eap.xml"
@@ -835,7 +836,7 @@ SectionEnd
 !ifdef QT_DIR
 Section "QtShark (Experimental)" SecQtshark
 ;-------------------------------------------
-; by default, QtShark is not installed  
+; by default, QtShark is not installed
 SetOutPath $INSTDIR
 File "${QT_DIR}\qtshark.exe"
 File "${QT_DIR}\QtCore4.dll"