aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/h225
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2006-05-15 06:27:53 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2006-05-15 06:27:53 +0000
commitaada0116b7c65f6ea0b54c6375efd604c8be9874 (patch)
tree5ddfb373621892ab25a7e5f4ccbca8594060b811 /asn1/h225
parent71c5821e2e34025cc16624ba6fdea5c094061a6a (diff)
H.225, H.245, H.450 regenerated with new asn2eth
svn path=/trunk/; revision=18156
Diffstat (limited to 'asn1/h225')
-rw-r--r--asn1/h225/Makefile.nmake2
-rw-r--r--asn1/h225/h225-exp.cnf10
-rw-r--r--asn1/h225/h225.cnf6
3 files changed, 12 insertions, 6 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