diff options
117 files changed, 292 insertions, 291 deletions
diff --git a/asn1/MAP_Dialogue/Makefile b/asn1/MAP_Dialogue/Makefile index 157d52c54a..c25a1536f1 100644 --- a/asn1/MAP_Dialogue/Makefile +++ b/asn1/MAP_Dialogue/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf - python ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf + python ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/MAP_Dialogue/Makefile.nmake b/asn1/MAP_Dialogue/Makefile.nmake index a5eefb40df..9a2b76a0a0 100644 --- a/asn1/MAP_Dialogue/Makefile.nmake +++ b/asn1/MAP_Dialogue/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/acp133/Makefile b/asn1/acp133/Makefile index 3d8006e708..0cbbf3a308 100644 --- a/asn1/acp133/Makefile +++ b/asn1/acp133/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py acp133.asn packet-acp133-template.c packet-acp133-template.h acp133.cnf - python ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py acp133.asn packet-acp133-template.c packet-acp133-template.h acp133.cnf + python ../../tools/asn2wrs.py -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/acp133/Makefile.nmake b/asn1/acp133/Makefile.nmake index 8a9117e62f..9d48fd3eed 100644 --- a/asn1/acp133/Makefile.nmake +++ b/asn1/acp133/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py acp133.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py acp133.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 acp133.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template acp133.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/acse/Makefile b/asn1/acse/Makefile index 15b28f40c5..fad9cb2656 100644 --- a/asn1/acse/Makefile +++ b/asn1/acse/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py acse.asn packet-acse-template.c packet-acse-template.h acse.cnf - python ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py acse.asn packet-acse-template.c packet-acse-template.h acse.cnf + python ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/acse/Makefile.nmake b/asn1/acse/Makefile.nmake index b885019c81..c3881d5e8d 100644 --- a/asn1/acse/Makefile.nmake +++ b/asn1/acse/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py acse.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py acse.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 acse.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template acse.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ansi_map/Makefile.nmake b/asn1/ansi_map/Makefile.nmake index dc567c134a..3534f412be 100644 --- a/asn1/ansi_map/Makefile.nmake +++ b/asn1/ansi_map/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ansi_map.asn packet-ansi_map-template.c packet-ansi_map-template.h ansi_map.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ansi_map.asn packet-ansi_map-template.c packet-ansi_map-template.h ansi_map.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c ansi_map.cnf -s packet-ansi_map-template ansi_map.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c ansi_map.cnf -s packet-ansi_map-template ansi_map.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/camel/Makefile b/asn1/camel/Makefile index 084f33c696..44401f121d 100644 --- a/asn1/camel/Makefile +++ b/asn1/camel/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $ +# $Id$ DISSECTOR_FILES=packet-camel.c packet-camel.h @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py camel.asn packet-camel-template.c packet-camel-template.h camel.cnf - python ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py camel.asn packet-camel-template.c packet-camel-template.h camel.cnf + python ../../tools/asn2wrs.py -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/camel/Makefile.nmake b/asn1/camel/Makefile.nmake index 7bf0a4f898..db007918ca 100644 --- a/asn1/camel/Makefile.nmake +++ b/asn1/camel/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py camel.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h camel.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py camel.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h camel.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c camel.cnf -s packet-$(PROTOCOL_NAME)-template camel.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c camel.cnf -s packet-$(PROTOCOL_NAME)-template camel.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/cdt/Makefile b/asn1/cdt/Makefile index 637f956215..7af8184c08 100644 --- a/asn1/cdt/Makefile +++ b/asn1/cdt/Makefile @@ -7,8 +7,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf - python ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf + python ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/cdt/Makefile.nmake b/asn1/cdt/Makefile.nmake index 2d5cc9fca9..6c1c2c50f0 100644 --- a/asn1/cdt/Makefile.nmake +++ b/asn1/cdt/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).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 $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/cmip/Makefile b/asn1/cmip/Makefile index 5c6d0f17cf..82e1df371c 100644 --- a/asn1/cmip/Makefile +++ b/asn1/cmip/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CMIP.asn packet-cmip-template.c packet-cmip-template.h cmip.cnf - python ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CMIP.asn packet-cmip-template.c packet-cmip-template.h cmip.cnf + python ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn clean: rm -f cmip-exp.cnf parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/cmip/Makefile.nmake b/asn1/cmip/Makefile.nmake index 61a3047cef..9e6dd57aed 100644 --- a/asn1/cmip/Makefile.nmake +++ b/asn1/cmip/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CMIP.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CMIP.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 CMIP.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template CMIP.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/cms/Makefile b/asn1/cms/Makefile index 34b63ea496..9d26e78416 100644 --- a/asn1/cms/Makefile +++ b/asn1/cms/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CryptographicMessageSyntax.asn packet-cms-template.c packet-cms-template.h cms.cnf - python ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CryptographicMessageSyntax.asn packet-cms-template.c packet-cms-template.h cms.cnf + python ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/cms/Makefile.nmake b/asn1/cms/Makefile.nmake index d237f6a6a1..d3f7f5e1cb 100644 --- a/asn1/cms/Makefile.nmake +++ b/asn1/cms/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CryptographicMessageSyntax.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CryptographicMessageSyntax.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 CryptographicMessageSyntax.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template CryptographicMessageSyntax.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/dap/Makefile b/asn1/dap/Makefile index 846e6d2ba7..29efc47bf8 100644 --- a/asn1/dap/Makefile +++ b/asn1/dap/Makefile @@ -12,8 +12,8 @@ ASN_EXPORTS= ../x509if/x509if-exp.cnf \ ../ros/ros-exp.cnf \ ../acse/acse-exp.cnf -$(DISSECTOR_FILES): ../../tools/asn2eth.py dap.asn packet-dap-template.c packet-dap-template.h dap.cnf $(ASN_EXPORTS) - python ../../tools/asn2eth.py -X -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py dap.asn packet-dap-template.c packet-dap-template.h dap.cnf $(ASN_EXPORTS) + python ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/dap/Makefile.nmake b/asn1/dap/Makefile.nmake index 913520c887..1e0eca3084 100644 --- a/asn1/dap/Makefile.nmake +++ b/asn1/dap/Makefile.nmake @@ -13,11 +13,11 @@ 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 +$(DISSECTOR_FILES): ../../tools/asn2wrs.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 + $(PYTHON) ../../tools/asn2wrs.py -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 + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/disp/Makefile b/asn1/disp/Makefile index b1e8aba561..41c2e591ae 100644 --- a/asn1/disp/Makefile +++ b/asn1/disp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py disp.asn packet-disp-template.c packet-disp-template.h disp.cnf - python ../../tools/asn2eth.py -X -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py disp.asn packet-disp-template.c packet-disp-template.h disp.cnf + python ../../tools/asn2wrs.py -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) *~ diff --git a/asn1/disp/Makefile.nmake b/asn1/disp/Makefile.nmake index 095dc5d8fd..03d412e679 100644 --- a/asn1/disp/Makefile.nmake +++ b/asn1/disp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py disp.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py disp.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 disp.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template disp.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/dop/Makefile b/asn1/dop/Makefile index cf3838522e..2e6d8677da 100644 --- a/asn1/dop/Makefile +++ b/asn1/dop/Makefile @@ -8,8 +8,8 @@ generate_dissector: $(DISSECTOR_FILES) ASN_EXPORTS= -$(DISSECTOR_FILES): ../../tools/asn2eth.py dop.asn packet-dop-template.c packet-dop-template.h dop.cnf $(ASN_EXPORTS) - python ../../tools/asn2eth.py -X -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py dop.asn packet-dop-template.c packet-dop-template.h dop.cnf $(ASN_EXPORTS) + python ../../tools/asn2wrs.py -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) *~ diff --git a/asn1/dop/Makefile.nmake b/asn1/dop/Makefile.nmake index 7e6241aef0..4a6baaf501 100644 --- a/asn1/dop/Makefile.nmake +++ b/asn1/dop/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py dop.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py dop.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 dop.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template dop.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/dsp/Makefile b/asn1/dsp/Makefile index 24e2417d25..32de3cbf17 100644 --- a/asn1/dsp/Makefile +++ b/asn1/dsp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py dsp.asn packet-dsp-template.c packet-dsp-template.h dsp.cnf ../x411/x411-exp.cnf - python ../../tools/asn2eth.py -X -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py dsp.asn packet-dsp-template.c packet-dsp-template.h dsp.cnf ../x411/x411-exp.cnf + python ../../tools/asn2wrs.py -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) *~ diff --git a/asn1/dsp/Makefile.nmake b/asn1/dsp/Makefile.nmake index 32f0f05f43..78532c7f03 100644 --- a/asn1/dsp/Makefile.nmake +++ b/asn1/dsp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py dsp.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py dsp.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 dsp.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template dsp.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ess/Makefile b/asn1/ess/Makefile index dc0106a462..050f51d6ad 100644 --- a/asn1/ess/Makefile +++ b/asn1/ess/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ExtendedSecurityServices.asn packet-ess-template.c packet-ess-template.h ess.cnf - python ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ExtendedSecurityServices.asn packet-ess-template.c packet-ess-template.h ess.cnf + python ../../tools/asn2wrs.py -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) \ diff --git a/asn1/ess/Makefile.nmake b/asn1/ess/Makefile.nmake index 2f9955627a..935e691836 100644 --- a/asn1/ess/Makefile.nmake +++ b/asn1/ess/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ExtendedSecurityServices.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ExtendedSecurityServices.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -k -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template ExtendedSecurityServices.asn + $(PYTHON) ../../tools/asn2wrs.py -b -k -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template ExtendedSecurityServices.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ftam/Makefile b/asn1/ftam/Makefile index 3fa711079b..59a2464ec8 100644 --- a/asn1/ftam/Makefile +++ b/asn1/ftam/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ISO8571-FTAM.asn packet-ftam-template.c packet-ftam-template.h ftam.cnf - python ../../tools/asn2eth.py -X -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8571-FTAM.asn packet-ftam-template.c packet-ftam-template.h ftam.cnf + python ../../tools/asn2wrs.py -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ftam/Makefile.nmake b/asn1/ftam/Makefile.nmake index dda8a0d7a9..5f54ad3f56 100644 --- a/asn1/ftam/Makefile.nmake +++ b/asn1/ftam/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ISO8571-FTAM.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8571-FTAM.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 ISO8571-FTAM.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template ISO8571-FTAM.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ftbp/Makefile b/asn1/ftbp/Makefile index 410a2fb3b4..b493341b2e 100644 --- a/asn1/ftbp/Makefile +++ b/asn1/ftbp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ftbp.asn packet-ftbp-template.c packet-ftbp-template.h ftbp.cnf - python ../../tools/asn2eth.py -X -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ftbp.asn packet-ftbp-template.c packet-ftbp-template.h ftbp.cnf + python ../../tools/asn2wrs.py -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ftbp/Makefile.nmake b/asn1/ftbp/Makefile.nmake index ef66e7ec40..84a52c92f8 100644 --- a/asn1/ftbp/Makefile.nmake +++ b/asn1/ftbp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ftbp.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ftbp.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 ftbp.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template ftbp.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/gnm/Makefile b/asn1/gnm/Makefile index 3342f79c35..0785c1a41d 100644 --- a/asn1/gnm/Makefile +++ b/asn1/gnm/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py GNM.asn packet-gnm-template.c packet-gnm-template.h gnm.cnf - python ../../tools/asn2eth.py -X -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py GNM.asn packet-gnm-template.c packet-gnm-template.h gnm.cnf + python ../../tools/asn2wrs.py -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/gnm/Makefile.nmake b/asn1/gnm/Makefile.nmake index a680e3dcec..5a4883c770 100644 --- a/asn1/gnm/Makefile.nmake +++ b/asn1/gnm/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py GNM.asn packet-gnm-template.c packet-gnm-template.h gnm.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py GNM.asn packet-gnm-template.c packet-gnm-template.h gnm.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c gnm.cnf -s packet-gnm-template GNM.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c gnm.cnf -s packet-gnm-template GNM.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/gsm_ss/Makefile b/asn1/gsm_ss/Makefile index bb1916a3eb..d00a116fbf 100644 --- a/asn1/gsm_ss/Makefile +++ b/asn1/gsm_ss/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py SS-Operations.asn packet-gsm_ss-template.c packet-gsm_ss-template.h gsm_ss.cnf - python ../../tools/asn2eth.py -X -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py SS-Operations.asn packet-gsm_ss-template.c packet-gsm_ss-template.h gsm_ss.cnf + python ../../tools/asn2wrs.py -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/gsm_ss/Makefile.nmake b/asn1/gsm_ss/Makefile.nmake index 339daaa75c..a425aa0325 100644 --- a/asn1/gsm_ss/Makefile.nmake +++ b/asn1/gsm_ss/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py SS-Operations.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h gsm_ss.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py SS-Operations.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h gsm_ss.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c gsm_ss.cnf -s packet-$(PROTOCOL_NAME)-template SS-Operations.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c gsm_ss.cnf -s packet-$(PROTOCOL_NAME)-template SS-Operations.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/gsmmap/Makefile b/asn1/gsmmap/Makefile index a325132824..e73ca44446 100644 --- a/asn1/gsmmap/Makefile +++ b/asn1/gsmmap/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py GSMMAP.asn packet-gsm_map-template.c packet-gsm_map-template.h gsmmap.cnf - python ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py GSMMAP.asn packet-gsm_map-template.c packet-gsm_map-template.h gsmmap.cnf + python ../../tools/asn2wrs.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/gsmmap/Makefile.nmake b/asn1/gsmmap/Makefile.nmake index 589ca2cc43..9cd234eaed 100644 --- a/asn1/gsmmap/Makefile.nmake +++ b/asn1/gsmmap/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py GSMMAP.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h gsmmap.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py GSMMAP.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h gsmmap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -b -e -p $(PROTOCOL_NAME) -c gsmmap.cnf -s packet-$(PROTOCOL_NAME)-template GSMMAP.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c gsmmap.cnf -s packet-$(PROTOCOL_NAME)-template GSMMAP.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/h225/Makefile b/asn1/h225/Makefile index 5f580777b5..c9666803cd 100644 --- a/asn1/h225/Makefile +++ b/asn1/h225/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py h225.asn packet-h225-template.c packet-h225-template.h h225.cnf - python ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py h225.asn packet-h225-template.c packet-h225-template.h h225.cnf + python ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 29598c7498..2eb38a3158 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn $(PROTOCOL_NAME).cnf packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).asn $(PROTOCOL_NAME).cnf packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/h235/Makefile b/asn1/h235/Makefile index d5d5d14c2b..946fad2430 100644 --- a/asn1/h235/Makefile +++ b/asn1/h235/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py packet-h235-template.c packet-h235-template.h h235.cnf - python ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-h235-template.c packet-h235-template.h h235.cnf + python ../../tools/asn2wrs.py -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/h235/Makefile.nmake b/asn1/h235/Makefile.nmake index e521711e23..eda21f8e1e 100644 --- a/asn1/h235/Makefile.nmake +++ b/asn1/h235/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py H235-SECURITY-MESSAGES.asn H235-SRTP.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py H235-SECURITY-MESSAGES.asn H235-SRTP.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template H235-SECURITY-MESSAGES.asn H235-SRTP.asn + $(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template H235-SECURITY-MESSAGES.asn H235-SRTP.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/h245/Makefile b/asn1/h245/Makefile index 83d13d5bf2..523d9e2c13 100644 --- a/asn1/h245/Makefile +++ b/asn1/h245/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py packet-h245-template.c packet-h245-template.h h245.cnf - python ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-h245-template.c packet-h245-template.h h245.cnf + python ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/h245/Makefile.nmake b/asn1/h245/Makefile.nmake index 4745e7acf9..e64cc7a21f 100644 --- a/asn1/h245/Makefile.nmake +++ b/asn1/h245/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn $(PROTOCOL_NAME).cnf packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).asn $(PROTOCOL_NAME).cnf packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/h248/Makefile b/asn1/h248/Makefile index b6a2456276..edb2e2bb31 100644 --- a/asn1/h248/Makefile +++ b/asn1/h248/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py MEGACO.asn packet-h248-template.c packet-h248-template.h h248.cnf - python ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py MEGACO.asn packet-h248-template.c packet-h248-template.h h248.cnf + python ../../tools/asn2wrs.py -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) *-fn.c *-ett.c *-hf.c diff --git a/asn1/h248/Makefile.nmake b/asn1/h248/Makefile.nmake index 23c06ae9ec..53106c96c3 100644 --- a/asn1/h248/Makefile.nmake +++ b/asn1/h248/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py MEGACO.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py MEGACO.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 MEGACO.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template MEGACO.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/h450/Makefile b/asn1/h450/Makefile index 49ff214988..c7d8051288 100644 --- a/asn1/h450/Makefile +++ b/asn1/h450/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py h4501.asn packet-h450-template.c packet-h450-template.h h450.cnf - python ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py h4501.asn packet-h450-template.c packet-h450-template.h h450.cnf + python ../../tools/asn2wrs.py -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake index 995cabbce8..92ee7e3eeb 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py h4501.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py h4501.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn + $(PYTHON) ../../tools/asn2wrs.py -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/inap/Makefile b/asn1/inap/Makefile index 8da0758ab1..c94af3ff2d 100644 --- a/asn1/inap/Makefile +++ b/asn1/inap/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py inap.asn packet-inap-template.c packet-inap-template.h inap.cnf - python ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py inap.asn packet-inap-template.c packet-inap-template.h inap.cnf + python ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/inap/Makefile.nmake b/asn1/inap/Makefile.nmake index 1c48937539..aeab64ee09 100644 --- a/asn1/inap/Makefile.nmake +++ b/asn1/inap/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py inap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h inap.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py inap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h inap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c inap.cnf -s packet-$(PROTOCOL_NAME)-template inap.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c inap.cnf -s packet-$(PROTOCOL_NAME)-template inap.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ldap/Makefile b/asn1/ldap/Makefile index 5ca5a3667c..f27ed5d399 100644 --- a/asn1/ldap/Makefile +++ b/asn1/ldap/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py Lightweight-Directory-Access-Protocol-V3.asn packet-ldap-template.c packet-ldap-template.h ldap.cnf $(ASN_EXPORTS) - python ../../tools/asn2eth.py -X -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py Lightweight-Directory-Access-Protocol-V3.asn packet-ldap-template.c packet-ldap-template.h ldap.cnf $(ASN_EXPORTS) + python ../../tools/asn2wrs.py -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ldap/Makefile.nmake b/asn1/ldap/Makefile.nmake index 4b9495d0f9..46fbb21457 100644 --- a/asn1/ldap/Makefile.nmake +++ b/asn1/ldap/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py Lightweight-Directory-Access-Protocol-V3.asn packet-ldap-template.c packet-ldap-template.h ldap.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py Lightweight-Directory-Access-Protocol-V3.asn packet-ldap-template.c packet-ldap-template.h ldap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/logotype-cert-extn/Makefile b/asn1/logotype-cert-extn/Makefile index 82996583fb..62951e6776 100644 --- a/asn1/logotype-cert-extn/Makefile +++ b/asn1/logotype-cert-extn/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf - python ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf + python ../../tools/asn2wrs.py -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/logotype-cert-extn/Makefile.nmake b/asn1/logotype-cert-extn/Makefile.nmake index 90d4153b68..e2751766c6 100644 --- a/asn1/logotype-cert-extn/Makefile.nmake +++ b/asn1/logotype-cert-extn/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/mms/Makefile b/asn1/mms/Makefile index 91bffc3093..91e77d1fd1 100644 --- a/asn1/mms/Makefile +++ b/asn1/mms/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py mms.asn packet-mms-template.c packet-mms-template.h mms.cnf - python ../../tools/asn2eth.py -X -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py mms.asn packet-mms-template.c packet-mms-template.h mms.cnf + python ../../tools/asn2wrs.py -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/mms/Makefile.nmake b/asn1/mms/Makefile.nmake index 9c69271d4e..996fbb972c 100644 --- a/asn1/mms/Makefile.nmake +++ b/asn1/mms/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py mms.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py mms.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 mms.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template mms.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/nbap/Makefile b/asn1/nbap/Makefile index 78a04aeaad..9961051631 100644 --- a/asn1/nbap/Makefile +++ b/asn1/nbap/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py nbap.asn packet-nbap-template.c packet-nbap-template.h nbap.cnf - python ../../tools/asn2eth.py -X -e -p nbap -c nbap.cnf -s packet-nbap-template nbap.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py nbap.asn packet-nbap-template.c packet-nbap-template.h nbap.cnf + python ../../tools/asn2wrs.py -e -p nbap -c nbap.cnf -s packet-nbap-template nbap.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/nbap/Makefile.nmake b/asn1/nbap/Makefile.nmake index b82868ced7..45515433ea 100644 --- a/asn1/nbap/Makefile.nmake +++ b/asn1/nbap/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py nbap.asn packet-nbap-template.c packet-nbap-template.h nbap.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py nbap.asn packet-nbap-template.c packet-nbap-template.h nbap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c nbap.cnf -s packet-nbap-template nbap.asn + $(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c nbap.cnf -s packet-nbap-template nbap.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ns-cert-exts/Makefile b/asn1/ns-cert-exts/Makefile index 025f271de5..f9ee7dcfde 100644 --- a/asn1/ns-cert-exts/Makefile +++ b/asn1/ns-cert-exts/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py NETSCAPE-CERT-EXTS.asn packet-ns_cert_exts-template.c packet-ns_cert_exts-template.h ns_cert_exts.cnf - python ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py NETSCAPE-CERT-EXTS.asn packet-ns_cert_exts-template.c packet-ns_cert_exts-template.h ns_cert_exts.cnf + python ../../tools/asn2wrs.py -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ns-cert-exts/Makefile.nmake b/asn1/ns-cert-exts/Makefile.nmake index 3e6550b1a7..c6902955a6 100644 --- a/asn1/ns-cert-exts/Makefile.nmake +++ b/asn1/ns-cert-exts/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py NETSCAPE-CERT-EXTS.asn packet-ns_cert_exts-template.c packet-ns_cert_exts-template.h ns_cert_exts.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py NETSCAPE-CERT-EXTS.asn packet-ns_cert_exts-template.c packet-ns_cert_exts-template.h ns_cert_exts.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ocsp/Makefile b/asn1/ocsp/Makefile index f21952c52f..d90a55358b 100644 --- a/asn1/ocsp/Makefile +++ b/asn1/ocsp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py OCSP.asn packet-ocsp-template.c packet-ocsp-template.h ocsp.cnf - python ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py OCSP.asn packet-ocsp-template.c packet-ocsp-template.h ocsp.cnf + python ../../tools/asn2wrs.py -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ocsp/Makefile.nmake b/asn1/ocsp/Makefile.nmake index 0da5109f2c..db84318cc0 100644 --- a/asn1/ocsp/Makefile.nmake +++ b/asn1/ocsp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py OCSP.asn packet-ocsp-template.c packet-ocsp-template.h ocsp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py OCSP.asn packet-ocsp-template.c packet-ocsp-template.h ocsp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c ocsp.cnf -s packet-ocsp-template OCSP.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c ocsp.cnf -s packet-ocsp-template OCSP.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkcs1/Makefile b/asn1/pkcs1/Makefile index fb90672ebd..7654253a97 100644 --- a/asn1/pkcs1/Makefile +++ b/asn1/pkcs1/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKCS1.asn packet-pkcs1-template.c packet-pkcs1-template.h pkcs1.cnf - python ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKCS1.asn packet-pkcs1-template.c packet-pkcs1-template.h pkcs1.cnf + python ../../tools/asn2wrs.py -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkcs1/Makefile.nmake b/asn1/pkcs1/Makefile.nmake index 7008824b4a..f7ec56f233 100644 --- a/asn1/pkcs1/Makefile.nmake +++ b/asn1/pkcs1/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKCS1.asn packet-pkcs1-template.c packet-pkcs1-template.h pkcs1.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKCS1.asn packet-pkcs1-template.c packet-pkcs1-template.h pkcs1.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -p $(PROTOCOL_NAME) -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn + $(PYTHON) ../../tools/asn2wrs.py -b -p $(PROTOCOL_NAME) -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkinit/Makefile b/asn1/pkinit/Makefile index d185d1f0a2..18bbae92ec 100644 --- a/asn1/pkinit/Makefile +++ b/asn1/pkinit/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKINIT.asn packet-pkinit-template.c packet-pkinit-template.h pkinit.cnf - python ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKINIT.asn packet-pkinit-template.c packet-pkinit-template.h pkinit.cnf + python ../../tools/asn2wrs.py -e -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkinit/Makefile.nmake b/asn1/pkinit/Makefile.nmake index 81c493db8d..116aeba6ff 100644 --- a/asn1/pkinit/Makefile.nmake +++ b/asn1/pkinit/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKINIT.asn packet-pkinit-template.c packet-pkinit-template.h pkinit.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKINIT.asn packet-pkinit-template.c packet-pkinit-template.h pkinit.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -X -b -p $(PROTOCOL_NAME) -c pkinit.cnf -s packet-pkinit-template PKINIT.asn + $(PYTHON) ../../tools/asn2wrs.py -e -b -p $(PROTOCOL_NAME) -c pkinit.cnf -s packet-pkinit-template PKINIT.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkix1explicit/Makefile b/asn1/pkix1explicit/Makefile index 726d107927..6ed4f2585e 100644 --- a/asn1/pkix1explicit/Makefile +++ b/asn1/pkix1explicit/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf - python ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf + python ../../tools/asn2wrs.py -e -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn clean: rm -f pkix1explicit-exp.cnf parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkix1explicit/Makefile.nmake b/asn1/pkix1explicit/Makefile.nmake index c69a711e47..d92f503cab 100644 --- a/asn1/pkix1explicit/Makefile.nmake +++ b/asn1/pkix1explicit/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -X -b -p $(PROTOCOL_NAME) -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn + $(PYTHON) ../../tools/asn2wrs.py -e -b -p $(PROTOCOL_NAME) -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkix1implicit/Makefile b/asn1/pkix1implicit/Makefile index d1c125138e..4283a3566a 100644 --- a/asn1/pkix1implicit/Makefile +++ b/asn1/pkix1implicit/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf - python ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf + python ../../tools/asn2wrs.py -e -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn clean: rm -f pkix1implicit-exp.cnf parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkix1implicit/Makefile.nmake b/asn1/pkix1implicit/Makefile.nmake index 69ce81e21c..bfa797444c 100644 --- a/asn1/pkix1implicit/Makefile.nmake +++ b/asn1/pkix1implicit/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -X -b -p $(PROTOCOL_NAME) -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn + $(PYTHON) ../../tools/asn2wrs.py -e -b -p $(PROTOCOL_NAME) -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkixcmp/Makefile b/asn1/pkixcmp/Makefile index d0e33fec43..86b0b27289 100644 --- a/asn1/pkixcmp/Makefile +++ b/asn1/pkixcmp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CMP.asn packet-cmp-template.c packet-cmp-template.h cmp.cnf - python ../../tools/asn2eth.py -X -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CMP.asn packet-cmp-template.c packet-cmp-template.h cmp.cnf + python ../../tools/asn2wrs.py -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkixcmp/Makefile.nmake b/asn1/pkixcmp/Makefile.nmake index 7e4ed2d337..0ef2f4496b 100644 --- a/asn1/pkixcmp/Makefile.nmake +++ b/asn1/pkixcmp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CMP.asn packet-cmp-template.c packet-cmp-template.h cmp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CMP.asn packet-cmp-template.c packet-cmp-template.h cmp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c cmp.cnf -s packet-cmp-template CMP.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c cmp.cnf -s packet-cmp-template CMP.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkixcrmf/Makefile b/asn1/pkixcrmf/Makefile index bc2ab03f17..f624d00452 100644 --- a/asn1/pkixcrmf/Makefile +++ b/asn1/pkixcrmf/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CRMF.asn packet-crmf-template.c packet-crmf-template.h crmf.cnf - python ../../tools/asn2eth.py -X -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CRMF.asn packet-crmf-template.c packet-crmf-template.h crmf.cnf + python ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkixcrmf/Makefile.nmake b/asn1/pkixcrmf/Makefile.nmake index 880c0bf2e6..ea5d4e5ba8 100644 --- a/asn1/pkixcrmf/Makefile.nmake +++ b/asn1/pkixcrmf/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CRMF.asn packet-crmf-template.c packet-crmf-template.h crmf.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CRMF.asn packet-crmf-template.c packet-crmf-template.h crmf.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c crmf.cnf -s packet-crmf-template CRMF.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c crmf.cnf -s packet-crmf-template CRMF.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkixproxy/Makefile b/asn1/pkixproxy/Makefile index e361eb91b7..b153a637c4 100644 --- a/asn1/pkixproxy/Makefile +++ b/asn1/pkixproxy/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf - python ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf + python ../../tools/asn2wrs.py -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn clean: rm -f pkix1explicit-exp.cnf parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkixproxy/Makefile.nmake b/asn1/pkixproxy/Makefile.nmake index d94bf3a00d..0c897ec33d 100644 --- a/asn1/pkixproxy/Makefile.nmake +++ b/asn1/pkixproxy/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkixqualified/Makefile b/asn1/pkixqualified/Makefile index aad84b69f1..0c4bd75bf0 100644 --- a/asn1/pkixqualified/Makefile +++ b/asn1/pkixqualified/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf - python ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf + python ../../tools/asn2wrs.py -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkixqualified/Makefile.nmake b/asn1/pkixqualified/Makefile.nmake index d491bd80af..51f1a33170 100644 --- a/asn1/pkixqualified/Makefile.nmake +++ b/asn1/pkixqualified/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pkixtsp/Makefile b/asn1/pkixtsp/Makefile index 3b1fbea153..43961ee72b 100644 --- a/asn1/pkixtsp/Makefile +++ b/asn1/pkixtsp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf - python ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf + python ../../tools/asn2wrs.py -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pkixtsp/Makefile.nmake b/asn1/pkixtsp/Makefile.nmake index 452f606bbe..534bbcb961 100644 --- a/asn1/pkixtsp/Makefile.nmake +++ b/asn1/pkixtsp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIXTSP.asn packet-pkixtsp-template.c packet-pkixtsp-template.h pkixtsp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/pres/Makefile b/asn1/pres/Makefile index 6726185a06..b67352d578 100644 --- a/asn1/pres/Makefile +++ b/asn1/pres/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ISO8823-PRESENTATION.asn packet-pres-template.c packet-pres-template.h pres.cnf - python ../../tools/asn2eth.py -X -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8823-PRESENTATION.asn packet-pres-template.c packet-pres-template.h pres.cnf + python ../../tools/asn2wrs.py -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/pres/Makefile.nmake b/asn1/pres/Makefile.nmake index 5eb072d248..b2fa294ab6 100644 --- a/asn1/pres/Makefile.nmake +++ b/asn1/pres/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ISO8823-PRESENTATION.asn packet-pres-template.c packet-pres-template.h pres.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8823-PRESENTATION.asn packet-pres-template.c packet-pres-template.h pres.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ranap/Makefile b/asn1/ranap/Makefile index 2889c3b9b1..b98b1316b9 100644 --- a/asn1/ranap/Makefile +++ b/asn1/ranap/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py packet-ranap-template.c packet-ranap-template.h ranap.cnf - python ../../tools/asn2eth.py -X -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-ranap-template.c packet-ranap-template.h ranap.cnf + python ../../tools/asn2wrs.py -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ranap/Makefile.nmake b/asn1/ranap/Makefile.nmake index f781cd5f8c..f1407881bf 100644 --- a/asn1/ranap/Makefile.nmake +++ b/asn1/ranap/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ranap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h ranap.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ranap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h ranap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c ranap.cnf -s packet-$(PROTOCOL_NAME)-template ranap.asn + $(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c ranap.cnf -s packet-$(PROTOCOL_NAME)-template ranap.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/rnsap/Makefile b/asn1/rnsap/Makefile index 9e36966d2f..881372a1a9 100644 --- a/asn1/rnsap/Makefile +++ b/asn1/rnsap/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py rnsap.asn packet-rnsap-template.c packet-rnsap-template.h rnsap.cnf - python ../../tools/asn2eth.py -X -e -p rnsap -c rnsap.cnf -s packet-rnsap-template rnsap.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py rnsap.asn packet-rnsap-template.c packet-rnsap-template.h rnsap.cnf + python ../../tools/asn2wrs.py -e -p rnsap -c rnsap.cnf -s packet-rnsap-template rnsap.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/rnsap/Makefile.nmake b/asn1/rnsap/Makefile.nmake index 90ce7e27f2..29667bb6e5 100644 --- a/asn1/rnsap/Makefile.nmake +++ b/asn1/rnsap/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py rnsap.asn packet-rnsap-template.c packet-rnsap-template.h rnsap.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py rnsap.asn packet-rnsap-template.c packet-rnsap-template.h rnsap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c rnsap.cnf -s packet-rnsap-template rnsap.asn + $(PYTHON) ../../tools/asn2wrs.py -e -p $(PROTOCOL_NAME) -c rnsap.cnf -s packet-rnsap-template rnsap.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ros/Makefile b/asn1/ros/Makefile index 3b9f6784b5..0d2d2be8d5 100644 --- a/asn1/ros/Makefile +++ b/asn1/ros/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ros.asn packet-ros-template.c packet-ros-template.h ros.cnf - python ../../tools/asn2eth.py -X -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ros.asn packet-ros-template.c packet-ros-template.h ros.cnf + python ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ros/Makefile.nmake b/asn1/ros/Makefile.nmake index 3b0eefb0f2..b61e258fb1 100644 --- a/asn1/ros/Makefile.nmake +++ b/asn1/ros/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).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 $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/rrlp/Makefile b/asn1/rrlp/Makefile index 464eedc872..7ec094eaeb 100644 --- a/asn1/rrlp/Makefile +++ b/asn1/rrlp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py rrlp.asn packet-rrlp-template.c packet-rrlp-template.h rrlp.cnf - python ../../tools/asn2eth.py -X -e -p rrlp -c rrlp.cnf -s packet-rrlp-template rrlp.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py rrlp.asn packet-rrlp-template.c packet-rrlp-template.h rrlp.cnf + python ../../tools/asn2wrs.py -e -p rrlp -c rrlp.cnf -s packet-rrlp-template rrlp.asn clean: rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) diff --git a/asn1/rrlp/Makefile.nmake b/asn1/rrlp/Makefile.nmake index c0340ffe86..92782e04a6 100644 --- a/asn1/rrlp/Makefile.nmake +++ b/asn1/rrlp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py rrlp.asn packet-rrlp-template.c packet-rrlp-template.h rrlp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py rrlp.asn packet-rrlp-template.c packet-rrlp-template.h rrlp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -u -e -p $(PROTOCOL_NAME) -c rrlp.cnf -s packet-rrlp-template rrlp.asn + $(PYTHON) ../../tools/asn2wrs.py -u -e -p $(PROTOCOL_NAME) -c rrlp.cnf -s packet-rrlp-template rrlp.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/rtse/Makefile b/asn1/rtse/Makefile index 949b065c23..b3b8c7b52f 100644 --- a/asn1/rtse/Makefile +++ b/asn1/rtse/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py rtse.asn packet-rtse-template.c packet-rtse-template.h rtse.cnf - python ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py rtse.asn packet-rtse-template.c packet-rtse-template.h rtse.cnf + python ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/rtse/Makefile.nmake b/asn1/rtse/Makefile.nmake index d643b617c9..27037b8e67 100644 --- a/asn1/rtse/Makefile.nmake +++ b/asn1/rtse/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).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 $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/s4406/Makefile b/asn1/s4406/Makefile index 4b920d76e6..6434fe7e9a 100644 --- a/asn1/s4406/Makefile +++ b/asn1/s4406/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py s4406.asn packet-s4406-template.c packet-s4406-template.h s4406.cnf ../x411/x411-exp.cnf - python ../../tools/asn2eth.py -X -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py s4406.asn packet-s4406-template.c packet-s4406-template.h s4406.cnf ../x411/x411-exp.cnf + python ../../tools/asn2wrs.py -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/s4406/Makefile.nmake b/asn1/s4406/Makefile.nmake index b631ccab69..7cefcd83f1 100644 --- a/asn1/s4406/Makefile.nmake +++ b/asn1/s4406/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).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 $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/smrse/Makefile b/asn1/smrse/Makefile index 301a98380a..8ec64d6f64 100644 --- a/asn1/smrse/Makefile +++ b/asn1/smrse/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py SMRSE.asn packet-smrse-template.c packet-smrse-template.h smrse.cnf - python ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py SMRSE.asn packet-smrse-template.c packet-smrse-template.h smrse.cnf + python ../../tools/asn2wrs.py -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/smrse/Makefile.nmake b/asn1/smrse/Makefile.nmake index 3009cfe963..8368a1f8e4 100644 --- a/asn1/smrse/Makefile.nmake +++ b/asn1/smrse/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py SMRSE.asn packet-smrse-template.c packet-smrse-template.h smrse.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py SMRSE.asn packet-smrse-template.c packet-smrse-template.h smrse.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c smrse.cnf -s packet-smrse-template SMRSE.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c smrse.cnf -s packet-smrse-template SMRSE.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/snmp/Makefile b/asn1/snmp/Makefile index 2c203ea813..182858be6e 100644 --- a/asn1/snmp/Makefile +++ b/asn1/snmp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py snmp.asn packet-snmp-template.c packet-snmp-template.h snmp.cnf - python ../../tools/asn2eth.py -X -b -e -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py snmp.asn packet-snmp-template.c packet-snmp-template.h snmp.cnf + python ../../tools/asn2wrs.py -b -e -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn clean: rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) diff --git a/asn1/snmp/Makefile.nmake b/asn1/snmp/Makefile.nmake index de11bf6134..7da42e6879 100644 --- a/asn1/snmp/Makefile.nmake +++ b/asn1/snmp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py snmp.asn packet-snmp-template.c packet-snmp-template.h snmp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py snmp.asn packet-snmp-template.c packet-snmp-template.h snmp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c snmp.cnf -s packet-snmp-template snmp.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c snmp.cnf -s packet-snmp-template snmp.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/spnego/Makefile b/asn1/spnego/Makefile index 70f5cc14e0..952700e9f0 100644 --- a/asn1/spnego/Makefile +++ b/asn1/spnego/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py spnego.asn packet-spnego-template.c packet-spnego-template.h spnego.cnf - python ../../tools/asn2eth.py -X -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py spnego.asn packet-spnego-template.c packet-spnego-template.h spnego.cnf + python ../../tools/asn2wrs.py -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/spnego/Makefile.nmake b/asn1/spnego/Makefile.nmake index dbe60803ec..950c7208dc 100644 --- a/asn1/spnego/Makefile.nmake +++ b/asn1/spnego/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py spnego.asn packet-spnego-template.c packet-spnego-template.h spnego.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py spnego.asn packet-spnego-template.c packet-spnego-template.h spnego.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c spnego.cnf -s packet-spnego-template spnego.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c spnego.cnf -s packet-spnego-template spnego.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/tcap/Makefile b/asn1/tcap/Makefile index 71b3aef706..b64ee4fbb5 100644 --- a/asn1/tcap/Makefile +++ b/asn1/tcap/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py tcap.asn packet-tcap-template.c packet-tcap-template.h tcap.cnf - python ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py tcap.asn packet-tcap-template.c packet-tcap-template.h tcap.cnf + python ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/tcap/Makefile.nmake b/asn1/tcap/Makefile.nmake index e97be498fc..44acf2626a 100644 --- a/asn1/tcap/Makefile.nmake +++ b/asn1/tcap/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py tcap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h tcap.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py tcap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h tcap.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c tcap.cnf -s packet-$(PROTOCOL_NAME)-template tcap.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c tcap.cnf -s packet-$(PROTOCOL_NAME)-template tcap.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/ulp/Makefile b/asn1/ulp/Makefile index 317259b645..a309bd1223 100644 --- a/asn1/ulp/Makefile +++ b/asn1/ulp/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ULP.asn packet-ulp-template.c packet-ulp-template.h ulp.cnf - python ../../tools/asn2eth.py -X -e -p ulp -c ulp.cnf -s packet-ulp-template ULP.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ULP.asn packet-ulp-template.c packet-ulp-template.h ulp.cnf + python ../../tools/asn2wrs.py -e -p ulp -c ulp.cnf -s packet-ulp-template ULP.asn clean: rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) diff --git a/asn1/ulp/Makefile.nmake b/asn1/ulp/Makefile.nmake index 1773367156..b52440f976 100644 --- a/asn1/ulp/Makefile.nmake +++ b/asn1/ulp/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py ULP.asn packet-ulp-template.c packet-ulp-template.h ulp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py ULP.asn packet-ulp-template.c packet-ulp-template.h ulp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -u -e -p $(PROTOCOL_NAME) -c ulp.cnf -s packet-ulp-template ULP.asn + $(PYTHON) ../../tools/asn2wrs.py -u -e -p $(PROTOCOL_NAME) -c ulp.cnf -s packet-ulp-template ULP.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/wlancertextn/Makefile b/asn1/wlancertextn/Makefile index 3d26506c40..777cad46ed 100644 --- a/asn1/wlancertextn/Makefile +++ b/asn1/wlancertextn/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py WLANCERTEXTN.asn packet-wlancertextn-template.c packet-wlancertextn-template.h wlancertextn.cnf - python ../../tools/asn2eth.py -X -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py WLANCERTEXTN.asn packet-wlancertextn-template.c packet-wlancertextn-template.h wlancertextn.cnf + python ../../tools/asn2wrs.py -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/wlancertextn/Makefile.nmake b/asn1/wlancertextn/Makefile.nmake index eb6ababafb..dcc0f1c87a 100644 --- a/asn1/wlancertextn/Makefile.nmake +++ b/asn1/wlancertextn/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py WLANCERTEXTN.asn packet-wlancertextn-template.c packet-wlancertextn-template.h wlancertextn.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py WLANCERTEXTN.asn packet-wlancertextn-template.c packet-wlancertextn-template.h wlancertextn.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/x411/Makefile b/asn1/x411/Makefile index 98a612167a..8d7336f273 100644 --- a/asn1/x411/Makefile +++ b/asn1/x411/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py x411.asn packet-x411-template.c packet-x411-template.h x411.cnf - python ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py x411.asn packet-x411-template.c packet-x411-template.h x411.cnf + python ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) *~ diff --git a/asn1/x411/Makefile.nmake b/asn1/x411/Makefile.nmake index 8659e08597..968e879398 100644 --- a/asn1/x411/Makefile.nmake +++ b/asn1/x411/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).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 $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/x420/Makefile b/asn1/x420/Makefile index 1dfe7a3c8b..5fe5006adb 100644 --- a/asn1/x420/Makefile +++ b/asn1/x420/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py x420.asn packet-x420-template.c packet-x420-template.h x420.cnf - python ../../tools/asn2eth.py -X -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py x420.asn packet-x420-template.c packet-x420-template.h x420.cnf + python ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/x420/Makefile.nmake b/asn1/x420/Makefile.nmake index 9801d736a0..da8207bf95 100644 --- a/asn1/x420/Makefile.nmake +++ b/asn1/x420/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).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 $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/x509af/Makefile b/asn1/x509af/Makefile index bf31cb117e..3e860587a2 100644 --- a/asn1/x509af/Makefile +++ b/asn1/x509af/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf - python ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf + python ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/x509af/Makefile.nmake b/asn1/x509af/Makefile.nmake index f6c2b9e107..20e132b77b 100644 --- a/asn1/x509af/Makefile.nmake +++ b/asn1/x509af/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/x509ce/Makefile b/asn1/x509ce/Makefile index b7fa433dba..ecd97490d8 100644 --- a/asn1/x509ce/Makefile +++ b/asn1/x509ce/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509af/x509af-exp.cnf - python ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509af/x509af-exp.cnf + python ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/x509ce/Makefile.nmake b/asn1/x509ce/Makefile.nmake index bce68fb96a..d63d000b92 100644 --- a/asn1/x509ce/Makefile.nmake +++ b/asn1/x509ce/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509af/x509af-exp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py CertificateExtensions.asn packet-x509ce-template.c packet-x509ce-template.h x509ce.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509af/x509af-exp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/x509if/Makefile b/asn1/x509if/Makefile index e8d3d3401b..32ad890cfd 100644 --- a/asn1/x509if/Makefile +++ b/asn1/x509if/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat-exp.cnf - python ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat-exp.cnf + python ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/x509if/Makefile.nmake b/asn1/x509if/Makefile.nmake index 7b10ef6b89..1095cdf843 100644 --- a/asn1/x509if/Makefile.nmake +++ b/asn1/x509if/Makefile.nmake @@ -13,11 +13,11 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat-exp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat-exp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c x509if.cnf -s packet-x509if-template InformationFramework.asn + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c x509if.cnf -s packet-x509if-template InformationFramework.asn !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/asn1/x509sat/Makefile b/asn1/x509sat/Makefile index 71177d4368..39cc4fcd51 100644 --- a/asn1/x509sat/Makefile +++ b/asn1/x509sat/Makefile @@ -6,8 +6,8 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py SelectedAttributeTypes.asn packet-x509sat-template.c packet-x509sat-template.h x509sat.cnf ../x509if/x509if-exp.cnf - python ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py SelectedAttributeTypes.asn packet-x509sat-template.c packet-x509sat-template.h x509sat.cnf ../x509if/x509if-exp.cnf + python ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn sed -e "s/\([\"\.]\)Syntax/\1/g" -i.orig packet-x509sat.c clean: diff --git a/asn1/x509sat/Makefile.nmake b/asn1/x509sat/Makefile.nmake index e992b3a3f3..bf16494dcb 100644 --- a/asn1/x509sat/Makefile.nmake +++ b/asn1/x509sat/Makefile.nmake @@ -13,12 +13,12 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2eth.py SelectedAttributeTypes.asn packet-x509sat-template.c packet-x509sat-template.h x509sat.cnf ../x509if/x509if-exp.cnf +$(DISSECTOR_FILES): ../../tools/asn2wrs.py SelectedAttributeTypes.asn packet-x509sat-template.c packet-x509sat-template.h x509sat.cnf ../x509if/x509if-exp.cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -b -e -p $(PROTOCOL_NAME) -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn - sed -e "s/\([\"\.]\)Syntax/\1/g" -i.orig packet-x509sat.c + $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn +# sed -e "s/\([\"\.]\)Syntax/\1/g" -i.orig packet-x509sat.c !ELSE - @echo Error: You need Python to use asn2eth.py + @echo Error: You need Python to use asn2wrs.py @exit 1 !ENDIF diff --git a/tools/Makefile.am b/tools/Makefile.am index 3275733ede..db222971a8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -67,7 +67,7 @@ EXTRA_DIST = \ $(PIDL_FILES) \ EtherealXML.py \ Makefile.nmake \ - asn2eth.py \ + asn2wrs.py \ cvsdiff-fix.py \ dfilter-test.py \ fuzz-test.sh \ diff --git a/tools/asn2eth.py b/tools/asn2wrs.py index dd2351c49c..3bda1f51f4 100755 --- a/tools/asn2eth.py +++ b/tools/asn2wrs.py @@ -2853,6 +2853,7 @@ class EnumeratedType (Type): return pars def eth_type_default_table(self, ectx, tname): + if (not ectx.Per()): return '' map_table = self.get_vals_etc(ectx)[3] if (map_table == None): return '' table = "static guint32 %(TABLE)s[%(ROOT_NUM)s+%(EXT_NUM)s] = {" |