diff options
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/h225/Makefile.nmake | 2 | ||||
| -rw-r--r-- | asn1/h225/h225-exp.cnf | 10 | ||||
| -rw-r--r-- | asn1/h225/h225.cnf | 6 | ||||
| -rw-r--r-- | asn1/h245/Makefile.nmake | 2 | ||||
| -rw-r--r-- | asn1/h245/h245-exp.cnf | 9 | ||||
| -rw-r--r-- | asn1/h450/Makefile.nmake | 2 | ||||
| -rw-r--r-- | asn1/h450/h450.cnf | 6 |
7 files changed, 26 insertions, 11 deletions
diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 471a1d4bd1..29598c7498 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -15,7 +15,7 @@ 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 !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2eth.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 @exit 1 diff --git a/asn1/h225/h225-exp.cnf b/asn1/h225/h225-exp.cnf index f4b09bcc51..5210c7a6c3 100644 --- a/asn1/h225/h225-exp.cnf +++ b/asn1/h225/h225-exp.cnf @@ -1,3 +1,12 @@ +# Do not modify this file. +# It is created automatically by the ASN.1 to Ethereal dissector compiler +# .\h225-exp.cnf +# ../../tools/asn2eth.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn + +#.MODULE +H323-MESSAGES h225 +#.END + #.TYPE_ATTR PresentationIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PresentationIndicator_vals) BITMASK = 0 ScreeningIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_ScreeningIndicator_vals) BITMASK = 0 @@ -5,6 +14,7 @@ NonStandardParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL AliasAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(AliasAddress_vals) BITMASK = 0 PartyNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PartyNumber_vals) BITMASK = 0 CallIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +GenericData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 RasMessage TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(RasMessage_vals) BITMASK = 0 #.END diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 784dc92a03..ea8db64420 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -3,11 +3,6 @@ # Copyright 2004 Anders Broman # $Id$ -#.MODULE_IMPORT -H235-SECURITY-MESSAGES h235 -MULTIMEDIA-SYSTEM-CONTROL h245 -#.END - #.INCLUDE ../h235/h235-exp.cnf #.INCLUDE ../h245/h245-exp.cnf @@ -34,6 +29,7 @@ PartyNumber PresentationIndicator ScreeningIndicator CallIdentifier +GenericData #---------------------------------------------------------------------------------------- #.TYPE_RENAME CallCreditServiceControl/callStartingPoint CallCreditServiceControl_callStartingPoint diff --git a/asn1/h245/Makefile.nmake b/asn1/h245/Makefile.nmake index 5705fc5604..4745e7acf9 100644 --- a/asn1/h245/Makefile.nmake +++ b/asn1/h245/Makefile.nmake @@ -15,7 +15,7 @@ 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 !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2eth.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 @exit 1 diff --git a/asn1/h245/h245-exp.cnf b/asn1/h245/h245-exp.cnf index b0a4d50473..ad2f44ad8e 100644 --- a/asn1/h245/h245-exp.cnf +++ b/asn1/h245/h245-exp.cnf @@ -1,3 +1,12 @@ +# Do not modify this file. +# It is created automatically by the ASN.1 to Ethereal dissector compiler +# .\h245-exp.cnf +# ../../tools/asn2eth.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn + +#.MODULE +MULTIMEDIA-SYSTEM-CONTROL h245 +#.END + #.TYPE_ATTR DataProtocolCapability TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(DataProtocolCapability_vals) BITMASK = 0 T38FaxProfile TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake index b2002c49e0..995cabbce8 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2eth.py h4501.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn + $(PYTHON) ../../tools/asn2eth.py -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn !ELSE @echo Error: You need Python to use asn2eth.py @exit 1 diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf index 5bc8d2c51c..2f3ef90bdb 100644 --- a/asn1/h450/h450.cnf +++ b/asn1/h450/h450.cnf @@ -3,12 +3,12 @@ # Copyright 2004 Anders Broman # $Id$ -#.MODULE_IMPORT -H323-MESSAGES h225 +#.INCLUDE ../h225/h225-exp.cnf + +#.MODULE Remote-Operations-Apdus ros #.END -#.INCLUDE ../h225/h225-exp.cnf #---------------------------------------------------------------------------------------- #.PDU CallTransferIdentify |