diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-12-07 23:20:11 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-12-07 23:20:11 +0000 |
| commit | fa92d58b4050be3ec86227619e0cb08debb7e222 (patch) | |
| tree | 46169c3c7d610ad5d8c47911a9aa4c424f196c38 /asn1/dap | |
| parent | 55d5c5cc6649c58e27d9441d3161b72a391af82d (diff) | |
| download | wireshark-fa92d58b4050be3ec86227619e0cb08debb7e222.tar.gz | |
From Grame Lunt:
updated X.500 dissectors to include DOP support.
The "dop" dissector is the renamed "x501" dissector consequently the asn/x501 directory should be removed. The patch includes the changes to epan/dissectors/Makefile.common to reflect this.
As the DOP dissection is not fully tested, I have disabled it by default for now (like DSP) but it can be enabled by the user.
svn path=/trunk/; revision=16726
Diffstat (limited to 'asn1/dap')
| -rw-r--r-- | asn1/dap/Makefile.nmake | 42 | ||||
| -rw-r--r-- | asn1/dap/packet-dap-template.c | 5 |
2 files changed, 46 insertions, 1 deletions
diff --git a/asn1/dap/Makefile.nmake b/asn1/dap/Makefile.nmake new file mode 100644 index 0000000000..08b0f84edf --- /dev/null +++ b/asn1/dap/Makefile.nmake @@ -0,0 +1,42 @@ +## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake +# +# $Id$ + +include ../../config.nmake + +UNIX2DOS=$(PERL) ../../tools/unix2dos.pl + +PROTOCOL_NAME=dap +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h + +all: generate_dissector + +generate_dissector: $(DISSECTOR_FILES) + +$(DISSECTOR_FILES): ../../tools/asn2eth.py dap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +!IFDEF PYTHON + $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template dap.asn +!ELSE + @echo Error: You need Python to use asn2eth.py + @exit 1 +!ENDIF + +clean: + rm -f parsetab.py $(DISSECTOR_FILES) + +# Fix EOL in generated dissectors. Cygwin's python generates files with +# mixed EOL styles, which can't be commited to the SVN repository. +# Stuff included from template and "cnf" files has "\r\n" on windows, while +# the generated stuff has "\n". + +fix_eol: generate_dissector + move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp + move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp + $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c + $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h + del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp + +copy_files: generate_dissector fix_eol + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y + diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c index f41da67774..695e5f0484 100644 --- a/asn1/dap/packet-dap-template.c +++ b/asn1/dap/packet-dap-template.c @@ -48,7 +48,6 @@ #include "packet-dap.h" #include <epan/strutil.h> - /* we don't have a separate dissector for X519 - most of DAP is defined in X511 */ #define PNAME "X.519 Directory Access Protocol" @@ -294,7 +293,11 @@ void proto_register_dap(void) { /* Register our configuration options for DAP, particularly our port */ +#ifdef PREFERENCE_GROUPING + dap_module = prefs_register_protocol_subtree("OSI/X.500", proto_dap, prefs_register_dap); +#else dap_module = prefs_register_protocol(proto_dap, prefs_register_dap); +#endif prefs_register_uint_preference(dap_module, "tcp.port", "DAP TCP Port", "Set the port for DAP operations (if other" |