diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-25 15:40:39 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-25 15:40:39 +0000 |
| commit | 35e220513c74aa8715d5e734b1c9f6e490b693d4 (patch) | |
| tree | b3394ba2597d5a077743b659096edd38e441992f | |
| parent | cb12fbb78cd40b91dc1f28db9d301725582ff687 (diff) | |
| download | wireshark-35e220513c74aa8715d5e734b1c9f6e490b693d4.tar.gz | |
Make it easier to add custom (proprietary) Diameter XML files.
svn path=/trunk/; revision=50889
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | diameter/Custom.xml | 18 | ||||
| -rw-r--r-- | diameter/dictionary.xml | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 5 |
4 files changed, 25 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 0a1707f663..586c2b17f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 index 0000000000..7b672c0e05 --- /dev/null +++ b/diameter/Custom.xml @@ -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> diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index f9243ded19..a73b17005d 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -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"> @@ -6581,4 +6582,5 @@ &SKT; &ChinaTelecom; &VerizonWireless; + &Custom; </dictionary> diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 8577fbf2d6..e32b782a4a 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -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" |