diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-10 08:35:41 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-10 08:35:41 +0000 |
| commit | d5a88aa8b3f00f1528983921b133dd63aeea6221 (patch) | |
| tree | 8d7db8816462050e7e7098962c1b54769d65ad4e | |
| parent | 707c2f63f9bc601f3540a8bb2cde370d4f2a81f3 (diff) | |
ANSI TCAP regenerated and tested with -T -X asn2wrs options
asn2wrs has -T (tagged types support) and -X (new BER sttructures) default behavior
remove all -T and -X usage
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23823 f5534014-38df-0310-8fa8-9805f1628bb7
56 files changed, 340 insertions, 528 deletions
diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common index 13fc7652f4..b585b9785c 100644 --- a/asn1/acp133/Makefile.common +++ b/asn1/acp133/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../x411/x411-exp.cnf \ diff --git a/asn1/acse/Makefile.common b/asn1/acse/Makefile.common index 22be6b521f..8302215fdb 100644 --- a/asn1/acse/Makefile.common +++ b/asn1/acse/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../x509if/x509if-exp.cnf diff --git a/asn1/ansi_map/Makefile.common b/asn1/ansi_map/Makefile.common index 3104ccc068..d4f49f7670 100644 --- a/asn1/ansi_map/Makefile.common +++ b/asn1/ansi_map/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../gsmmap/gsm_map-exp.cnf diff --git a/asn1/camel/Makefile.common b/asn1/camel/Makefile.common index 55cf815351..93f08b4970 100644 --- a/asn1/camel/Makefile.common +++ b/asn1/camel/Makefile.common @@ -59,7 +59,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T -L +A2W_FLAGS= -b -L EXTRA_CNF=../inap/inap-exp.cnf \ ../gsmmap/gsm_map-exp.cnf diff --git a/asn1/cdt/Makefile.common b/asn1/cdt/Makefile.common index 019ab55aeb..265671275d 100644 --- a/asn1/cdt/Makefile.common +++ b/asn1/cdt/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/cmip/Makefile.common b/asn1/cmip/Makefile.common index 1a202dd5b9..5c30d7b52c 100644 --- a/asn1/cmip/Makefile.common +++ b/asn1/cmip/Makefile.common @@ -52,7 +52,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T -e +A2W_FLAGS= -b -e EXTRA_CNF= \ ../acse/acse-exp.cnf diff --git a/asn1/cms/Makefile.common b/asn1/cms/Makefile.common index bafa638a88..201d8832b0 100644 --- a/asn1/cms/Makefile.common +++ b/asn1/cms/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T -e +A2W_FLAGS= -b -e EXTRA_CNF= \ ../x509af/x509af-exp.cnf \ diff --git a/asn1/dap/Makefile.common b/asn1/dap/Makefile.common index b8d839bda6..3dc3a30b86 100644 --- a/asn1/dap/Makefile.common +++ b/asn1/dap/Makefile.common @@ -47,7 +47,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../disp/disp-exp.cnf \ diff --git a/asn1/disp/Makefile.common b/asn1/disp/Makefile.common index d7af20cc80..11b148e5f2 100644 --- a/asn1/disp/Makefile.common +++ b/asn1/disp/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../dap/dap-exp.cnf \ diff --git a/asn1/dop/Makefile.common b/asn1/dop/Makefile.common index d4c086a9a4..3eed0d6b98 100644 --- a/asn1/dop/Makefile.common +++ b/asn1/dop/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T -e +A2W_FLAGS= -b -e EXTRA_CNF= \ ../dap/dap-exp.cnf \ diff --git a/asn1/dsp/Makefile.common b/asn1/dsp/Makefile.common index 636b5a4b87..837c8c5fd6 100644 --- a/asn1/dsp/Makefile.common +++ b/asn1/dsp/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF = \ ../dap/dap-exp.cnf \ diff --git a/asn1/ess/Makefile.common b/asn1/ess/Makefile.common index 97a56c744d..e06c4ff5cf 100644 --- a/asn1/ess/Makefile.common +++ b/asn1/ess/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -k -X -T +A2W_FLAGS= -b -k EXTRA_CNF= \ ../cms/cms-exp.cnf \ diff --git a/asn1/ftam/Makefile.common b/asn1/ftam/Makefile.common index 77cf3242ba..9a438b7a7d 100644 --- a/asn1/ftam/Makefile.common +++ b/asn1/ftam/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../acse/acse-exp.cnf diff --git a/asn1/gnm/Makefile.common b/asn1/gnm/Makefile.common index 7bce741b91..9dca607ee9 100644 --- a/asn1/gnm/Makefile.common +++ b/asn1/gnm/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../cmip/cmip-exp.cnf diff --git a/asn1/gsmmap/Makefile.common b/asn1/gsmmap/Makefile.common index a122ede9a0..2c1eccb06e 100644 --- a/asn1/gsmmap/Makefile.common +++ b/asn1/gsmmap/Makefile.common @@ -87,7 +87,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T -k -e +A2W_FLAGS= -b -e EXTRA_CNF= diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf index 47cf5ca524..cd884676ac 100644 --- a/asn1/gsmmap/gsmmap.cnf +++ b/asn1/gsmmap/gsmmap.cnf @@ -1,10 +1,7 @@ #.OPT -b --T --X #-d satcom --d om #-s packet-gsm_map-tmp -k -o gsm_map diff --git a/asn1/h248/Makefile.common b/asn1/h248/Makefile.common index a3ffa18d9d..8c86e73294 100644 --- a/asn1/h248/Makefile.common +++ b/asn1/h248/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/inap/Makefile.common b/asn1/inap/Makefile.common index 543e218af1..8f49490228 100644 --- a/asn1/inap/Makefile.common +++ b/asn1/inap/Makefile.common @@ -67,7 +67,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T -e +A2W_FLAGS= -b -e EXTRA_CNF= diff --git a/asn1/ldap/Makefile.common b/asn1/ldap/Makefile.common index 13c3c92f15..f944a16b2a 100644 --- a/asn1/ldap/Makefile.common +++ b/asn1/ldap/Makefile.common @@ -45,7 +45,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/logotype-cert-extn/Makefile.common b/asn1/logotype-cert-extn/Makefile.common index a020676d5f..d869b5f6f7 100644 --- a/asn1/logotype-cert-extn/Makefile.common +++ b/asn1/logotype-cert-extn/Makefile.common @@ -44,7 +44,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../x509af/x509af-exp.cnf diff --git a/asn1/mms/Makefile.common b/asn1/mms/Makefile.common index 3e0a386c24..01718cd19f 100644 --- a/asn1/mms/Makefile.common +++ b/asn1/mms/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../acse/acse-exp.cnf diff --git a/asn1/ns-cert-exts/Makefile.common b/asn1/ns-cert-exts/Makefile.common index 065d701239..62d7d5ac1e 100644 --- a/asn1/ns-cert-exts/Makefile.common +++ b/asn1/ns-cert-exts/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/ocsp/Makefile.common b/asn1/ocsp/Makefile.common index 3f12d9bdba..2fc9c286a8 100644 --- a/asn1/ocsp/Makefile.common +++ b/asn1/ocsp/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../x509af/x509af-exp.cnf \ diff --git a/asn1/p7/Makefile.common b/asn1/p7/Makefile.common index 79b2d4665a..7cbd88f84f 100644 --- a/asn1/p7/Makefile.common +++ b/asn1/p7/Makefile.common @@ -49,7 +49,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T -L +A2W_FLAGS= -b -e -L EXTRA_CNF= \ ../x411/x411-exp.cnf \ diff --git a/asn1/pkcs1/Makefile.common b/asn1/pkcs1/Makefile.common index c710cf535e..c42b3a76ca 100644 --- a/asn1/pkcs1/Makefile.common +++ b/asn1/pkcs1/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../x509af/x509af-exp.cnf diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common index e8b67f64ac..8ac61d5ada 100644 --- a/asn1/pkcs12/Makefile.common +++ b/asn1/pkcs12/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -X -T -b -e +A2W_FLAGS= -b -e EXTRA_CNF= \ ../cms/cms-exp.cnf \ diff --git a/asn1/pkinit/Makefile.common b/asn1/pkinit/Makefile.common index fc5f856423..6f863b6f2b 100644 --- a/asn1/pkinit/Makefile.common +++ b/asn1/pkinit/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../cms/cms-exp.cnf diff --git a/asn1/pkix1explicit/Makefile.common b/asn1/pkix1explicit/Makefile.common index 2dcd39b646..1b20b01393 100644 --- a/asn1/pkix1explicit/Makefile.common +++ b/asn1/pkix1explicit/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/pkix1implicit/Makefile.common b/asn1/pkix1implicit/Makefile.common index 6672741687..1c5a746452 100644 --- a/asn1/pkix1implicit/Makefile.common +++ b/asn1/pkix1implicit/Makefile.common @@ -44,7 +44,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../x509ce/x509ce-exp.cnf diff --git a/asn1/pkixcmp/Makefile.common b/asn1/pkixcmp/Makefile.common index f6e4622011..4d8b4c649d 100644 --- a/asn1/pkixcmp/Makefile.common +++ b/asn1/pkixcmp/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../pkix1explicit/pkix1explicit_exp.cnf \ diff --git a/asn1/pkixcrmf/Makefile.common b/asn1/pkixcrmf/Makefile.common index caa453fdf5..7036990469 100644 --- a/asn1/pkixcrmf/Makefile.common +++ b/asn1/pkixcrmf/Makefile.common @@ -45,7 +45,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../cms/cms-exp.cnf diff --git a/asn1/pkixproxy/Makefile.common b/asn1/pkixproxy/Makefile.common index 35f85eb7aa..08fd27878c 100644 --- a/asn1/pkixproxy/Makefile.common +++ b/asn1/pkixproxy/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/pkixqualified/Makefile.common b/asn1/pkixqualified/Makefile.common index 227174068c..3362ca5e8e 100644 --- a/asn1/pkixqualified/Makefile.common +++ b/asn1/pkixqualified/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../x509af/x509af-exp.cnf \ diff --git a/asn1/pkixtsp/Makefile.common b/asn1/pkixtsp/Makefile.common index cd5d00c0a9..e7d313e00b 100644 --- a/asn1/pkixtsp/Makefile.common +++ b/asn1/pkixtsp/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../cms/cms-exp.cnf diff --git a/asn1/pres/Makefile.common b/asn1/pres/Makefile.common index 9de219f977..306cee51fc 100644 --- a/asn1/pres/Makefile.common +++ b/asn1/pres/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../rtse/rtse-exp.cnf diff --git a/asn1/q932-ros/Makefile.common b/asn1/q932-ros/Makefile.common index 79e4ad5f2e..f618ca4126 100644 --- a/asn1/q932-ros/Makefile.common +++ b/asn1/q932-ros/Makefile.common @@ -44,7 +44,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -T -X +A2W_FLAGS= -b EXTRA_CNF = \ ../ros/ros-inv.cnf \ diff --git a/asn1/q932/Makefile.common b/asn1/q932/Makefile.common index e0d7fa495e..e8813b2be0 100644 --- a/asn1/q932/Makefile.common +++ b/asn1/q932/Makefile.common @@ -50,7 +50,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -e -b -T -X +A2W_FLAGS= -e -b EXTRA_CNF = diff --git a/asn1/qsig/qsig.cnf b/asn1/qsig/qsig.cnf index cc102049f8..30aac8ba53 100644 --- a/asn1/qsig/qsig.cnf +++ b/asn1/qsig/qsig.cnf @@ -6,8 +6,6 @@ #.OPT BER --T --X GROUP_BY_PROT -o qsig #.END diff --git a/asn1/ros/Makefile.common b/asn1/ros/Makefile.common index 7110aedaf2..403192ac97 100644 --- a/asn1/ros/Makefile.common +++ b/asn1/ros/Makefile.common @@ -54,7 +54,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= diff --git a/asn1/rtse/Makefile.common b/asn1/rtse/Makefile.common index 2dd69dfb6a..dd49f84aec 100644 --- a/asn1/rtse/Makefile.common +++ b/asn1/rtse/Makefile.common @@ -45,7 +45,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= diff --git a/asn1/s4406/Makefile.common b/asn1/s4406/Makefile.common index 1f79474e9e..96f239e8ff 100644 --- a/asn1/s4406/Makefile.common +++ b/asn1/s4406/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= \ ../x411/x411-exp.cnf \ diff --git a/asn1/smrse/Makefile.common b/asn1/smrse/Makefile.common index 2219c64702..c374dada38 100644 --- a/asn1/smrse/Makefile.common +++ b/asn1/smrse/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/snmp/Makefile.common b/asn1/snmp/Makefile.common index 39d0564fb5..12866e051b 100644 --- a/asn1/snmp/Makefile.common +++ b/asn1/snmp/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/spnego/Makefile.common b/asn1/spnego/Makefile.common index 80f55aa54d..5ac4034143 100644 --- a/asn1/spnego/Makefile.common +++ b/asn1/spnego/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/t125/Makefile.common b/asn1/t125/Makefile.common index 10c15a17c6..88d3227ed2 100644 --- a/asn1/t125/Makefile.common +++ b/asn1/t125/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/tcap/Makefile.common b/asn1/tcap/Makefile.common index dce9a87321..412adb7b22 100644 --- a/asn1/tcap/Makefile.common +++ b/asn1/tcap/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/wlancertextn/Makefile.common b/asn1/wlancertextn/Makefile.common index 29f6606768..9426b0b93b 100644 --- a/asn1/wlancertextn/Makefile.common +++ b/asn1/wlancertextn/Makefile.common @@ -43,7 +43,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -X -T +A2W_FLAGS= -b EXTRA_CNF= diff --git a/asn1/x411/Makefile.common b/asn1/x411/Makefile.common index 8052ff7137..1f998da786 100644 --- a/asn1/x411/Makefile.common +++ b/asn1/x411/Makefile.common @@ -45,7 +45,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../x509af/x509af-exp.cnf \ diff --git a/asn1/x420/Makefile.common b/asn1/x420/Makefile.common index bb64d0f0a4..cd00b619ba 100644 --- a/asn1/x420/Makefile.common +++ b/asn1/x420/Makefile.common @@ -47,7 +47,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../acse/acse-exp.cnf \ diff --git a/asn1/x509af/Makefile.common b/asn1/x509af/Makefile.common index c2e99b10bd..2c351d12b0 100644 --- a/asn1/x509af/Makefile.common +++ b/asn1/x509af/Makefile.common @@ -45,7 +45,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../x509ce/x509ce-exp.cnf \ diff --git a/asn1/x509ce/Makefile.common b/asn1/x509ce/Makefile.common index b9c916b203..45be2cbd2c 100644 --- a/asn1/x509ce/Makefile.common +++ b/asn1/x509ce/Makefile.common @@ -45,7 +45,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../x411/x411-exp.cnf \ diff --git a/asn1/x509if/Makefile.common b/asn1/x509if/Makefile.common index b07184b4eb..854cf2c18a 100644 --- a/asn1/x509if/Makefile.common +++ b/asn1/x509if/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../x509sat/x509sat-exp.cnf diff --git a/asn1/x509sat/Makefile.common b/asn1/x509sat/Makefile.common index 159d6b852e..ab4759d1ad 100644 --- a/asn1/x509sat/Makefile.common +++ b/asn1/x509sat/Makefile.common @@ -46,7 +46,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e -X -T +A2W_FLAGS= -b -e EXTRA_CNF= \ ../x509if/x509if-exp.cnf diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index da891f51b3..13d9265130 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ansi_tcap.c */ -/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ./ansi_tcap.cnf -s ./packet-ansi_tcap-template -D . TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ +/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ansi_tcap.cnf -s packet-ansi_tcap-template TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ /* Input file: packet-ansi_tcap-template.c */ @@ -94,11 +94,11 @@ static int hf_ansi_tcap_securityContext = -1; /* T_securityContext */ static int hf_ansi_tcap_integerSecurityId = -1; /* INTEGER */ static int hf_ansi_tcap_objectSecurityId = -1; /* OBJECT_IDENTIFIER */ static int hf_ansi_tcap_confidentiality = -1; /* Confidentiality */ -static int hf_ansi_tcap_UserInformation_item = -1; /* EXTERNAL */ +static int hf_ansi_tcap__untag_item = -1; /* EXTERNAL */ static int hf_ansi_tcap_confidentialityId = -1; /* T_confidentialityId */ static int hf_ansi_tcap_integerConfidentialityId = -1; /* INTEGER */ static int hf_ansi_tcap_objectConfidentialityId = -1; /* OBJECT_IDENTIFIER */ -static int hf_ansi_tcap_ComponentSequence_item = -1; /* ComponentPDU */ +static int hf_ansi_tcap__untag_item_01 = -1; /* ComponentPDU */ static int hf_ansi_tcap_invokeLast = -1; /* Invoke */ static int hf_ansi_tcap_returnResultLast = -1; /* ReturnResult */ static int hf_ansi_tcap_returnError = -1; /* ReturnError */ @@ -146,13 +146,13 @@ static gint ett_ansi_tcap_UniTransactionPDU = -1; static gint ett_ansi_tcap_TransactionPDU = -1; static gint ett_ansi_tcap_Abort = -1; static gint ett_ansi_tcap_T_causeInformation = -1; -static gint ett_ansi_tcap_DialoguePortion = -1; +static gint ett_ansi_tcap_DialoguePortion_U = -1; static gint ett_ansi_tcap_T_applicationContext = -1; static gint ett_ansi_tcap_T_securityContext = -1; -static gint ett_ansi_tcap_UserInformation = -1; +static gint ett_ansi_tcap_UserInformation_U = -1; static gint ett_ansi_tcap_Confidentiality = -1; static gint ett_ansi_tcap_T_confidentialityId = -1; -static gint ett_ansi_tcap_ComponentSequence = -1; +static gint ett_ansi_tcap_SEQUENCE_OF_ComponentPDU = -1; static gint ett_ansi_tcap_ComponentPDU = -1; static gint ett_ansi_tcap_Invoke = -1; static gint ett_ansi_tcap_ReturnResult = -1; @@ -412,9 +412,6 @@ find_tcap_subdissector(tvbuff_t *tvb, asn1_ctx_t *actx, proto_tree *tree){ /*--- Included file: packet-ansi_tcap-fn.c ---*/ #line 1 "packet-ansi_tcap-fn.c" -/*--- Fields for imported types ---*/ - - static int @@ -424,9 +421,6 @@ dissect_ansi_tcap_T_national(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; } -static int dissect_national_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_national(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_national); -} @@ -437,9 +431,6 @@ dissect_ansi_tcap_T_private(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static int dissect_private_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_private(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_private); -} static const value_string ansi_tcap_OperationCode_vals[] = { @@ -448,26 +439,23 @@ static const value_string ansi_tcap_OperationCode_vals[] = { { 0, NULL } }; -static const ber_old_choice_t OperationCode_choice[] = { - { 16, BER_CLASS_PRI, 16, BER_FLAGS_IMPLTAG, dissect_national_impl }, - { 17, BER_CLASS_PRI, 17, BER_FLAGS_IMPLTAG, dissect_private_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t OperationCode_choice[] = { + { 16, &hf_ansi_tcap_national , BER_CLASS_PRI, 16, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_national }, + { 17, &hf_ansi_tcap_private , BER_CLASS_PRI, 17, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_private }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - OperationCode_choice, hf_index, ett_ansi_tcap_OperationCode, - &ansi_tcap_private.d.OperationCode); + offset = dissect_ber_choice(actx, tree, tvb, offset, + OperationCode_choice, hf_index, ett_ansi_tcap_OperationCode, + &ansi_tcap_private.d.OperationCode); #line 12 "ansi_tcap.cnf" ansi_tcap_private.d.OperationCode_item = actx->created_item; return offset; } -static int dissect_operationCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_OperationCode(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_operationCode); -} @@ -478,9 +466,6 @@ dissect_ansi_tcap_INTEGER_M128_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_national_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_INTEGER_M128_127(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_national_01); -} @@ -491,15 +476,6 @@ dissect_ansi_tcap_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_private_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_INTEGER(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_private_01); -} -static int dissect_integerSecurityId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_INTEGER(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_integerSecurityId); -} -static int dissect_integerConfidentialityId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_INTEGER(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_integerConfidentialityId); -} static const value_string ansi_tcap_ErrorCode_vals[] = { @@ -508,23 +484,20 @@ static const value_string ansi_tcap_ErrorCode_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ErrorCode_choice[] = { - { 19, BER_CLASS_PRI, 19, 0, dissect_national_01 }, - { 20, BER_CLASS_PRI, 20, 0, dissect_private_01 }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ErrorCode_choice[] = { + { 19, &hf_ansi_tcap_national_01, BER_CLASS_PRI, 19, 0, dissect_ansi_tcap_INTEGER_M128_127 }, + { 20, &hf_ansi_tcap_private_01, BER_CLASS_PRI, 20, 0, dissect_ansi_tcap_INTEGER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - ErrorCode_choice, hf_index, ett_ansi_tcap_ErrorCode, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ErrorCode_choice, hf_index, ett_ansi_tcap_ErrorCode, + NULL); return offset; } -static int dissect_errorCode(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ErrorCode(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_errorCode); -} @@ -539,40 +512,88 @@ dissect_ansi_tcap_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int -dissect_ansi_tcap_TransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ansi_tcap_TransactionID_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 115 "ansi_tcap.cnf" + +tvbuff_t *next_tvb; +guint8 len; + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + &next_tvb); + + +if(next_tvb) { + if(tvb_length(next_tvb) !=0) + ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 0,tvb_length(next_tvb)); + len = tvb_length_remaining(next_tvb, 0); + switch(len) { + case 1: + gp_tcapsrt_info->src_tid=tvb_get_guint8(next_tvb, 0); + break; + case 2: + gp_tcapsrt_info->src_tid=tvb_get_ntohs(next_tvb, 0); + break; + case 4: + gp_tcapsrt_info->src_tid=tvb_get_ntohl(next_tvb, 0); + break; + default: + gp_tcapsrt_info->src_tid=0; + break; + } +} + + return offset; } -static int dissect_identifier(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_TransactionID(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_identifier); + + + +static int +dissect_ansi_tcap_TransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 7, TRUE, dissect_ansi_tcap_TransactionID_U); + + return offset; } static int -dissect_ansi_tcap_ProtocolVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ansi_tcap_OCTET_STRING_SIZE_1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } -static int dissect_version(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ProtocolVersion(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_version); + + + +static int +dissect_ansi_tcap_ProtocolVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 26, TRUE, dissect_ansi_tcap_OCTET_STRING_SIZE_1); + + return offset; } static int dissect_ansi_tcap_IntegerApplicationContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 27, TRUE, dissect_ansi_tcap_INTEGER); return offset; } -static int dissect_integerApplicationId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_IntegerApplicationContext(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_integerApplicationId); + + + +static int +dissect_ansi_tcap_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); + + return offset; } @@ -583,7 +604,8 @@ dissect_ansi_tcap_ObjectIDApplicationContext(gboolean implicit_tag _U_, tvbuff_t static const char * oid_str; - offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &oid_str); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 28, TRUE, dissect_ansi_tcap_OBJECT_IDENTIFIER); ansi_tcap_private.objectApplicationId_oid= (void*) oid_str; ansi_tcap_private.oid_is_present=TRUE; @@ -592,9 +614,6 @@ dissect_ansi_tcap_ObjectIDApplicationContext(gboolean implicit_tag _U_, tvbuff_t return offset; } -static int dissect_objectApplicationId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ObjectIDApplicationContext(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_objectApplicationId); -} static const value_string ansi_tcap_T_applicationContext_vals[] = { @@ -603,23 +622,20 @@ static const value_string ansi_tcap_T_applicationContext_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_applicationContext_choice[] = { - { 27, BER_CLASS_PRI, 27, BER_FLAGS_NOOWNTAG, dissect_integerApplicationId }, - { 28, BER_CLASS_PRI, 28, BER_FLAGS_NOOWNTAG, dissect_objectApplicationId }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_applicationContext_choice[] = { + { 27, &hf_ansi_tcap_integerApplicationId, BER_CLASS_PRI, 27, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_IntegerApplicationContext }, + { 28, &hf_ansi_tcap_objectApplicationId, BER_CLASS_PRI, 28, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_ObjectIDApplicationContext }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_T_applicationContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_applicationContext_choice, hf_index, ett_ansi_tcap_T_applicationContext, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_applicationContext_choice, hf_index, ett_ansi_tcap_T_applicationContext, + NULL); return offset; } -static int dissect_applicationContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_applicationContext(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_applicationContext); -} @@ -629,40 +645,29 @@ dissect_ansi_tcap_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off return offset; } -static int dissect_UserInformation_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_EXTERNAL(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_UserInformation_item); -} -static const ber_old_sequence_t UserInformation_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_EXTERNAL, BER_FLAGS_NOOWNTAG, dissect_UserInformation_item }, +static const ber_sequence_t UserInformation_U_sequence_of[1] = { + { &hf_ansi_tcap__untag_item, BER_CLASS_UNI, BER_UNI_TAG_EXTERNAL, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_EXTERNAL }, }; static int -dissect_ansi_tcap_UserInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - UserInformation_sequence_of, hf_index, ett_ansi_tcap_UserInformation); +dissect_ansi_tcap_UserInformation_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + UserInformation_U_sequence_of, hf_index, ett_ansi_tcap_UserInformation_U); return offset; } -static int dissect_userInformation_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_UserInformation(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_userInformation_01); -} static int -dissect_ansi_tcap_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); +dissect_ansi_tcap_UserInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 29, TRUE, dissect_ansi_tcap_UserInformation_U); return offset; } -static int dissect_objectSecurityId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_OBJECT_IDENTIFIER(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_objectSecurityId); -} -static int dissect_objectConfidentialityId_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_OBJECT_IDENTIFIER(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_objectConfidentialityId); -} static const value_string ansi_tcap_T_securityContext_vals[] = { @@ -671,23 +676,20 @@ static const value_string ansi_tcap_T_securityContext_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_securityContext_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integerSecurityId_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_objectSecurityId_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_securityContext_choice[] = { + { 0, &hf_ansi_tcap_integerSecurityId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_INTEGER }, + { 1, &hf_ansi_tcap_objectSecurityId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_OBJECT_IDENTIFIER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_T_securityContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_securityContext_choice, hf_index, ett_ansi_tcap_T_securityContext, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_securityContext_choice, hf_index, ett_ansi_tcap_T_securityContext, + NULL); return offset; } -static int dissect_securityContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_securityContext(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_securityContext); -} static const value_string ansi_tcap_T_confidentialityId_vals[] = { @@ -696,63 +698,61 @@ static const value_string ansi_tcap_T_confidentialityId_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_confidentialityId_choice[] = { - { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integerConfidentialityId_impl }, - { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_objectConfidentialityId_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_confidentialityId_choice[] = { + { 0, &hf_ansi_tcap_integerConfidentialityId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_INTEGER }, + { 1, &hf_ansi_tcap_objectConfidentialityId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_OBJECT_IDENTIFIER }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_T_confidentialityId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_confidentialityId_choice, hf_index, ett_ansi_tcap_T_confidentialityId, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_confidentialityId_choice, hf_index, ett_ansi_tcap_T_confidentialityId, + NULL); return offset; } -static int dissect_confidentialityId(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_confidentialityId(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_confidentialityId); -} -static const ber_old_sequence_t Confidentiality_sequence[] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_confidentialityId }, - { 0, 0, 0, NULL } +static const ber_sequence_t Confidentiality_sequence[] = { + { &hf_ansi_tcap_confidentialityId, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_T_confidentialityId }, + { NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_Confidentiality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Confidentiality_sequence, hf_index, ett_ansi_tcap_Confidentiality); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Confidentiality_sequence, hf_index, ett_ansi_tcap_Confidentiality); return offset; } -static int dissect_confidentiality_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_Confidentiality(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_confidentiality); -} -static const ber_old_sequence_t DialoguePortion_sequence[] = { - { BER_CLASS_PRI, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_applicationContext }, - { BER_CLASS_PRI, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_userInformation_01 }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_securityContext }, - { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_confidentiality_impl }, - { 0, 0, 0, NULL } +static const ber_sequence_t DialoguePortion_U_sequence[] = { + { &hf_ansi_tcap_version , BER_CLASS_PRI, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_ProtocolVersion }, + { &hf_ansi_tcap_applicationContext, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_T_applicationContext }, + { &hf_ansi_tcap_userInformation_01, BER_CLASS_PRI, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_UserInformation }, + { &hf_ansi_tcap_securityContext, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_T_securityContext }, + { &hf_ansi_tcap_confidentiality, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_tcap_Confidentiality }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_ansi_tcap_DialoguePortion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - DialoguePortion_sequence, hf_index, ett_ansi_tcap_DialoguePortion); +dissect_ansi_tcap_DialoguePortion_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + DialoguePortion_U_sequence, hf_index, ett_ansi_tcap_DialoguePortion_U); return offset; } -static int dissect_dialoguePortion(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_DialoguePortion(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_dialoguePortion); -} -static int dissect_dialogPortion(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_DialoguePortion(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_dialogPortion); + + + +static int +dissect_ansi_tcap_DialoguePortion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 25, TRUE, dissect_ansi_tcap_DialoguePortion_U); + + return offset; } @@ -764,9 +764,6 @@ dissect_ansi_tcap_T_componentIDs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; } -static int dissect_componentIDs_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_componentIDs(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_componentIDs); -} @@ -786,16 +783,13 @@ tvbuff_t *parameter_tvb; return offset; } -static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_parameter(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_parameter); -} -static const ber_old_sequence_t Invoke_sequence[] = { - { BER_CLASS_PRI, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_componentIDs_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_operationCode }, - { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter }, - { 0, 0, 0, NULL } +static const ber_sequence_t Invoke_sequence[] = { + { &hf_ansi_tcap_componentIDs, BER_CLASS_PRI, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_componentIDs }, + { &hf_ansi_tcap_operationCode, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_OperationCode }, + { &hf_ansi_tcap_parameter , BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_T_parameter }, + { NULL, 0, 0, 0, NULL } }; static int @@ -805,17 +799,11 @@ dissect_ansi_tcap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Invoke_sequence, hf_index, ett_ansi_tcap_Invoke); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Invoke_sequence, hf_index, ett_ansi_tcap_Invoke); return offset; } -static int dissect_invokeLast_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_Invoke(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_invokeLast); -} -static int dissect_invokeNotLast_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_Invoke(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_invokeNotLast); -} @@ -826,9 +814,6 @@ dissect_ansi_tcap_T_componentID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; } -static int dissect_componentID_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_componentID(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_componentID); -} @@ -849,15 +834,12 @@ tvbuff_t *parameter_tvb; return offset; } -static int dissect_parameter_01(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_parameter_01(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_parameter_01); -} -static const ber_old_sequence_t ReturnResult_sequence[] = { - { BER_CLASS_PRI, 15, BER_FLAGS_IMPLTAG, dissect_componentID_impl }, - { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter_01 }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReturnResult_sequence[] = { + { &hf_ansi_tcap_componentID, BER_CLASS_PRI, 15, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_componentID }, + { &hf_ansi_tcap_parameter_01, BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_T_parameter_01 }, + { NULL, 0, 0, 0, NULL } }; static int @@ -868,17 +850,11 @@ dissect_ansi_tcap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReturnResult_sequence, hf_index, ett_ansi_tcap_ReturnResult); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReturnResult_sequence, hf_index, ett_ansi_tcap_ReturnResult); return offset; } -static int dissect_returnResultLast_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ReturnResult(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_returnResultLast); -} -static int dissect_returnResultNotLast_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ReturnResult(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_returnResultNotLast); -} @@ -889,9 +865,6 @@ dissect_ansi_tcap_T_componentID_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } -static int dissect_componentID_01_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_componentID_01(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_componentID_01); -} @@ -911,16 +884,13 @@ tvbuff_t *parameter_tvb; return offset; } -static int dissect_parameter_02(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_parameter_02(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_parameter_02); -} -static const ber_old_sequence_t ReturnError_sequence[] = { - { BER_CLASS_PRI, 15, BER_FLAGS_IMPLTAG, dissect_componentID_01_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorCode }, - { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter_02 }, - { 0, 0, 0, NULL } +static const ber_sequence_t ReturnError_sequence[] = { + { &hf_ansi_tcap_componentID_01, BER_CLASS_PRI, 15, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_componentID_01 }, + { &hf_ansi_tcap_errorCode , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_ErrorCode }, + { &hf_ansi_tcap_parameter_02, BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_T_parameter_02 }, + { NULL, 0, 0, 0, NULL } }; static int @@ -929,14 +899,11 @@ dissect_ansi_tcap_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int ansi_tcap_private.d.pdu = 3; - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - ReturnError_sequence, hf_index, ett_ansi_tcap_ReturnError); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + ReturnError_sequence, hf_index, ett_ansi_tcap_ReturnError); return offset; } -static int dissect_returnError_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ReturnError(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_returnError); -} @@ -947,9 +914,6 @@ dissect_ansi_tcap_OCTET_STRING_SIZE_0_1(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static int dissect_componentID_02_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_OCTET_STRING_SIZE_0_1(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_componentID_02); -} static const value_string ansi_tcap_Problem_vals[] = { @@ -986,41 +950,32 @@ dissect_ansi_tcap_Problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs return offset; } -static int dissect_rejectProblem_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_Problem(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_rejectProblem); -} -static const ber_old_sequence_t T_paramSequence_sequence[] = { - { 0, 0, 0, NULL } +static const ber_sequence_t T_paramSequence_sequence[] = { + { NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_T_paramSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - T_paramSequence_sequence, hf_index, ett_ansi_tcap_T_paramSequence); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_paramSequence_sequence, hf_index, ett_ansi_tcap_T_paramSequence); return offset; } -static int dissect_paramSequence_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_paramSequence(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_paramSequence); -} -static const ber_old_sequence_t T_paramSet_set[] = { - { 0, 0, 0, NULL } +static const ber_sequence_t T_paramSet_set[] = { + { NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_T_paramSet(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_set(implicit_tag, actx, tree, tvb, offset, - T_paramSet_set, hf_index, ett_ansi_tcap_T_paramSet); + offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, + T_paramSet_set, hf_index, ett_ansi_tcap_T_paramSet); return offset; } -static int dissect_paramSet_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_paramSet(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_paramSet); -} static const value_string ansi_tcap_T_parameter_03_vals[] = { @@ -1029,42 +984,36 @@ static const value_string ansi_tcap_T_parameter_03_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_parameter_03_choice[] = { - { 16, BER_CLASS_PRI, 16, BER_FLAGS_IMPLTAG, dissect_paramSequence_impl }, - { 18, BER_CLASS_PRI, 18, BER_FLAGS_IMPLTAG, dissect_paramSet_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_parameter_03_choice[] = { + { 16, &hf_ansi_tcap_paramSequence, BER_CLASS_PRI, 16, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_paramSequence }, + { 18, &hf_ansi_tcap_paramSet , BER_CLASS_PRI, 18, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_paramSet }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_T_parameter_03(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_parameter_03_choice, hf_index, ett_ansi_tcap_T_parameter_03, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_parameter_03_choice, hf_index, ett_ansi_tcap_T_parameter_03, + NULL); return offset; } -static int dissect_parameter_03(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_parameter_03(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_parameter_03); -} -static const ber_old_sequence_t Reject_sequence[] = { - { BER_CLASS_PRI, 15, BER_FLAGS_IMPLTAG, dissect_componentID_02_impl }, - { BER_CLASS_PRI, 21, BER_FLAGS_IMPLTAG, dissect_rejectProblem_impl }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_parameter_03 }, - { 0, 0, 0, NULL } +static const ber_sequence_t Reject_sequence[] = { + { &hf_ansi_tcap_componentID_02, BER_CLASS_PRI, 15, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_OCTET_STRING_SIZE_0_1 }, + { &hf_ansi_tcap_rejectProblem, BER_CLASS_PRI, 21, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_Problem }, + { &hf_ansi_tcap_parameter_03, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_T_parameter_03 }, + { NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Reject_sequence, hf_index, ett_ansi_tcap_Reject); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Reject_sequence, hf_index, ett_ansi_tcap_Reject); return offset; } -static int dissect_reject_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_Reject(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_reject); -} static const value_string ansi_tcap_ComponentPDU_vals[] = { @@ -1077,56 +1026,60 @@ static const value_string ansi_tcap_ComponentPDU_vals[] = { { 0, NULL } }; -static const ber_old_choice_t ComponentPDU_choice[] = { - { 9, BER_CLASS_PRI, 9, BER_FLAGS_IMPLTAG, dissect_invokeLast_impl }, - { 10, BER_CLASS_PRI, 10, BER_FLAGS_IMPLTAG, dissect_returnResultLast_impl }, - { 11, BER_CLASS_PRI, 11, BER_FLAGS_IMPLTAG, dissect_returnError_impl }, - { 12, BER_CLASS_PRI, 12, BER_FLAGS_IMPLTAG, dissect_reject_impl }, - { 13, BER_CLASS_PRI, 13, BER_FLAGS_IMPLTAG, dissect_invokeNotLast_impl }, - { 14, BER_CLASS_PRI, 14, BER_FLAGS_IMPLTAG, dissect_returnResultNotLast_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t ComponentPDU_choice[] = { + { 9, &hf_ansi_tcap_invokeLast, BER_CLASS_PRI, 9, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_Invoke }, + { 10, &hf_ansi_tcap_returnResultLast, BER_CLASS_PRI, 10, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_ReturnResult }, + { 11, &hf_ansi_tcap_returnError, BER_CLASS_PRI, 11, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_ReturnError }, + { 12, &hf_ansi_tcap_reject , BER_CLASS_PRI, 12, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_Reject }, + { 13, &hf_ansi_tcap_invokeNotLast, BER_CLASS_PRI, 13, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_Invoke }, + { 14, &hf_ansi_tcap_returnResultNotLast, BER_CLASS_PRI, 14, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_ReturnResult }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - ComponentPDU_choice, hf_index, ett_ansi_tcap_ComponentPDU, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + ComponentPDU_choice, hf_index, ett_ansi_tcap_ComponentPDU, + NULL); return offset; } -static int dissect_ComponentSequence_item(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ComponentPDU(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_ComponentSequence_item); -} -static const ber_old_sequence_t ComponentSequence_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ComponentSequence_item }, +static const ber_sequence_t SEQUENCE_OF_ComponentPDU_sequence_of[1] = { + { &hf_ansi_tcap__untag_item_01, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_ComponentPDU }, }; static int -dissect_ansi_tcap_ComponentSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence_of(implicit_tag, actx, tree, tvb, offset, - ComponentSequence_sequence_of, hf_index, ett_ansi_tcap_ComponentSequence); +dissect_ansi_tcap_SEQUENCE_OF_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_OF_ComponentPDU_sequence_of, hf_index, ett_ansi_tcap_SEQUENCE_OF_ComponentPDU); return offset; } -static int dissect_componentPortion(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_ComponentSequence(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_componentPortion); + + + +static int +dissect_ansi_tcap_ComponentSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 8, TRUE, dissect_ansi_tcap_SEQUENCE_OF_ComponentPDU); + + return offset; } -static const ber_old_sequence_t UniTransactionPDU_sequence[] = { - { BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier }, - { BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion }, - { BER_CLASS_PRI, 8, BER_FLAGS_NOOWNTAG, dissect_componentPortion }, - { 0, 0, 0, NULL } +static const ber_sequence_t UniTransactionPDU_sequence[] = { + { &hf_ansi_tcap_identifier, BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_TransactionID }, + { &hf_ansi_tcap_dialoguePortion, BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_DialoguePortion }, + { &hf_ansi_tcap_componentPortion, BER_CLASS_PRI, 8, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_ComponentSequence }, + { NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_UniTransactionPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - UniTransactionPDU_sequence, hf_index, ett_ansi_tcap_UniTransactionPDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + UniTransactionPDU_sequence, hf_index, ett_ansi_tcap_UniTransactionPDU); return offset; } @@ -1145,22 +1098,19 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) return offset; } -static int dissect_unidirectional_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_unidirectional(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_unidirectional); -} -static const ber_old_sequence_t TransactionPDU_sequence[] = { - { BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier }, - { BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialoguePortion }, - { BER_CLASS_PRI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_componentPortion }, - { 0, 0, 0, NULL } +static const ber_sequence_t TransactionPDU_sequence[] = { + { &hf_ansi_tcap_identifier, BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_TransactionID }, + { &hf_ansi_tcap_dialoguePortion, BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_DialoguePortion }, + { &hf_ansi_tcap_componentPortion, BER_CLASS_PRI, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_ComponentSequence }, + { NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_TransactionPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - TransactionPDU_sequence, hf_index, ett_ansi_tcap_TransactionPDU); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + TransactionPDU_sequence, hf_index, ett_ansi_tcap_TransactionPDU); return offset; } @@ -1179,9 +1129,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) return offset; } -static int dissect_queryWithPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_queryWithPerm(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_queryWithPerm); -} @@ -1197,9 +1144,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) return offset; } -static int dissect_queryWithoutPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_queryWithoutPerm(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_queryWithoutPerm); -} @@ -1215,9 +1159,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) return offset; } -static int dissect_response_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_response(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_response); -} @@ -1233,9 +1174,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) return offset; } -static int dissect_conversationWithPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_conversationWithPerm(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_conversationWithPerm); -} @@ -1251,12 +1189,9 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) return offset; } -static int dissect_conversationWithoutPerm_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_conversationWithoutPerm(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_conversationWithoutPerm); -} -static const value_string ansi_tcap_P_Abort_cause_vals[] = { +static const value_string ansi_tcap_P_Abort_cause_U_vals[] = { { 1, "unrecognizedPackageType" }, { 2, "incorrectTransactionPortion" }, { 3, "badlyStructuredTransactionPortion" }, @@ -1272,27 +1207,32 @@ static const value_string ansi_tcap_P_Abort_cause_vals[] = { static int -dissect_ansi_tcap_P_Abort_cause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ansi_tcap_P_Abort_cause_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } -static int dissect_abortCause(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_P_Abort_cause(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_abortCause); + + + +static int +dissect_ansi_tcap_P_Abort_cause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 23, TRUE, dissect_ansi_tcap_P_Abort_cause_U); + + return offset; } static int dissect_ansi_tcap_UserAbortInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_external_type(implicit_tag, tree, tvb, offset, actx, hf_index, NULL); + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, + hf_index, BER_CLASS_PRI, 24, FALSE, dissect_ansi_tcap_EXTERNAL); return offset; } -static int dissect_userInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_UserAbortInformation(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_userInformation); -} static const value_string ansi_tcap_T_causeInformation_vals[] = { @@ -1301,36 +1241,33 @@ static const value_string ansi_tcap_T_causeInformation_vals[] = { { 0, NULL } }; -static const ber_old_choice_t T_causeInformation_choice[] = { - { 23, BER_CLASS_PRI, 23, BER_FLAGS_NOOWNTAG, dissect_abortCause }, - { 24, BER_CLASS_PRI, 24, BER_FLAGS_NOOWNTAG, dissect_userInformation }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t T_causeInformation_choice[] = { + { 23, &hf_ansi_tcap_abortCause, BER_CLASS_PRI, 23, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_P_Abort_cause }, + { 24, &hf_ansi_tcap_userInformation, BER_CLASS_PRI, 24, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_UserAbortInformation }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_T_causeInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - T_causeInformation_choice, hf_index, ett_ansi_tcap_T_causeInformation, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_causeInformation_choice, hf_index, ett_ansi_tcap_T_causeInformation, + NULL); return offset; } -static int dissect_causeInformation(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_causeInformation(FALSE, tvb, offset, actx, tree, hf_ansi_tcap_causeInformation); -} -static const ber_old_sequence_t Abort_sequence[] = { - { BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_identifier }, - { BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dialogPortion }, - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_causeInformation }, - { 0, 0, 0, NULL } +static const ber_sequence_t Abort_sequence[] = { + { &hf_ansi_tcap_identifier, BER_CLASS_PRI, 7, BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_TransactionID }, + { &hf_ansi_tcap_dialogPortion, BER_CLASS_PRI, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ansi_tcap_DialoguePortion }, + { &hf_ansi_tcap_causeInformation, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_tcap_T_causeInformation }, + { NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_Abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, - Abort_sequence, hf_index, ett_ansi_tcap_Abort); + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + Abort_sequence, hf_index, ett_ansi_tcap_Abort); return offset; } @@ -1349,9 +1286,6 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) return offset; } -static int dissect_abort_impl(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) { - return dissect_ansi_tcap_T_abort(TRUE, tvb, offset, actx, tree, hf_ansi_tcap_abort); -} static const value_string ansi_tcap_PackageType_vals[] = { @@ -1365,22 +1299,22 @@ static const value_string ansi_tcap_PackageType_vals[] = { { 0, NULL } }; -static const ber_old_choice_t PackageType_choice[] = { - { 1, BER_CLASS_PRI, 1, BER_FLAGS_IMPLTAG, dissect_unidirectional_impl }, - { 2, BER_CLASS_PRI, 2, BER_FLAGS_IMPLTAG, dissect_queryWithPerm_impl }, - { 3, BER_CLASS_PRI, 3, BER_FLAGS_IMPLTAG, dissect_queryWithoutPerm_impl }, - { 4, BER_CLASS_PRI, 4, BER_FLAGS_IMPLTAG, dissect_response_impl }, - { 5, BER_CLASS_PRI, 5, BER_FLAGS_IMPLTAG, dissect_conversationWithPerm_impl }, - { 6, BER_CLASS_PRI, 6, BER_FLAGS_IMPLTAG, dissect_conversationWithoutPerm_impl }, - { 22, BER_CLASS_PRI, 22, BER_FLAGS_IMPLTAG, dissect_abort_impl }, - { 0, 0, 0, 0, NULL } +static const ber_choice_t PackageType_choice[] = { + { 1, &hf_ansi_tcap_unidirectional, BER_CLASS_PRI, 1, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_unidirectional }, + { 2, &hf_ansi_tcap_queryWithPerm, BER_CLASS_PRI, 2, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_queryWithPerm }, + { 3, &hf_ansi_tcap_queryWithoutPerm, BER_CLASS_PRI, 3, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_queryWithoutPerm }, + { 4, &hf_ansi_tcap_response , BER_CLASS_PRI, 4, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_response }, + { 5, &hf_ansi_tcap_conversationWithPerm, BER_CLASS_PRI, 5, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_conversationWithPerm }, + { 6, &hf_ansi_tcap_conversationWithoutPerm, BER_CLASS_PRI, 6, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_conversationWithoutPerm }, + { 22, &hf_ansi_tcap_abort , BER_CLASS_PRI, 22, BER_FLAGS_IMPLTAG, dissect_ansi_tcap_T_abort }, + { 0, NULL, 0, 0, 0, NULL } }; static int dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_old_choice(actx, tree, tvb, offset, - PackageType_choice, hf_index, ett_ansi_tcap_PackageType, - NULL); + offset = dissect_ber_choice(actx, tree, tvb, offset, + PackageType_choice, hf_index, ett_ansi_tcap_PackageType, + NULL); return offset; } @@ -1580,7 +1514,7 @@ proto_register_ansi_tcap(void) "ansi_tcap.T_causeInformation", HFILL }}, { &hf_ansi_tcap_abortCause, { "abortCause", "ansi_tcap.abortCause", - FT_INT32, BASE_DEC, VALS(ansi_tcap_P_Abort_cause_vals), 0, + FT_INT32, BASE_DEC, VALS(ansi_tcap_P_Abort_cause_U_vals), 0, "ansi_tcap.P_Abort_cause", HFILL }}, { &hf_ansi_tcap_userInformation, { "userInformation", "ansi_tcap.userInformation", @@ -1622,8 +1556,8 @@ proto_register_ansi_tcap(void) { "confidentiality", "ansi_tcap.confidentiality", FT_NONE, BASE_NONE, NULL, 0, "ansi_tcap.Confidentiality", HFILL }}, - { &hf_ansi_tcap_UserInformation_item, - { "Item", "ansi_tcap.UserInformation_item", + { &hf_ansi_tcap__untag_item, + { "Item", "ansi_tcap._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ansi_tcap.EXTERNAL", HFILL }}, { &hf_ansi_tcap_confidentialityId, @@ -1638,8 +1572,8 @@ proto_register_ansi_tcap(void) { "objectConfidentialityId", "ansi_tcap.objectConfidentialityId", FT_OID, BASE_NONE, NULL, 0, "ansi_tcap.OBJECT_IDENTIFIER", HFILL }}, - { &hf_ansi_tcap_ComponentSequence_item, - { "Item", "ansi_tcap.ComponentSequence_item", + { &hf_ansi_tcap__untag_item_01, + { "Item", "ansi_tcap._untag_item", FT_UINT32, BASE_DEC, VALS(ansi_tcap_ComponentPDU_vals), 0, "ansi_tcap.ComponentPDU", HFILL }}, { &hf_ansi_tcap_invokeLast, @@ -1740,13 +1674,13 @@ proto_register_ansi_tcap(void) &ett_ansi_tcap_TransactionPDU, &ett_ansi_tcap_Abort, &ett_ansi_tcap_T_causeInformation, - &ett_ansi_tcap_DialoguePortion, + &ett_ansi_tcap_DialoguePortion_U, &ett_ansi_tcap_T_applicationContext, &ett_ansi_tcap_T_securityContext, - &ett_ansi_tcap_UserInformation, + &ett_ansi_tcap_UserInformation_U, &ett_ansi_tcap_Confidentiality, &ett_ansi_tcap_T_confidentialityId, - &ett_ansi_tcap_ComponentSequence, + &ett_ansi_tcap_SEQUENCE_OF_ComponentPDU, &ett_ansi_tcap_ComponentPDU, &ett_ansi_tcap_Invoke, &ett_ansi_tcap_ReturnResult, diff --git a/epan/dissectors/packet-ansi_tcap.h b/epan/dissectors/packet-ansi_tcap.h index ba905f3e73..37d293ff7a 100644 --- a/epan/dissectors/packet-ansi_tcap.h +++ b/epan/dissectors/packet-ansi_tcap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ansi_tcap.h */ -/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ./ansi_tcap.cnf -s ./packet-ansi_tcap-template -D . TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ +/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ansi_tcap.cnf -s packet-ansi_tcap-template TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ /* Input file: packet-ansi_tcap-template.h */ diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index ac0652fa57..aa8fb2a2ea 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -546,7 +546,6 @@ class EthCtx: self.output.ectx = self self.encoding = 'per' self.aligned = False - self.new_ber = False self.default_oid_variant = '' self.default_opentype_variant = '' self.default_containing_variant = '_pdu_new' @@ -567,11 +566,9 @@ class EthCtx: # Encoding def Per(self): return self.encoding == 'per' def Ber(self): return self.encoding == 'ber' - def NewBer(self): return self.new_ber def Aligned(self): return self.aligned def Unaligned(self): return not self.aligned - def Fld(self, tnm='*'): return self.fld_opt.get('*', False) or self.fld_opt.get(tnm, False) or (self.Ber() and not self.NewBer()) - def Tag(self): return self.tag_opt # or self.Ber() - temporary comment out (experimental feature) + def Tag(self): return self.tag_opt or self.Ber() def NAPI(self): return False # disable planned features def Module(self): # current module name @@ -824,7 +821,7 @@ class EthCtx: 'ethname' : ethtype } self.type[ident]['attr'] = { 'TYPE' : 'FT_NONE', 'DISPLAY' : 'BASE_NONE', 'STRINGS' : 'NULL', 'BITMASK' : '0' } - self.eth_type[ethtype] = { 'import' : 'xxx', 'proto' : 'xxx' , 'attr' : {}, 'create_field' : False, 'ref' : []} + self.eth_type[ethtype] = { 'import' : 'xxx', 'proto' : 'xxx' , 'attr' : {}, 'ref' : []} print "Dummy imported: %s (%s)" % (ident, ethtype) return ethtype @@ -960,7 +957,7 @@ class EthCtx: else: raise "Duplicate field for " + ident self.field[ident] = {'type' : type, 'idx' : idx, 'impl' : impl, 'pdu' : pdu, - 'modified' : '', 'attr' : {} , 'create_field' : False } + 'modified' : '', 'attr' : {} } name = ident.split('/')[-1] if len(ident.split('/')) > 1 and name == '_item': # Sequnce/Set of type self.field[ident]['attr']['NAME'] = '"Item"' @@ -977,7 +974,6 @@ class EthCtx: else: self.field_ord.append(ident) if parent: - self.field[ident]['create_field'] = self.Fld(parent) self.eth_dep_add(parent, type) #--- eth_clean -------------------------------------------------------------- @@ -1097,7 +1093,7 @@ class EthCtx: nm = asn2c(t) self.eth_type[nm] = { 'import' : self.type[t]['import'], 'proto' : asn2c(self.type[t]['proto']), - 'attr' : {}, 'create_field' : False, 'ref' : []} + 'attr' : {}, 'ref' : []} self.eth_type[nm]['attr'].update(self.conform.use_item('ETYPE_ATTR', nm)) self.type[t]['ethname'] = nm for t in self.type_ord: @@ -1129,8 +1125,7 @@ class EthCtx: self.eth_type[nm] = { 'import' : None, 'proto' : self.eproto, 'export' : 0, 'enum' : 0, 'user_def' : EF_TYPE|EF_VALS, 'no_emit' : EF_TYPE|EF_VALS, 'val' : self.type[t]['val'], - 'attr' : {}, - 'create_field' : False, 'ref' : [t]} + 'attr' : {}, 'ref' : [t]} self.type[t]['ethname'] = nm if (not self.eth_type[nm]['export'] and self.type[t]['export']): # new export self.eth_export_ord.append(nm) @@ -1222,10 +1217,8 @@ class EthCtx: if self.eth_hf_dupl.has_key(nm): if self.eth_hf_dupl[nm].has_key(ethtypemod): nm = self.eth_hf_dupl[nm][ethtypemod] - self.eth_hf[nm]['create_field'] = self.eth_hf[nm]['create_field'] or self.field[f]['create_field'] self.eth_hf[nm]['ref'].append(f) self.field[f]['ethname'] = nm - self.eth_type[ethtype]['create_field'] = self.eth_type[ethtype]['create_field'] or self.eth_hf[nm]['create_field'] continue else: nmx = nm + ('_%02d' % (len(self.eth_hf_dupl[nm]))) @@ -1233,10 +1226,8 @@ class EthCtx: nm = nmx else: if (self.eth_hf[nm]['ethtype']+self.eth_hf[nm]['modified']) == ethtypemod: - self.eth_hf[nm]['create_field'] = self.eth_hf[nm]['create_field'] or self.field[f]['create_field'] self.eth_hf[nm]['ref'].append(f) self.field[f]['ethname'] = nm - self.eth_type[ethtype]['create_field'] = self.eth_type[ethtype]['create_field'] or self.eth_hf[nm]['create_field'] continue else: nmx = nm + '_01' @@ -1256,10 +1247,8 @@ class EthCtx: self.eth_hf[nm] = {'fullname' : fullname, 'pdu' : self.field[f]['pdu'], 'ethtype' : ethtype, 'modified' : self.field[f]['modified'], 'attr' : attr.copy(), - 'create_field' : self.field[f]['create_field'], 'ref' : [f]} self.field[f]['ethname'] = nm - self.eth_type[ethtype]['create_field'] = self.eth_type[ethtype]['create_field'] or self.eth_hf[nm]['create_field'] #--- type dependencies ------------------- (self.eth_type_ord1, self.eth_dep_cycle) = dependency_compute(self.type_ord, self.type_dep, map_fn = lambda t: self.type[t]['ethname'], ignore_fn = lambda t: self.type[t]['import']) i = 0 @@ -1625,37 +1614,6 @@ class EthCtx: #--- eth_output_types ------------------------------------------------------- def eth_output_types(self): - def out_field(f): - t = self.eth_hf[f]['ethtype'] - if (self.Ber()): - x = {} - for r in self.eth_hf[f]['ref']: - x[self.field[r]['impl']] = self.field[r]['impl'] - else: - x = {False : False} - x = x.values() - x.sort() - out = '' - for i in x: - if (i): - postfix = '_impl' - impl = 'TRUE' - else: - postfix = '' - impl = 'FALSE' - if (self.Ber()): - if (i): postfix = '_impl'; impl = 'TRUE' - else: postfix = ''; impl = 'FALSE' - out += 'static int dissect_'+f+postfix+'(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {\n' - par=((impl, 'tvb', 'offset', 'actx', 'tree', self.eth_hf[f]['fullname']),) - else: - out += 'static int dissect_'+f+'(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_) {\n' - par=(('tvb', 'offset', 'actx', 'tree', self.eth_hf[f]['fullname']),) - out += self.eth_fn_call('dissect_%s_%s' % (self.eth_type[t]['proto'], t), ret='return', - par=par) - out += '}\n' - return out - #end out_field() def out_pdu(f): t = self.eth_hf[f]['ethtype'] is_new = self.eth_hf[f]['pdu']['new'] @@ -1718,20 +1676,9 @@ class EthCtx: if self.dep_cycle_eth_type[t][0] != i: i += 1; continue fx.write(''.join(map(lambda i: '/* %s */\n' % ' -> '.join(self.eth_dep_cycle[i]), self.dep_cycle_eth_type[t]))) fx.write(self.eth_type_fn_h(t)) - if (self.Fld() or self.eth_type[t]['create_field']): - fx.write('\n') - for f in self.eth_hf_ord: - if ((self.eth_hf[f]['ethtype'] == t) and (self.Fld() or self.eth_hf[f]['create_field'])): - fx.write(out_field(f)) fx.write('\n') i += 1 fx.write('\n') - if (self.Fld()): # fields for imported types - fx.write('/*--- Fields for imported types ---*/\n\n') - for f in self.eth_hf_ord: - if (self.eth_type[self.eth_hf[f]['ethtype']]['import']): - fx.write(out_field(f)) - fx.write('\n') for t in self.eth_type_ord1: if self.eth_type[t]['import']: continue @@ -1750,10 +1697,6 @@ class EthCtx: fx.write(self.eth_type_fn_h(t)) else: fx.write(self.eth_type[t]['val'].eth_type_fn(self.eth_type[t]['proto'], t, self)) - if ((self.Fld() or self.eth_type[t]['create_field']) and not self.dep_cycle_eth_type.has_key(t)): - for f in self.eth_hf_ord: - if ((self.eth_hf[f]['ethtype'] == t) and (self.Fld() or self.eth_hf[f]['create_field'])): - fx.write(out_field(f)) fx.write('\n') if (len(self.eth_hfpdu_ord)): fx.write('/*--- PDUs ---*/\n\n') @@ -2590,9 +2533,6 @@ class EthCnf: elif opt in ("-b", "BER", "CER", "DER"): par = self.check_par(par, 0, 0, fn, lineno) self.ectx.encoding = 'ber' - elif opt in ("-X", "NEW_BER"): - par = self.check_par(par, 0, 0, fn, lineno) - self.ectx.new_ber = True elif opt in ("PER",): par = self.check_par(par, 0, 0, fn, lineno) self.ectx.encoding = 'per' @@ -2601,14 +2541,6 @@ class EthCnf: if not par: return self.ectx.proto_opt = par[0] self.ectx.merge_modules = True - elif opt in ("-F", "CREATE_FIELDS"): - par = self.check_par(par, 0, 1, fn, lineno) - tnm = '*' - if (len(par) > 0): tnm = par[0] - self.ectx.fld_opt[tnm] = True - elif opt in ("-T",): - par = self.check_par(par, 0, 0, fn, lineno) - self.ectx.tag_opt = True elif opt in ("ALIGNED",): par = self.check_par(par, 0, 0, fn, lineno) self.ectx.aligned = True @@ -3741,12 +3673,8 @@ class SqType (Type): opt = 'ASN1_NOT_OPTIONAL' if (ectx.Ber()): (tc, tn) = val.GetTag(ectx) - if (ectx.NewBer()): - out = ' { %-24s, %-13s, %s, %s, dissect_%s_%s },\n' \ - % ('&'+ectx.eth_hf[ef]['fullname'], tc, tn, opt, ectx.eth_type[t]['proto'], t) - else: - out = ' { %-13s, %s, %s, dissect_%s },\n' \ - % (tc, tn, opt, efd) + out = ' { %-24s, %-13s, %s, %s, dissect_%s_%s },\n' \ + % ('&'+ectx.eth_hf[ef]['fullname'], tc, tn, opt, ectx.eth_type[t]['proto'], t) elif (ectx.Per()): out = ' { %-24s, %-23s, %-17s, dissect_%s_%s },\n' \ % ('&'+ectx.eth_hf[ef]['fullname'], ext, opt, ectx.eth_type[t]['proto'], t) @@ -3798,10 +3726,7 @@ class SeqType (SqType): #print "eth_type_default_table(tname='%s')" % (tname) fname = ectx.eth_type[tname]['ref'][0] if (ectx.Ber()): - if (ectx.NewBer()): - table = "static const %(ER)s_sequence_t %(TABLE)s[] = {\n" - else: - table = "static const %(ER)s_old_sequence_t %(TABLE)s[] = {\n" + table = "static const %(ER)s_sequence_t %(TABLE)s[] = {\n" else: table = "static const %(ER)s_sequence_t %(TABLE)s[] = {\n" if hasattr(self, 'ext_list'): @@ -3820,10 +3745,7 @@ class SeqType (SqType): f = fname + '/' + e.val.name table += self.out_item(f, e.val, e.optional, ext, ectx) if (ectx.Ber()): - if (ectx.NewBer()): - table += " { NULL, 0, 0, 0, NULL }\n};\n" - else: - table += " { 0, 0, 0, NULL }\n};\n" + table += " { NULL, 0, 0, 0, NULL }\n};\n" else: table += " { NULL, 0, 0, NULL }\n};\n" return table @@ -3838,12 +3760,9 @@ class SeqOfType (SqType): else: f = fname + '/' + '_item' if (ectx.Ber()): - if (ectx.NewBer()): - table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n" - else: - table = "static const %(ER)s_old_sequence_t %(TABLE)s[1] = {\n" + table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n" else: - table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n" + table = "static const %(ER)s_sequence_t %(TABLE)s[1] = {\n" table += self.out_item(f, self.val, False, 'ASN1_NO_EXTENSIONS', ectx) table += "};\n" return table @@ -3893,12 +3812,7 @@ class SequenceOfType (SeqOfType): def eth_type_default_body(self, ectx, tname): if (ectx.Ber()): - if (ectx.NewBer()): - body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset', - par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), - ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) - else: - body = ectx.eth_fn_call('dissect_%(ER)s_old_sequence_of', ret='offset', + body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) elif (ectx.Per() and not self.HasConstraint()): @@ -3950,12 +3864,7 @@ class SetOfType (SeqOfType): def eth_type_default_body(self, ectx, tname): if (ectx.Ber()): - if (ectx.NewBer()): - body = ectx.eth_fn_call('dissect_%(ER)s_set_of', ret='offset', - par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), - ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) - else: - body = ectx.eth_fn_call('dissect_%(ER)s_old_set_of', ret='offset', + body = ectx.eth_fn_call('dissect_%(ER)s_set_of', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) elif (ectx.Per() and not self.HasConstraint()): @@ -4055,12 +3964,7 @@ class SequenceType (SeqType): def eth_type_default_body(self, ectx, tname): if (ectx.Ber()): - if(ectx.NewBer()): - body = ectx.eth_fn_call('dissect_%(ER)s_sequence', ret='offset', - par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), - ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) - else: - body = ectx.eth_fn_call('dissect_%(ER)s_old_sequence', ret='offset', + body = ectx.eth_fn_call('dissect_%(ER)s_sequence', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) elif (ectx.Per()): @@ -4100,12 +4004,7 @@ class SetType(SeqType): def eth_type_default_body(self, ectx, tname): if (ectx.Ber()): - if(ectx.NewBer()): - body = ectx.eth_fn_call('dissect_%(ER)s_set', ret='offset', - par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), - ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) - else: - body = ectx.eth_fn_call('dissect_%(ER)s_old_set', ret='offset', + body = ectx.eth_fn_call('dissect_%(ER)s_set', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) elif (ectx.Per()): @@ -4308,12 +4207,8 @@ class ChoiceType (Type): if (not opt): opt = '0' if (ectx.Ber()): (tc, tn) = e.GetTag(ectx) - if (ectx.NewBer()): - out = ' { %3s, %-24s, %-13s, %s, %s, dissect_%s_%s },\n' \ - % (vval, '&'+ectx.eth_hf[ef]['fullname'], tc, tn, opt, ectx.eth_type[t]['proto'], t) - else: - out = ' { %3s, %-13s, %s, %s, dissect_%s },\n' \ - % (vval, tc, tn, opt, efd) + out = ' { %3s, %-24s, %-13s, %s, %s, dissect_%s_%s },\n' \ + % (vval, '&'+ectx.eth_hf[ef]['fullname'], tc, tn, opt, ectx.eth_type[t]['proto'], t) elif (ectx.Per()): out = ' { %3s, %-24s, %-23s, dissect_%s_%s },\n' \ % (vval, '&'+ectx.eth_hf[ef]['fullname'], ext, ectx.eth_type[t]['proto'], t) @@ -4325,12 +4220,9 @@ class ChoiceType (Type): fname = ectx.eth_type[tname]['ref'][0] tagval = self.detect_tagval(ectx) if (ectx.Ber()): - if (ectx.NewBer()): - table = "static const %(ER)s_choice_t %(TABLE)s[] = {\n" - else: - table = "static const %(ER)s_old_choice_t %(TABLE)s[] = {\n" + table = "static const %(ER)s_choice_t %(TABLE)s[] = {\n" else: - table = "static const %(ER)s_choice_t %(TABLE)s[] = {\n" + table = "static const %(ER)s_choice_t %(TABLE)s[] = {\n" cnt = 0 if hasattr(self, 'ext_list'): ext = 'ASN1_EXTENSION_ROOT' @@ -4348,23 +4240,14 @@ class ChoiceType (Type): table += out_item(val, e, 'ASN1_NOT_EXTENSION_ROOT', ectx) cnt += 1 if (ectx.Ber()): - if (ectx.NewBer()): - table += " { 0, NULL, 0, 0, 0, NULL }\n};\n" - else: - table += " { 0, 0, 0, 0, NULL }\n};\n" + table += " { 0, NULL, 0, 0, 0, NULL }\n};\n" else: table += " { 0, NULL, 0, NULL }\n};\n" return table def eth_type_default_body(self, ectx, tname): if (ectx.Ber()): - if (ectx.NewBer()): - body = ectx.eth_fn_call('dissect_%(ER)s_choice', ret='offset', - par=(('%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), - ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s'), - ('%(VAL_PTR)s',),)) - else: - body = ectx.eth_fn_call('dissect_%(ER)s_old_choice', ret='offset', + body = ectx.eth_fn_call('dissect_%(ER)s_choice', ret='offset', par=(('%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s'), ('%(VAL_PTR)s',),)) @@ -7514,8 +7397,6 @@ asn2wrs [-h|?] [-d dbg] [-b] [-p proto] [-c cnf_file] [-e] input_file(s) ... -u : Unaligned (default is aligned) -p proto : Protocol name (implies -S). Default is module-name from input_file (renamed by #.MODULE if present) - -F : Create 'field functions' - -T : Tagged type support (experimental) -o name : Output files name core (default is <proto>) -O dir : Output directory -c cnf_file : Conformance file @@ -7587,14 +7468,16 @@ def eth_main(): ectx.justexpcnf = True if o in ("-D",): ectx.srcdir = a - #if o in ("-X",): - # warnings.warn("Command line option -X is obsolete and can be removed") + if o in ("-X",): + warnings.warn("Command line option -X is obsolete and can be removed") + if o in ("-T",): + warnings.warn("Command line option -T is obsolete and can be removed") if conf_to_read: ectx.conform.read(conf_to_read) for o, a in opts: - if o in ("-h", "-?", "-c", "-I", "-E", "-D"): + if o in ("-h", "-?", "-c", "-I", "-E", "-D", "-X", "-T"): pass # already processed else: par = [] |