diff options
121 files changed, 595 insertions, 707 deletions
diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf index a2c7998f66..740d26c18c 100644 --- a/asn1/acp133/acp133.cnf +++ b/asn1/acp133/acp133.cnf @@ -1,17 +1,14 @@ # acp133.cnf # ACP133 conformation file -#.MODULE_IMPORT -CertificateExtensions x509ce -AuthenticationFramework x509af -InformationFramework x509if -MTSAbstractService x411 - #.INCLUDE ../x509ce/x509ce-exp.cnf #.INCLUDE ../x509if/x509if-exp.cnf #.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x411/x411-exp.cnf +#.MODULE_IMPORT +MTSAbstractService x411 + #.PDU ACPPreferredDelivery ALType diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index d841f4937b..4ac0e7424b 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -InformationFramework x509if - #.INCLUDE ../x509if/x509if-exp.cnf #.EXPORTS diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index c1c0a6a000..ffb6f95991 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -ACSE-1 acse - #.INCLUDE ../acse/acse-exp.cnf #.EXPORTS diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 5414cc51a4..bfb002e3dc 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -3,10 +3,6 @@ # $Id$ -#.MODULE_IMPORT -AuthenticationFramework x509af -InformationFramework x509if - #.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x509if/x509if-exp.cnf diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index 3c82a0a64b..5e5338433e 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -1,29 +1,21 @@ +#.INCLUDE ../x509if/x509if-exp.cnf +#.INCLUDE ../x509af/x509af-exp.cnf +#.INCLUDE ../x509sat/x509sat-exp.cnf +#.INCLUDE ../pkixcrmf/crmf-exp.cnf +#.INCLUDE ../dsp/dsp-exp.cnf +#.INCLUDE ../disp/disp-exp.cnf +#.INCLUDE ../ros/ros-exp.cnf +#.INCLUDE ../acse/acse-exp.cnf + #.MODULE_IMPORT -InformationFramework x509if ServiceAdministration x509if -AuthenticationFramework x509af AttributeCertificateDefinitions x509af -SelectedAttributeTypes x509sat - BasicAccessControl crmf -Remote-Operations-Generic-ROS-PDUs ros Remote-Operations-Information-Objects ros -ACSE-1 acse -DistributedOperations dsp -DirectoryShadowAbstractService disp - -#.INCLUDE ../x509if/x509if-exp.cnf -#.INCLUDE ../x509af/x509af-exp.cnf -#.INCLUDE ../x509sat/x509sat-exp.cnf -#.INCLUDE ../pkixcrmf/crmf-exp.cnf -#.INCLUDE ../dsp/dsp-exp.cnf -#.INCLUDE ../disp/disp-exp.cnf -#.INCLUDE ../ros/ros-exp.cnf -#.INCLUDE ../acse/acse-exp.cnf #.EXPORTS Filter diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index f8fe639e3d..058d99a911 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -2,12 +2,6 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 #.MODULE_IMPORT -InformationFramework x509if -AuthenticationFramework x509af -ACSE-1 acse -DirectoryAbstractService dap -DistributedOperations dsp -DSAOperationalAttributeTypes dop OperationalBindingManagement dop #.INCLUDE ../x509if/x509if-exp.cnf diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index 99e6cd83e2..11b3e96ce8 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -1,12 +1,3 @@ -#.MODULE_IMPORT -SelectedAttributeTypes x509sat -DistributedOperations dsp -DirectoryAbstractService dap -InformationFramework x509if -AuthenticationFramework x509af -BasicAccessControl crmf -ACSE-1 acse - #.INCLUDE ../x509sat/x509sat-exp.cnf #.INCLUDE ../x509if/x509if-exp.cnf #.INCLUDE ../x509af/x509af-exp.cnf @@ -15,6 +6,8 @@ ACSE-1 acse #.INCLUDE ../pkixcrmf/crmf-exp.cnf #.INCLUDE ../acse/acse-exp.cnf +#.MODULE_IMPORT +BasicAccessControl crmf #.EXPORTS DSEType diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf index cef3b69c97..45e339459a 100644 --- a/asn1/dsp/dsp.cnf +++ b/asn1/dsp/dsp.cnf @@ -1,12 +1,6 @@ #.MODULE_IMPORT -DirectoryAbstractService dap DirectoryAccessProtocol dap -ACSE-1 acse -InformationFramework x509if ServiceAdministration x509if -AuthenticationFramework x509af - -SelectedAttributeTypes x509sat #.INCLUDE ../dap/dap-exp.cnf #.INCLUDE ../x509if/x509if-exp.cnf diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf index e788eced90..03e7ea579e 100644 --- a/asn1/ess/ess.cnf +++ b/asn1/ess/ess.cnf @@ -3,11 +3,6 @@ # $Id$ -#.MODULE_IMPORT -AuthenticationFramework x509af -CertificateExtensions x509ce -CryptographicMessageSyntax cms - #.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x509ce/x509ce-exp.cnf #.INCLUDE ../cms/cms-exp.cnf diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index 805d4329f3..2ea870f35e 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -ACSE-1 acse - #.INCLUDE ../acse/acse-exp.cnf #.EXPORTS diff --git a/asn1/ftbp/ftbp.cnf b/asn1/ftbp/ftbp.cnf index 39d0b75680..3cf87213a1 100644 --- a/asn1/ftbp/ftbp.cnf +++ b/asn1/ftbp/ftbp.cnf @@ -1,7 +1,4 @@ #.MODULE_IMPORT -ISO8571-FTAM ftam -ACSE-1 acse -IPMSInformationObjects x420 MTSAbstractService x411 #.INCLUDE ../ftam/ftam-exp.cnf diff --git a/asn1/gsm_ss/gsm_ss.cnf b/asn1/gsm_ss/gsm_ss.cnf index d81ec1ddf9..c8017b1ce0 100644 --- a/asn1/gsm_ss/gsm_ss.cnf +++ b/asn1/gsm_ss/gsm_ss.cnf @@ -3,10 +3,6 @@ # $Id$ -#.MODULE_IMPORT - -MAP-Protocol gsm_map - #.INCLUDE ../gsmmap/gsm_map-exp.cnf #.EXPORTS diff --git a/asn1/logotype-cert-extn/logotype-cert-extn.cnf b/asn1/logotype-cert-extn/logotype-cert-extn.cnf index 4fbad7b968..e30bf6845d 100644 --- a/asn1/logotype-cert-extn/logotype-cert-extn.cnf +++ b/asn1/logotype-cert-extn/logotype-cert-extn.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -AuthenticationFramework x509af - #.INCLUDE ../x509af/x509af-exp.cnf #.EXPORTS diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf index 1f61c4372d..1403eb688b 100644 --- a/asn1/ocsp/ocsp.cnf +++ b/asn1/ocsp/ocsp.cnf @@ -4,8 +4,6 @@ # $Id$ #.MODULE_IMPORT -AuthenticationFramework x509af -CertificateExtensions x509ce PKIX1Implicit88 pkix1implicit PKIX1Explicit88 pkix1explicit diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf index 5355fd96c0..53b8b16354 100644 --- a/asn1/pkcs1/pkcs1.cnf +++ b/asn1/pkcs1/pkcs1.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -AuthenticationFramework x509af - #.INCLUDE ../x509af/x509af-exp.cnf #.EXPORTS diff --git a/asn1/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf index 4918190300..dd7aa3b5fe 100644 --- a/asn1/pkinit/pkinit.cnf +++ b/asn1/pkinit/pkinit.cnf @@ -5,7 +5,6 @@ #.MODULE_IMPORT PKIX1Explicit88 pkix1explicit -CryptographicMessageSyntax cms #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.INCLUDE ../cms/cms-exp.cnf diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf index 7aea434712..122453e4a8 100644 --- a/asn1/pkix1implicit/pkix1implicit.cnf +++ b/asn1/pkix1implicit/pkix1implicit.cnf @@ -5,7 +5,6 @@ #.MODULE_IMPORT PKIX1Explicit93 pkix1explicit -CertificateExtensions x509ce #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.INCLUDE ../x509ce/x509ce-exp.cnf diff --git a/asn1/pkixcrmf/crmf.cnf b/asn1/pkixcrmf/crmf.cnf index e7b77cef0a..969a2c9d2f 100644 --- a/asn1/pkixcrmf/crmf.cnf +++ b/asn1/pkixcrmf/crmf.cnf @@ -4,7 +4,6 @@ # $Id$ #.MODULE_IMPORT -CryptographicMessageSyntax cms PKIX1Explicit88 pkix1explicit PKIX1Implicit88 pkix1implicit diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf index 3307a6fc67..51231f1ad2 100644 --- a/asn1/pkixqualified/pkixqualified.cnf +++ b/asn1/pkixqualified/pkixqualified.cnf @@ -3,11 +3,6 @@ # $Id$ -#.MODULE_IMPORT -CertificateExtensions x509ce -AuthenticationFramework x509af -SelectedAttributeTypes x509sat - #.INCLUDE ../x509ce/x509ce-exp.cnf #.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x509sat/x509sat-exp.cnf diff --git a/asn1/pkixtsp/pkixtsp.cnf b/asn1/pkixtsp/pkixtsp.cnf index 9f9b81e8c4..27fe469d1b 100644 --- a/asn1/pkixtsp/pkixtsp.cnf +++ b/asn1/pkixtsp/pkixtsp.cnf @@ -6,7 +6,6 @@ #.MODULE_IMPORT PKIX1Explicit88 pkix1explicit PKIX1Implicit88 pkix1implicit -CryptographicMessageSyntax cms #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf index dcae453ddb..303d5e49c2 100644 --- a/asn1/pres/pres.cnf +++ b/asn1/pres/pres.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -Reliable-Transfer-APDU rtse - #.INCLUDE ../rtse/rtse-exp.cnf #.EXPORTS diff --git a/asn1/s4406/s4406.cnf b/asn1/s4406/s4406.cnf index 69ff66db9f..39c927a876 100644 --- a/asn1/s4406/s4406.cnf +++ b/asn1/s4406/s4406.cnf @@ -1,6 +1,5 @@ #.MODULE_IMPORT MTSAbstractService x411 -IPMSInformationObjects x420 #.INCLUDE ../x411/x411-exp.cnf #.INCLUDE ../x420/x420-exp.cnf diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index d863933fbe..19a636c093 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -2,12 +2,6 @@ CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_CountryName_vals) BITMASK = 0 Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 -#.MODULE_IMPORT -InformationFramework x509if -CertificateExtensions x509ce -SelectedAttributeTypes x509sat -AuthenticationFramework x509af - #.INCLUDE ../x509ce/x509ce-exp.cnf #.INCLUDE ../x509if/x509if-exp.cnf #.INCLUDE ../x509sat/x509sat-exp.cnf diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index 9eed9c8f3d..7768873e5a 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -3,9 +3,6 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 #.MODULE_IMPORT MTSAbstractService x411 -AuthenticationFramework x509af -CertificateExtensions x509ce -ACSE-1 acse #.INCLUDE ../x411/x411-exp.cnf #.INCLUDE ../x509af/x509af-exp.cnf diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index 8453660909..e0cf45e4d2 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -3,11 +3,6 @@ # $Id$ -#.MODULE_IMPORT -InformationFramework x509if -CertificateExtensions x509ce -SelectedAttributeTypes x509sat - #.INCLUDE ../x509ce/x509ce-exp.cnf #.INCLUDE ../x509if/x509if-exp.cnf #.INCLUDE ../x509sat/x509sat-exp.cnf diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf index 45242c4f1f..50fe50b073 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -4,9 +4,6 @@ # $Id$ #.MODULE_IMPORT -InformationFramework x509if -AuthenticationFramework x509af -SelectedAttributeTypes x509sat MTSAbstractService x411 #.INCLUDE ../x509if/x509if-exp.cnf diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index 66bfd93c19..e4f96c29a3 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -SelectedAttributeTypes x509sat - #.INCLUDE ../x509sat/x509sat-exp.cnf #.EXPORTS diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index 0b8aa7afcf..8424ff7ba8 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -3,9 +3,6 @@ # $Id$ -#.MODULE_IMPORT -InformationFramework x509if - #.INCLUDE ../x509if/x509if-exp.cnf #.EXPORTS diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c index f221cfcdf4..2575c383e3 100644 --- a/epan/dissectors/packet-MAP_DialoguePDU.c +++ b/epan/dissectors/packet-MAP_DialoguePDU.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-MAP_DialoguePDU.c */ -/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-MAP_DialoguePDU.c */ +/* ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ /* Input file: packet-MAP-DialoguePDU-template.c */ diff --git a/epan/dissectors/packet-MAP_DialoguePDU.h b/epan/dissectors/packet-MAP_DialoguePDU.h index 857b9660a3..513303c835 100644 --- a/epan/dissectors/packet-MAP_DialoguePDU.h +++ b/epan/dissectors/packet-MAP_DialoguePDU.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-MAP_DialoguePDU.h */ -/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-MAP_DialoguePDU.h */ +/* ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ /* Input file: packet-MAP-DialoguePDU-template.h */ diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 1a024fdd54..f929e461ed 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-acp133.c */ -/* ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ +/* ../../tools/asn2wrs.py -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ /* Input file: packet-acp133-template.c */ diff --git a/epan/dissectors/packet-acp133.h b/epan/dissectors/packet-acp133.h index 46f3ea462b..e663ccc560 100644 --- a/epan/dissectors/packet-acp133.h +++ b/epan/dissectors/packet-acp133.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-acp133.h */ -/* ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ +/* ../../tools/asn2wrs.py -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ /* Input file: packet-acp133-template.h */ diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index fdef7060b0..e43afcfcbb 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1,17 +1,17 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-acse.c */ -/* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-acse.c */ +/* ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */ /* Input file: packet-acse-template.c */ #line 1 "packet-acse-template.c" /*XXX - There is a bug in asn2eth that it can not yet handle tagged assignments such + There is a bug in asn2wrs that it can not yet handle tagged assignments such as EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE { This bug is workedaround by some .cnf magic but this should be cleaned up - once asn2eth learns how to deal with tagged assignments + once asn2wrs learns how to deal with tagged assignments */ /* packet-acse.c @@ -321,7 +321,7 @@ static int dissect_direct_reference(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_acse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 86 "acse.cnf" +#line 83 "acse.cnf" char *oid; offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_acse_indirect_reference, @@ -361,7 +361,7 @@ static int dissect_data_value_descriptor(packet_info *pinfo, proto_tree *tree, t static int dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 103 "acse.cnf" +#line 100 "acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree ? top_tree : tree); @@ -440,14 +440,14 @@ static const ber_sequence_t EXTERNAL_sequence[] = { int dissect_acse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 44 "acse.cnf" +#line 41 "acse.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag) { - /* XXX asn2eth can not yet handle tagged assignment so for the + /* XXX asn2wrs can not yet handle tagged assignment so for the * time being just remove this tag manually inside the EXTERNAL * dissector. */ @@ -502,7 +502,7 @@ static int dissect_ASO_context_name_list_item(packet_info *pinfo, proto_tree *tr static int dissect_acse_T_AARQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 70 "acse.cnf" +#line 67 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); @@ -782,7 +782,7 @@ static int dissect_other_mechanism_name(packet_info *pinfo, proto_tree *tree, tv static int dissect_acse_T_other_mechanism_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 64 "acse.cnf" +#line 61 "acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree); @@ -1170,7 +1170,7 @@ static int dissect_aARE_protocol_version_impl(packet_info *pinfo, proto_tree *tr static int dissect_acse_T_AARE_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 74 "acse.cnf" +#line 71 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1411,7 +1411,7 @@ static const value_string acse_Release_request_reason_vals[] = { static int dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 109 "acse.cnf" +#line 106 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -1461,7 +1461,7 @@ static const value_string acse_Release_response_reason_vals[] = { static int dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 121 "acse.cnf" +#line 118 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -1597,7 +1597,7 @@ static int dissect_simply_encoded_data(packet_info *pinfo, proto_tree *tree, tvb static int dissect_acse_T_simple_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 67 "acse.cnf" +#line 64 "acse.cnf" /*XXX not implemented yet */ @@ -1704,7 +1704,7 @@ static int dissect_adt_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_acse_T_ACRQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 78 "acse.cnf" +#line 75 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1742,7 +1742,7 @@ static int dissect_acrq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_acse_T_ACRP_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 82 "acse.cnf" +#line 79 "acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h index e0ef3d6cb2..6770a8b38b 100644 --- a/epan/dissectors/packet-acse.h +++ b/epan/dissectors/packet-acse.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-acse.h */ -/* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-acse.h */ +/* ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */ /* Input file: packet-acse-template.h */ diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 0b06de168c..6e5dec5b6f 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-camel.c */ -/* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */ +/* ../../tools/asn2wrs.py -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */ /* Input file: packet-camel-template.c */ diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h index 5848e1d5f0..53ea634fb5 100644 --- a/epan/dissectors/packet-camel.h +++ b/epan/dissectors/packet-camel.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-camel.h */ -/* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */ +/* ../../tools/asn2wrs.py -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */ /* Input file: packet-camel-template.h */ diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c index 79c6dde2a5..1e0abe3d4a 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cdt.c */ -/* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cdt.c */ +/* ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */ /* Input file: packet-cdt-template.c */ diff --git a/epan/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h index 5055825f4f..ba79b39c22 100644 --- a/epan/dissectors/packet-cdt.h +++ b/epan/dissectors/packet-cdt.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cdt.h */ -/* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cdt.h */ +/* ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */ /* Input file: packet-cdt-template.h */ diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 873cb02ea2..273060af35 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cmip.c */ -/* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cmip.c */ +/* ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ /* Input file: packet-cmip-template.c */ @@ -384,7 +384,7 @@ static int dissect_attributeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_cmip_T_attributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 214 "cmip.cnf" +#line 211 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -418,7 +418,7 @@ static int dissect_modificationList_item(packet_info *pinfo, proto_tree *tree, t static int dissect_cmip_T_ocglobalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 179 "cmip.cnf" +#line 176 "cmip.cnf" objectclassform = OBJECTCLASS_GLOBAL_FORM; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &objectclass_identifier_id); @@ -433,7 +433,7 @@ static int dissect_ocglobalForm_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_cmip_T_oclocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 184 "cmip.cnf" +#line 181 "cmip.cnf" objectclassform = OBJECTCLASS_LOCAL_FORM; @@ -490,7 +490,7 @@ static int dissect_id1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_cmip_T_value1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 102 "cmip.cnf" +#line 99 "cmip.cnf" offset=call_ber_oid_callback(attributevalueassertion_id, tvb, offset, pinfo, tree); @@ -653,7 +653,7 @@ static int dissect_errorStatus(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_cmip_T_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 86 "cmip.cnf" +#line 83 "cmip.cnf" attributeform = ATTRIBUTE_GLOBAL_FORM; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &attribute_identifier_id); @@ -670,7 +670,7 @@ static int dissect_globalForm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ static int dissect_cmip_T_localForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 90 "cmip.cnf" +#line 87 "cmip.cnf" attributeform = ATTRIBUTE_LOCAL_FORM; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL); @@ -738,7 +738,7 @@ static int dissect_attributeIdError_impl(packet_info *pinfo, proto_tree *tree, t static int dissect_cmip_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 94 "cmip.cnf" +#line 91 "cmip.cnf" /*XXX handle local form here */ if(attributeform==ATTRIBUTE_GLOBAL_FORM){ offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, pinfo, tree); @@ -898,7 +898,7 @@ static int dissect_attributeId2(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_cmip_T_attributeValue1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 226 "cmip.cnf" +#line 223 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1124,7 +1124,7 @@ static int dissect_actionType3(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_cmip_T_actionInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 190 "cmip.cnf" +#line 187 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1172,7 +1172,7 @@ static int dissect_eventType1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv static int dissect_cmip_T_eventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 241 "cmip.cnf" +#line 238 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1307,7 +1307,7 @@ static int dissect_errorId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_cmip_T_errorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 220 "cmip.cnf" +#line 217 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1720,7 +1720,7 @@ static int dissect_actionType2(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_cmip_T_actionReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 196 "cmip.cnf" +#line 193 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1840,7 +1840,7 @@ static int dissect_eventType2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv static int dissect_cmip_T_eventReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 208 "cmip.cnf" +#line 205 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1902,7 +1902,7 @@ static int dissect_eventType3(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv static int dissect_cmip_T_eventInfo1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 202 "cmip.cnf" +#line 199 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -2246,7 +2246,7 @@ dissect_cmip_GetArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p static int dissect_cmip_Argument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 105 "cmip.cnf" +#line 102 "cmip.cnf" switch(opcode_type){ case OPCODE_INVOKE: switch(opcode){ @@ -2347,7 +2347,7 @@ static const value_string cmip_Opcode_vals[] = { static int dissect_cmip_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 51 "cmip.cnf" +#line 48 "cmip.cnf" offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode); @@ -2463,7 +2463,7 @@ static const ber_sequence_t Invoke_sequence[] = { static int dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 58 "cmip.cnf" +#line 55 "cmip.cnf" opcode_type=OPCODE_INVOKE; if(check_col(pinfo->cinfo, COL_INFO)){ col_prepend_fstr(pinfo->cinfo, COL_INFO, "Invoke "); @@ -2487,7 +2487,7 @@ static const ber_sequence_t ReturnResult_sequence[] = { static int dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 65 "cmip.cnf" +#line 62 "cmip.cnf" opcode_type=OPCODE_RETURN_RESULT; if(check_col(pinfo->cinfo, COL_INFO)){ col_prepend_fstr(pinfo->cinfo, COL_INFO, "ReturnResult "); @@ -2510,7 +2510,7 @@ static const ber_sequence_t ReturnError_sequence[] = { static int dissect_cmip_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 72 "cmip.cnf" +#line 69 "cmip.cnf" opcode_type=OPCODE_RETURN_ERROR; if(check_col(pinfo->cinfo, COL_INFO)){ col_prepend_fstr(pinfo->cinfo, COL_INFO, "ReturnError "); @@ -2683,7 +2683,7 @@ static const ber_sequence_t Reject_sequence[] = { static int dissect_cmip_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 79 "cmip.cnf" +#line 76 "cmip.cnf" opcode_type=OPCODE_REJECT; if(check_col(pinfo->cinfo, COL_INFO)){ col_prepend_fstr(pinfo->cinfo, COL_INFO, "Reject "); @@ -2734,7 +2734,7 @@ static const value_string cmip_CMIPAbortSource_vals[] = { static int dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 42 "cmip.cnf" +#line 39 "cmip.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -2760,7 +2760,7 @@ static const ber_sequence_t CMIPAbortInfo_sequence[] = { int dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 30 "cmip.cnf" +#line 27 "cmip.cnf" if(check_col(pinfo->cinfo, COL_INFO)){ col_append_fstr(pinfo->cinfo, COL_INFO, "CMIP-A-ABORT"); } @@ -2823,7 +2823,7 @@ static const ber_sequence_t CMIPUserInfo_sequence[] = { int dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 36 "cmip.cnf" +#line 33 "cmip.cnf" if(check_col(pinfo->cinfo, COL_INFO)){ col_append_fstr(pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE"); } diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index 3ed36207ce..c2262f1545 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cmip.h */ -/* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cmip.h */ +/* ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ /* Input file: packet-cmip-template.h */ diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index cab4bcd2d3..a262e08fa2 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cmp.c */ -/* ../../tools/asn2eth.py -X -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cmp.c */ +/* ../../tools/asn2wrs.py -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */ /* Input file: packet-cmp-template.c */ diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h index 45e6c44f50..299f9bccb2 100644 --- a/epan/dissectors/packet-cmp.h +++ b/epan/dissectors/packet-cmp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cmp.h */ -/* ../../tools/asn2eth.py -X -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cmp.h */ +/* ../../tools/asn2wrs.py -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */ /* Input file: packet-cmp-template.h */ diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index c229aae71b..e3879c8e0d 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cms.c */ -/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cms.c */ +/* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.c */ @@ -198,7 +198,7 @@ static gint ett_cms_ExtendedCertificateInfo = -1; /*--- End of included file: packet-cms-ett.c ---*/ #line 56 "packet-cms-template.c" -static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2eth stops generating these silly wrappers */ +static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */ static const char *object_identifier_id; @@ -313,7 +313,7 @@ static int dissect_encryptedContentType(packet_info *pinfo, proto_tree *tree, tv static int dissect_cms_T_contentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 60 "cms.cnf" +#line 56 "cms.cnf" offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_cms_ci_contentType, &object_identifier_id); @@ -329,7 +329,7 @@ static int dissect_contentType(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 64 "cms.cnf" +#line 60 "cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -349,7 +349,7 @@ static const ber_sequence_t ContentInfo_sequence[] = { int dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 54 "cms.cnf" +#line 50 "cms.cnf" top_tree = tree; offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, ContentInfo_sequence, hf_index, ett_cms_ContentInfo); @@ -422,7 +422,7 @@ static int dissect_digestAlgorithms(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_cms_T_eContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 67 "cms.cnf" +#line 63 "cms.cnf" offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_cms_ci_contentType, &object_identifier_id); @@ -438,7 +438,7 @@ static int dissect_eContentType(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 71 "cms.cnf" +#line 67 "cms.cnf" gint8 class; gboolean pc, ind; gint32 tag; @@ -485,7 +485,7 @@ static int dissect_encapContentInfo(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 98 "cms.cnf" +#line 94 "cms.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_cms_attrType, &object_identifier_id); @@ -508,7 +508,7 @@ static int dissect_attrType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_cms_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 108 "cms.cnf" +#line 104 "cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1064,7 +1064,7 @@ static int dissect_keyAttrId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 91 "cms.cnf" +#line 87 "cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1479,7 +1479,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs static int dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 112 "cms.cnf" +#line 108 "cms.cnf" proto_item *pi; int old_offset = offset; diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index a95a4f7a19..5e634221e3 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-cms.h */ -/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-cms.h */ +/* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.h */ diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 8614a2e571..57100685c9 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-crmf.c */ -/* ../../tools/asn2eth.py -X -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-crmf.c */ +/* ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */ /* Input file: packet-crmf-template.c */ @@ -387,7 +387,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_crmf_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 60 "crmf.cnf" +#line 59 "crmf.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h index 86b946a608..3269cd7ced 100644 --- a/epan/dissectors/packet-crmf.h +++ b/epan/dissectors/packet-crmf.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-crmf.h */ -/* ../../tools/asn2eth.py -X -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-crmf.h */ +/* ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */ /* Input file: packet-crmf-template.h */ diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index d61a1f37a8..f67d9833b6 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-dap.c */ -/* ../../tools/asn2eth.py -X -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-dap.c */ +/* ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn */ /* Input file: packet-dap-template.c */ @@ -1219,7 +1219,7 @@ static const ber_choice_t Name_choice[] = { static int dissect_dap_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 260 "dap.cnf" +#line 252 "dap.cnf" const char *dn; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -1812,7 +1812,7 @@ dissect_dap_FamilyEntries(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, static int dissect_dap_T_initial(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 118 "dap.cnf" +#line 110 "dap.cnf" proto_item *it; it = proto_tree_add_item(tree, hf_index, tvb, offset, -1, FALSE); proto_item_append_text(it," XXX: Not yet implemented!"); @@ -1829,7 +1829,7 @@ static int dissect_initial(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_dap_T_any(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 123 "dap.cnf" +#line 115 "dap.cnf" /* XXX: not yet implemented */ @@ -1844,7 +1844,7 @@ static int dissect_any(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_dap_T_final(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 126 "dap.cnf" +#line 118 "dap.cnf" /* XXX: not yet implemented */ @@ -1938,7 +1938,7 @@ static int dissect_matchingRule(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_dap_T_matchValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 129 "dap.cnf" +#line 121 "dap.cnf" /* XXX: not yet implemented */ @@ -2109,7 +2109,7 @@ static int dissect_newRequest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv static int dissect_dap_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 173 "dap.cnf" +#line 165 "dap.cnf" tvbuff_t *out_tvb; int i; int len; @@ -2300,7 +2300,7 @@ static const ber_sequence_t SimpleCredentials_sequence[] = { static int dissect_dap_SimpleCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 163 "dap.cnf" +#line 155 "dap.cnf" offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, SimpleCredentials_sequence, hf_index, ett_dap_SimpleCredentials); @@ -2321,7 +2321,7 @@ static int dissect_simple(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i static int dissect_dap_T_bind_token(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 132 "dap.cnf" +#line 124 "dap.cnf" /* XXX: not yet implemented */ @@ -2356,7 +2356,7 @@ static int dissect_strong(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i static int dissect_dap_T_req(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 135 "dap.cnf" +#line 127 "dap.cnf" /* XXX: not yet implemented */ @@ -2371,7 +2371,7 @@ static int dissect_req(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_dap_T_rep(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 138 "dap.cnf" +#line 130 "dap.cnf" /* XXX: not yet implemented */ @@ -2464,7 +2464,7 @@ static const ber_sequence_t DirectoryBindArgument_set[] = { int dissect_dap_DirectoryBindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 144 "dap.cnf" +#line 136 "dap.cnf" guint32 len; @@ -2523,7 +2523,7 @@ static const value_string dap_ServiceProblem_vals[] = { static int dissect_dap_ServiceProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 214 "dap.cnf" +#line 206 "dap.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -2562,7 +2562,7 @@ static const value_string dap_SecurityProblem_vals[] = { static int dissect_dap_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 202 "dap.cnf" +#line 194 "dap.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -3269,7 +3269,7 @@ static const ber_sequence_t T_subordinates_item_sequence[] = { static int dissect_dap_T_subordinates_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 270 "dap.cnf" +#line 262 "dap.cnf" proto_item *sub_item; offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, @@ -3316,7 +3316,7 @@ static const value_string dap_LimitProblem_vals[] = { static int dissect_dap_LimitProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 238 "dap.cnf" +#line 230 "dap.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -3532,7 +3532,7 @@ static const value_string dap_T_subset_vals[] = { static int dissect_dap_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 250 "dap.cnf" +#line 242 "dap.cnf" guint32 subset; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -5072,7 +5072,7 @@ dissect_dap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe static int dissect_dap_T_spkmInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 141 "dap.cnf" +#line 133 "dap.cnf" /* XXX: not yet implemented */ @@ -5234,7 +5234,7 @@ static const value_string dap_UpdateProblem_vals[] = { static int dissect_dap_UpdateProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 226 "dap.cnf" +#line 218 "dap.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, diff --git a/epan/dissectors/packet-dap.h b/epan/dissectors/packet-dap.h index 7d7bdee4d7..07ccdf43e7 100644 --- a/epan/dissectors/packet-dap.h +++ b/epan/dissectors/packet-dap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-dap.h */ -/* ../../tools/asn2eth.py -X -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-dap.h */ +/* ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn */ /* Input file: packet-dap-template.h */ diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 9bde96117d..445e2eb529 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-disp.c */ -/* ../../tools/asn2eth.py -X -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */ +/* ../../tools/asn2wrs.py -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */ /* Input file: packet-disp-template.c */ @@ -859,7 +859,7 @@ static const value_string disp_StandardUpdate_vals[] = { static int dissect_disp_StandardUpdate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 69 "disp.cnf" +#line 63 "disp.cnf" guint32 update; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -1081,7 +1081,7 @@ static const ber_choice_t CoordinateShadowUpdateResult_choice[] = { static int dissect_disp_CoordinateShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 81 "disp.cnf" +#line 75 "disp.cnf" guint32 update; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -1108,7 +1108,7 @@ static const value_string disp_T_standard_vals[] = { static int dissect_disp_T_standard(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 45 "disp.cnf" +#line 39 "disp.cnf" guint32 update; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -1231,7 +1231,7 @@ static const ber_choice_t RequestShadowUpdateResult_choice[] = { static int dissect_disp_RequestShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 93 "disp.cnf" +#line 87 "disp.cnf" guint32 update; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -1586,7 +1586,7 @@ static const ber_choice_t RefreshInformation_choice[] = { static int dissect_disp_RefreshInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 57 "disp.cnf" +#line 51 "disp.cnf" guint32 update; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -1686,7 +1686,7 @@ static const ber_choice_t UpdateShadowResult_choice[] = { static int dissect_disp_UpdateShadowResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 105 "disp.cnf" +#line 99 "disp.cnf" guint32 update; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -1722,7 +1722,7 @@ static const value_string disp_ShadowProblem_vals[] = { static int dissect_disp_ShadowProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 117 "disp.cnf" +#line 111 "disp.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, diff --git a/epan/dissectors/packet-disp.h b/epan/dissectors/packet-disp.h index 29e1ec7409..89ee7fd0e3 100644 --- a/epan/dissectors/packet-disp.h +++ b/epan/dissectors/packet-disp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-disp.h */ -/* ../../tools/asn2eth.py -X -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */ +/* ../../tools/asn2wrs.py -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */ /* Input file: packet-disp-template.h */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index c2213e1dd7..eb8b18d63d 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-dop.c */ -/* ../../tools/asn2eth.py -X -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-dop.c */ +/* ../../tools/asn2wrs.py -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ /* Input file: packet-dop-template.c */ @@ -496,7 +496,7 @@ static int dissect_protocolInformation(packet_info *pinfo, proto_tree *tree, tvb static int dissect_dop_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 179 "dop.cnf" +#line 172 "dop.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -685,7 +685,7 @@ dissect_dop_DSAOperationalManagementBindError(gboolean implicit_tag _U_, tvbuff_ static int dissect_dop_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 101 "dop.cnf" +#line 94 "dop.cnf" const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &binding_type); @@ -708,7 +708,7 @@ static int dissect_bindingType(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_dop_EstablishSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 111 "dop.cnf" +#line 104 "dop.cnf" offset = call_dop_oid_callback("dop.establish.symmetric", tvb, offset, pinfo, tree, "symmetric"); @@ -724,7 +724,7 @@ static int dissect_establishSymmetric(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_dop_EstablishRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 115 "dop.cnf" +#line 108 "dop.cnf" offset = call_dop_oid_callback("dop.establish.rolea", tvb, offset, pinfo, tree, "roleA"); @@ -740,7 +740,7 @@ static int dissect_establishRoleAInitiates(packet_info *pinfo, proto_tree *tree, static int dissect_dop_EstablishRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 119 "dop.cnf" +#line 112 "dop.cnf" offset = call_dop_oid_callback("dop.establish.roleb", tvb, offset, pinfo, tree, "roleB"); @@ -783,7 +783,7 @@ static int dissect_establishInitiator(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_dop_T_agreement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 147 "dop.cnf" +#line 140 "dop.cnf" offset = call_dop_oid_callback("dop.agreement", tvb, offset, pinfo, tree, NULL); @@ -1041,7 +1041,7 @@ dissect_dop_EstablishOperationalBindingArgument(gboolean implicit_tag _U_, tvbuf static int dissect_dop_T_symmetric(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 151 "dop.cnf" +#line 144 "dop.cnf" offset = call_dop_oid_callback("dop.establish.symmetric", tvb, offset, pinfo, tree, "symmetric"); @@ -1057,7 +1057,7 @@ static int dissect_symmetric(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_dop_T_roleA_replies(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 155 "dop.cnf" +#line 148 "dop.cnf" offset = call_dop_oid_callback("dop.establish.rolea", tvb, offset, pinfo, tree, "roleA"); @@ -1073,7 +1073,7 @@ static int dissect_roleA_replies(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_dop_T_roleB_replies(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 159 "dop.cnf" +#line 152 "dop.cnf" offset = call_dop_oid_callback("dop.establish.roleb", tvb, offset, pinfo, tree, "roleB"); @@ -1153,7 +1153,7 @@ dissect_dop_EstablishOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_ static int dissect_dop_ModifySymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 123 "dop.cnf" +#line 116 "dop.cnf" offset = call_dop_oid_callback("dop.modify.symmetric", tvb, offset, pinfo, tree, "symmetric"); @@ -1169,7 +1169,7 @@ static int dissect_modifySymmetric(packet_info *pinfo, proto_tree *tree, tvbuff_ static int dissect_dop_ModifyRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 127 "dop.cnf" +#line 120 "dop.cnf" offset = call_dop_oid_callback("dop.modify.rolea", tvb, offset, pinfo, tree, "roleA"); @@ -1185,7 +1185,7 @@ static int dissect_modifyRoleAInitiates(packet_info *pinfo, proto_tree *tree, tv static int dissect_dop_ModifyRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 131 "dop.cnf" +#line 124 "dop.cnf" offset = call_dop_oid_callback("dop.modify.roleb", tvb, offset, pinfo, tree, "roleB"); @@ -1228,7 +1228,7 @@ static int dissect_modifyInitiator(packet_info *pinfo, proto_tree *tree, tvbuff_ static int dissect_dop_ArgumentNewAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 171 "dop.cnf" +#line 164 "dop.cnf" offset = call_dop_oid_callback("dop.agreement", tvb, offset, pinfo, tree, NULL); @@ -1313,7 +1313,7 @@ dissect_dop_ModifyOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t static int dissect_dop_ResultNewAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 167 "dop.cnf" +#line 160 "dop.cnf" offset = call_dop_oid_callback("dop.agreement", tvb, offset, pinfo, tree, NULL); @@ -1394,7 +1394,7 @@ dissect_dop_ModifyOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_t * static int dissect_dop_TerminateSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 135 "dop.cnf" +#line 128 "dop.cnf" offset = call_dop_oid_callback("dop.terminate.symmetric", tvb, offset, pinfo, tree, "symmetric"); @@ -1410,7 +1410,7 @@ static int dissect_terminateSymmetric(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_dop_TerminateRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 139 "dop.cnf" +#line 132 "dop.cnf" offset = call_dop_oid_callback("dop.terminate.rolea", tvb, offset, pinfo, tree, "roleA"); @@ -1426,7 +1426,7 @@ static int dissect_terminateRoleAInitiates(packet_info *pinfo, proto_tree *tree, static int dissect_dop_TerminateRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 143 "dop.cnf" +#line 136 "dop.cnf" offset = call_dop_oid_callback("dop.terminate.roleb", tvb, offset, pinfo, tree, "roleB"); @@ -1626,7 +1626,7 @@ static int dissect_problem(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_dop_T_agreementProposal(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 163 "dop.cnf" +#line 156 "dop.cnf" offset = call_dop_oid_callback("dop.agreement", tvb, offset, pinfo, tree, NULL); @@ -1865,7 +1865,7 @@ dissect_dop_NHOBSubordinateToSuperior(gboolean implicit_tag _U_, tvbuff_t *tvb, static int dissect_dop_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 194 "dop.cnf" +#line 187 "dop.cnf" guint32 precedence = 0; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, diff --git a/epan/dissectors/packet-dop.h b/epan/dissectors/packet-dop.h index af7def82f3..959eaefa3d 100644 --- a/epan/dissectors/packet-dop.h +++ b/epan/dissectors/packet-dop.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-dop.h */ -/* ../../tools/asn2eth.py -X -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-dop.h */ +/* ../../tools/asn2wrs.py -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ /* Input file: packet-dop-template.h */ diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index 5e868a9ab3..e2e2ac0069 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-dsp.c */ -/* ../../tools/asn2eth.py -X -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */ +/* ../../tools/asn2wrs.py -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */ /* Input file: packet-dsp-template.c */ diff --git a/epan/dissectors/packet-dsp.h b/epan/dissectors/packet-dsp.h index dd2c7429e9..9f547ac98a 100644 --- a/epan/dissectors/packet-dsp.h +++ b/epan/dissectors/packet-dsp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-dsp.h */ -/* ../../tools/asn2eth.py -X -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */ +/* ../../tools/asn2wrs.py -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */ /* Input file: packet-dsp-template.h */ diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index d1b218f776..7e8edfa135 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ess.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ess.c */ +/* ../../tools/asn2wrs.py -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */ /* Input file: packet-ess-template.c */ @@ -489,7 +489,7 @@ static int dissect_type_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_ess_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 47 "ess.cnf" +#line 42 "ess.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); diff --git a/epan/dissectors/packet-ess.h b/epan/dissectors/packet-ess.h index a31010ae6c..3519f4b59e 100644 --- a/epan/dissectors/packet-ess.h +++ b/epan/dissectors/packet-ess.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ess.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ess.h */ +/* ../../tools/asn2wrs.py -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */ /* Input file: packet-ess-template.h */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index ccd66baf0d..17a8f3dee2 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-ftam.c */ -/* ../../tools/asn2eth.py -X -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ +/* ../../tools/asn2wrs.py -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ /* Input file: packet-ftam-template.c */ @@ -679,14 +679,14 @@ static const asn_namedbit Protocol_Version_bits[] = { static int dissect_ftam_Protocol_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 108 "ftam.cnf" +#line 105 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -708,14 +708,14 @@ static int dissect_protocol_Version(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_ftam_Implementation_Information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 91 "ftam.cnf" +#line 88 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -772,14 +772,14 @@ static const asn_namedbit Service_Class_bits[] = { static int dissect_ftam_Service_Class(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 125 "ftam.cnf" +#line 122 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -819,14 +819,14 @@ static const asn_namedbit Functional_Units_bits[] = { static int dissect_ftam_Functional_Units(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 142 "ftam.cnf" +#line 139 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -856,14 +856,14 @@ static const asn_namedbit Attribute_Groups_bits[] = { static int dissect_ftam_Attribute_Groups(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 160 "ftam.cnf" +#line 157 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -909,14 +909,14 @@ static const value_string ftam_FTAM_Quality_of_Service_vals[] = { static int dissect_ftam_FTAM_Quality_of_Service(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 178 "ftam.cnf" +#line 175 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -949,14 +949,14 @@ static int dissect_document_type_name_impl(packet_info *pinfo, proto_tree *tree, static int dissect_ftam_Abstract_Syntax_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 243 "ftam.cnf" +#line 240 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1012,14 +1012,14 @@ static const ber_sequence_t Contents_Type_List_sequence_of[1] = { static int dissect_ftam_Contents_Type_List(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 194 "ftam.cnf" +#line 191 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1041,14 +1041,14 @@ static int dissect_contents_type_list(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_ftam_User_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 523 "ftam.cnf" +#line 520 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1075,14 +1075,14 @@ static int dissect_actual_values6(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_ftam_Account(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 308 "ftam.cnf" +#line 305 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1165,14 +1165,14 @@ static const ber_choice_t Password_choice[] = { static int dissect_ftam_Password(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 649 "ftam.cnf" +#line 646 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1371,14 +1371,14 @@ static const value_string ftam_State_Result_vals[] = { static int dissect_ftam_State_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 507 "ftam.cnf" +#line 504 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1406,14 +1406,14 @@ static const value_string ftam_Action_Result_vals[] = { static int dissect_ftam_Action_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 324 "ftam.cnf" +#line 321 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1506,14 +1506,14 @@ static const ber_sequence_t Diagnostic_sequence_of[1] = { static int dissect_ftam_Diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 440 "ftam.cnf" +#line 437 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1603,14 +1603,14 @@ static const ber_sequence_t Charging_sequence_of[1] = { static int dissect_ftam_Charging(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 374 "ftam.cnf" +#line 371 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1705,7 +1705,7 @@ static const ber_choice_t FTAM_Regime_PDU_choice[] = { static int dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 700 "ftam.cnf" +#line 697 "ftam.cnf" gint branch_taken; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -1797,14 +1797,14 @@ static const ber_sequence_t Select_Attributes_sequence[] = { static int dissect_ftam_Select_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 491 "ftam.cnf" +#line 488 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1836,14 +1836,14 @@ static const asn_namedbit Access_Request_bits[] = { static int dissect_ftam_Access_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 292 "ftam.cnf" +#line 289 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1896,14 +1896,14 @@ static const ber_sequence_t Access_Passwords_sequence[] = { static int dissect_ftam_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 276 "ftam.cnf" +#line 273 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1956,14 +1956,14 @@ static const ber_sequence_t Path_Access_Passwords_sequence_of[1] = { static int dissect_ftam_Path_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 572 "ftam.cnf" +#line 569 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -2037,14 +2037,14 @@ static const ber_sequence_t Concurrency_Control_sequence[] = { static int dissect_ftam_Concurrency_Control(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 391 "ftam.cnf" +#line 388 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -2089,14 +2089,14 @@ static int dissect_f_select_request_impl(packet_info *pinfo, proto_tree *tree, t static int dissect_ftam_Referent_Indicator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 634 "ftam.cnf" +#line 631 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -2246,7 +2246,7 @@ static int dissect_permitted_actions_impl(packet_info *pinfo, proto_tree *tree, static int dissect_ftam_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 74 "ftam.cnf" +#line 71 "ftam.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -2279,14 +2279,14 @@ static int dissect_document_type_impl(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_ftam_Constraint_Set_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 408 "ftam.cnf" +#line 405 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -2537,7 +2537,7 @@ static int dissect_concurrency_access_impl(packet_info *pinfo, proto_tree *tree, static int dissect_ftam_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 86 "ftam.cnf" +#line 83 "ftam.cnf" /* XXX have no idea about this one */ @@ -2551,7 +2551,7 @@ static int dissect_ap(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o static int dissect_ftam_AE_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 88 "ftam.cnf" +#line 85 "ftam.cnf" /* XXX have no idea about this one */ @@ -2749,7 +2749,7 @@ static int dissect_extension_attribute_identifier(packet_info *pinfo, proto_tree static int dissect_ftam_T_extension_attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 77 "ftam.cnf" +#line 74 "ftam.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -2847,14 +2847,14 @@ static const ber_sequence_t Create_Attributes_sequence[] = { static int dissect_ftam_Create_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 424 "ftam.cnf" +#line 421 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -3204,14 +3204,14 @@ static const ber_sequence_t Read_Attributes_sequence[] = { static int dissect_ftam_Read_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 475 "ftam.cnf" +#line 472 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -3318,14 +3318,14 @@ static const ber_sequence_t Change_Attributes_sequence[] = { static int dissect_ftam_Change_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 357 "ftam.cnf" +#line 354 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -3430,14 +3430,14 @@ static int dissect_open_contents_type(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_ftam_Activity_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 341 "ftam.cnf" +#line 338 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -3504,14 +3504,14 @@ static const value_string ftam_Degree_Of_Overlap_vals[] = { static int dissect_ftam_Degree_Of_Overlap(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 211 "ftam.cnf" +#line 208 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -3868,14 +3868,14 @@ static const ber_choice_t FADU_Identity_choice[] = { static int dissect_ftam_FADU_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 666 "ftam.cnf" +#line 663 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -3902,14 +3902,14 @@ static const value_string ftam_FADU_Lock_vals[] = { static int dissect_ftam_FADU_Lock(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 459 "ftam.cnf" +#line 456 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -4061,7 +4061,7 @@ static const ber_choice_t File_PDU_choice[] = { static int dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 714 "ftam.cnf" +#line 711 "ftam.cnf" gint branch_taken; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -4116,14 +4116,14 @@ static const ber_sequence_t Access_Context_sequence[] = { static int dissect_ftam_Access_Context(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 260 "ftam.cnf" +#line 257 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -4228,14 +4228,14 @@ static const value_string ftam_Request_Type_vals[] = { static int dissect_ftam_Request_Type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 227 "ftam.cnf" +#line 224 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -4419,7 +4419,7 @@ static const ber_choice_t Bulk_Data_PDU_choice[] = { static int dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 728 "ftam.cnf" +#line 725 "ftam.cnf" gint branch_taken; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -4891,7 +4891,7 @@ static int dissect_attribute_extension_attribute_identifier(packet_info *pinfo, static int dissect_ftam_T_extension_attribute_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 83 "ftam.cnf" +#line 80 "ftam.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -5059,14 +5059,14 @@ static const ber_sequence_t Attribute_Value_Assertions_sequence_of[1] = { static int dissect_ftam_Attribute_Value_Assertions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 619 "ftam.cnf" +#line 616 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -5129,14 +5129,14 @@ static const ber_sequence_t Scope_sequence_of[1] = { static int dissect_ftam_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 539 "ftam.cnf" +#line 536 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -5182,14 +5182,14 @@ static const ber_sequence_t Objects_Attributes_List_sequence_of[1] = { static int dissect_ftam_Objects_Attributes_List(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 555 "ftam.cnf" +#line 552 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -5280,14 +5280,14 @@ static const value_string ftam_Request_Operation_Result_vals[] = { static int dissect_ftam_Request_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 588 "ftam.cnf" +#line 585 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -5353,14 +5353,14 @@ static const ber_choice_t Operation_Result_choice[] = { static int dissect_ftam_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 682 "ftam.cnf" +#line 679 "ftam.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -5978,7 +5978,7 @@ static const ber_choice_t FSM_PDU_choice[] = { static int dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 742 "ftam.cnf" +#line 739 "ftam.cnf" gint branch_taken; offset = dissect_ber_choice(pinfo, tree, tvb, offset, diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h index 94cc037e7b..96096f5671 100644 --- a/epan/dissectors/packet-ftam.h +++ b/epan/dissectors/packet-ftam.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-ftam.h */ -/* ../../tools/asn2eth.py -X -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ +/* ../../tools/asn2wrs.py -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ /* Input file: packet-ftam-template.h */ diff --git a/epan/dissectors/packet-ftbp.c b/epan/dissectors/packet-ftbp.c index 754c5c1708..0fc0c58271 100644 --- a/epan/dissectors/packet-ftbp.c +++ b/epan/dissectors/packet-ftbp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ftbp.c */ -/* ../../tools/asn2eth.py -X -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ftbp.c */ +/* ../../tools/asn2wrs.py -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */ /* Input file: packet-ftbp-template.c */ @@ -531,7 +531,7 @@ static int dissect_document_type_name(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_ftbp_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 26 "ftbp.cnf" +#line 23 "ftbp.cnf" /* XXX: Not implemented yet */ @@ -738,7 +738,7 @@ static int dissect_environment_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_ftbp_T_compression_algorithm_param(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 29 "ftbp.cnf" +#line 26 "ftbp.cnf" /* XXX: Not implemented yet */ return offset; diff --git a/epan/dissectors/packet-ftbp.h b/epan/dissectors/packet-ftbp.h index ae2219e3e2..cc9f96b893 100644 --- a/epan/dissectors/packet-ftbp.h +++ b/epan/dissectors/packet-ftbp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ftbp.h */ -/* ../../tools/asn2eth.py -X -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ftbp.h */ +/* ../../tools/asn2wrs.py -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */ /* Input file: packet-ftbp-template.h */ diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index 793ae69640..b54842139c 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-gnm.c */ -/* ../../tools/asn2eth.py -X -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-gnm.c */ +/* ../../tools/asn2wrs.py -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */ /* Input file: packet-gnm-template.c */ diff --git a/epan/dissectors/packet-gnm.h b/epan/dissectors/packet-gnm.h index 9081cbf9b4..5279f8bcdc 100644 --- a/epan/dissectors/packet-gnm.h +++ b/epan/dissectors/packet-gnm.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-gnm.h */ -/* ../../tools/asn2eth.py -X -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-gnm.h */ +/* ../../tools/asn2wrs.py -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */ /* Input file: packet-gnm-template.h */ diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 5d516356fe..64b7d46715 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-gsm_map.c */ -/* ../../tools/asn2eth.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ +/* ../../tools/asn2wrs.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.c */ @@ -2666,7 +2666,6 @@ static const value_string gsm_map_ProtocolId_vals[] = { { 0, NULL } }; -static guint32 ProtocolId_value_map[4+0] = {1, 2, 3, 4}; static int dissect_gsm_map_ProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -4078,7 +4077,6 @@ static const value_string gsm_map_AccessNetworkProtocolId_vals[] = { { 0, NULL } }; -static guint32 AccessNetworkProtocolId_value_map[2+0] = {1, 2}; static int dissect_gsm_map_AccessNetworkProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -5338,7 +5336,6 @@ static const value_string gsm_map_BcsmTriggerDetectionPoint_vals[] = { { 0, NULL } }; -static guint32 BcsmTriggerDetectionPoint_value_map[5+0] = {2, 4, 12, 13, 14}; static int dissect_gsm_map_BcsmTriggerDetectionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -5443,7 +5440,6 @@ static const value_string gsm_map_O_BcsmTriggerDetectionPoint_vals[] = { { 0, NULL } }; -static guint32 O_BcsmTriggerDetectionPoint_value_map[1+1] = {2, 4}; static int dissect_gsm_map_O_BcsmTriggerDetectionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -6743,7 +6739,6 @@ static const value_string gsm_map_SMS_TriggerDetectionPoint_vals[] = { { 0, NULL } }; -static guint32 SMS_TriggerDetectionPoint_value_map[1+1] = {1, 2}; static int dissect_gsm_map_SMS_TriggerDetectionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -6847,7 +6842,6 @@ static const value_string gsm_map_T_BcsmTriggerDetectionPoint_vals[] = { { 0, NULL } }; -static guint32 T_BcsmTriggerDetectionPoint_value_map[1+2] = {12, 13, 14}; static int dissect_gsm_map_T_BcsmTriggerDetectionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -7962,7 +7956,6 @@ static const value_string gsm_map_GPRS_TriggerDetectionPoint_vals[] = { { 0, NULL } }; -static guint32 GPRS_TriggerDetectionPoint_value_map[5+0] = {1, 2, 11, 12, 14}; static int dissect_gsm_map_GPRS_TriggerDetectionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -9043,7 +9036,6 @@ static const value_string gsm_map_Ext_ProtocolId_vals[] = { { 0, NULL } }; -static guint32 Ext_ProtocolId_value_map[1+0] = {1}; static int dissect_gsm_map_Ext_ProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -9708,7 +9700,6 @@ static const value_string gsm_map_NumberPortabilityStatus_vals[] = { { 0, NULL } }; -static guint32 NumberPortabilityStatus_value_map[3+2] = {0, 1, 2, 4, 5}; static int dissect_gsm_map_NumberPortabilityStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -9819,7 +9810,6 @@ static const value_string gsm_map_UnavailabilityCause_vals[] = { { 0, NULL } }; -static guint32 UnavailabilityCause_value_map[6+0] = {1, 2, 3, 4, 5, 6}; static int dissect_gsm_map_UnavailabilityCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -13910,7 +13900,6 @@ static const value_string gsm_map_T_roamingNotAllowedCause_vals[] = { { 0, NULL } }; -static guint32 T_roamingNotAllowedCause_value_map[2+0] = {0, 3}; static int dissect_gsm_map_T_roamingNotAllowedCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -14298,7 +14287,6 @@ static const value_string gsm_map_CUG_RejectCause_vals[] = { { 0, NULL } }; -static guint32 CUG_RejectCause_value_map[4+0] = {0, 1, 5, 7}; static int dissect_gsm_map_CUG_RejectCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -14640,7 +14628,6 @@ static const value_string gsm_map_Access_vals[] = { { 0, NULL } }; -static guint32 Access_value_map[3+0] = {1, 2, 3}; static int dissect_gsm_map_Access(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { @@ -14916,7 +14903,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv case 3: /*cancelLocation*/ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -14988,7 +14975,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv case 29: /*sendEndSignal*/ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* This is a V3 message ??? */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -15007,7 +14994,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv case 33: /*processAccessSignalling*/ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* This is a V3 message ??? */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -15020,7 +15007,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv case 34: /*forwardAccessSignalling*/ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* This is a V3 message ??? */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -15111,7 +15098,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv offset=dissect_gsm_map_ReadyForSM_Arg(FALSE, tvb, offset, pinfo, tree, -1); break; case 67: /*purgeMS*/ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -15121,7 +15108,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv case 68: /*prepareHandover*/ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* This is a V3 message ??? */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -15321,7 +15308,7 @@ static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff */ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* This is a V3 message ??? */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -15332,7 +15319,7 @@ static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff case 56: /*sendAuthenticationInfo*/ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* This is a V3 message ??? */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); @@ -15374,7 +15361,7 @@ static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff case 68: /*prepareHandover*/ octet = tvb_get_guint8(tvb,0) & 0xf; if ( octet == 3){ /* This is a V3 message ??? */ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag); diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 51a8ba7ece..b40849c3b6 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-gsm_map.h */ -/* ../../tools/asn2eth.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ +/* ../../tools/asn2wrs.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.h */ diff --git a/epan/dissectors/packet-gsm_ss.c b/epan/dissectors/packet-gsm_ss.c index 7e2454541b..c4bd3cc956 100644 --- a/epan/dissectors/packet-gsm_ss.c +++ b/epan/dissectors/packet-gsm_ss.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-gsm_ss.c */ -/* ../../tools/asn2eth.py -X -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-gsm_ss.c */ +/* ../../tools/asn2wrs.py -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */ /* Input file: packet-gsm_ss-template.c */ diff --git a/epan/dissectors/packet-gsm_ss.h b/epan/dissectors/packet-gsm_ss.h index 1a01651ad2..85599cd164 100644 --- a/epan/dissectors/packet-gsm_ss.h +++ b/epan/dissectors/packet-gsm_ss.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-gsm_ss.h */ -/* ../../tools/asn2eth.py -X -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-gsm_ss.h */ +/* ../../tools/asn2wrs.py -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */ /* Input file: packet-gsm_ss-template.h */ diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index bcda78111a..272b814dc7 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-h248.c */ -/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ +/* ../../tools/asn2wrs.py -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ /* Input file: packet-h248-template.c */ diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index a487ce3c79..d5e16df73d 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-h248.h */ -/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ +/* ../../tools/asn2wrs.py -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ /* Input file: packet-h248-template.h */ diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index ae074f3215..a4882c048e 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-inap.c */ -/* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ +/* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ /* Input file: packet-inap-template.c */ diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index eebebf9ac0..b520d2da30 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-inap.h */ -/* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ +/* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ /* Input file: packet-inap-template.h */ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 404e0ca4d6..8a2c12f9dd 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ldap.c */ -/* ../../tools/asn2eth.py -X -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ldap.c */ +/* ../../tools/asn2wrs.py -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.c */ @@ -71,7 +71,7 @@ * * Stefan Metzmacher <metze@samba.org> * - * 15-NOV-2005 - Changed to use the asn2eth compiler + * 15-NOV-2005 - Changed to use the asn2wrs compiler * Anders Broman <anders.broman@ericsson.com> */ @@ -575,7 +575,7 @@ static int dissect_not_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_ldap_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 52 "ldap.cnf" +#line 53 "ldap.cnf" offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &MessageID); @@ -608,7 +608,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_ldap_LDAPString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 239 "ldap.cnf" +#line 240 "ldap.cnf" tvbuff_t *parameter_tvb = NULL; char *ldapstring; gchar *sc = NULL; /* semi-colon pointer */ @@ -716,7 +716,7 @@ static int dissect_newSuperior_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_ldap_Simple(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 102 "ldap.cnf" +#line 103 "ldap.cnf" ldap_conv_info_t *ldap_info; offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -740,7 +740,7 @@ static int dissect_simple_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_ldap_Mechanism(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 113 "ldap.cnf" +#line 114 "ldap.cnf" ldap_conv_info_t *ldap_info; tvbuff_t *parameter_tvb; @@ -792,7 +792,7 @@ static int dissect_mechanism(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_ldap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 152 "ldap.cnf" +#line 153 "ldap.cnf" tvbuff_t *parameter_tvb; ldap_conv_info_t *ldap_info; @@ -860,7 +860,7 @@ static const ber_choice_t AuthenticationChoice_choice[] = { static int dissect_ldap_AuthenticationChoice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 398 "ldap.cnf" +#line 399 "ldap.cnf" gint branch = -1; gint auth = -1; const gchar *valstr; @@ -958,7 +958,7 @@ static const value_string ldap_BindResponse_resultCode_vals[] = { static int dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 340 "ldap.cnf" +#line 341 "ldap.cnf" const gchar *valstr; @@ -1036,7 +1036,7 @@ static int dissect_referral_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_ldap_ServerSaslCreds(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 178 "ldap.cnf" +#line 179 "ldap.cnf" tvbuff_t *parameter_tvb; ldap_conv_info_t *ldap_info; @@ -1130,9 +1130,9 @@ static int dissect_bindResponse(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_ldap_UnbindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 419 "ldap.cnf" +#line 420 "ldap.cnf" - implicit_tag = TRUE; /* correct problem with asn2eth */ + implicit_tag = TRUE; /* correct problem with asn2wrs */ offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); @@ -1158,7 +1158,7 @@ static const value_string ldap_T_scope_vals[] = { static int dissect_ldap_T_scope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 299 "ldap.cnf" +#line 300 "ldap.cnf" gint scope; const gchar *valstr; @@ -1507,7 +1507,7 @@ static int dissect_searchRequest(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 361 "ldap.cnf" +#line 362 "ldap.cnf" tvbuff_t *next_tvb; gchar *string; @@ -1667,7 +1667,7 @@ static const value_string ldap_T_resultCode_vals[] = { static int dissect_ldap_T_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 318 "ldap.cnf" +#line 319 "ldap.cnf" const gchar *valstr; @@ -2022,7 +2022,7 @@ static int dissect_abandonRequest(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 32 "ldap.cnf" +#line 33 "ldap.cnf" tvbuff_t *parameter_tvb; const gchar *name; @@ -2033,7 +2033,7 @@ dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, ¶meter_tvb); -#line 39 "ldap.cnf" +#line 40 "ldap.cnf" if (!parameter_tvb) return offset; item = get_ber_last_created_item(); @@ -2229,7 +2229,7 @@ static const ber_choice_t ProtocolOp_choice[] = { static int dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 60 "ldap.cnf" +#line 61 "ldap.cnf" ldap_call_response_t *lcrp; ldap_conv_info_t *ldap_info = (ldap_conv_info_t *)pinfo->private_data; @@ -2240,7 +2240,7 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa ProtocolOp_choice, hf_index, ett_ldap_ProtocolOp, &ProtocolOp); -#line 66 "ldap.cnf" +#line 67 "ldap.cnf" lcrp=ldap_match_call_response(tvb, pinfo, tree, MessageID, ProtocolOp); if(lcrp){ @@ -3132,12 +3132,12 @@ void proto_register_ldap(void) { { &hf_mscldap_netlogon_type, { "Type", "mscldap.netlogon.type", FT_UINT32, BASE_DEC, NULL, 0x0, - "Type of <please tell wireshark developers what this type is>", HFILL }}, + "Type of <please tell Wireshark developers what this type is>", HFILL }}, { &hf_mscldap_netlogon_version, { "Version", "mscldap.netlogon.version", FT_UINT32, BASE_DEC, NULL, 0x0, - "Version of <please tell wireshark developers what this type is>", HFILL }}, + "Version of <please tell Wireshark developers what this type is>", HFILL }}, { &hf_mscldap_netlogon_lm_token, { "LM Token", "mscldap.netlogon.lm_token", @@ -3348,7 +3348,7 @@ void proto_register_ldap(void) { "AttributeValueAssertion/attributeDesc", HFILL }}, { &hf_ldap_assertionValue, { "assertionValue", "ldap.assertionValue", - FT_BYTES, BASE_HEX, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "AttributeValueAssertion/assertionValue", HFILL }}, { &hf_ldap_type, { "type", "ldap.type", @@ -3540,7 +3540,7 @@ void proto_register_ldap(void) { "MatchingRuleAssertion/matchingRule", HFILL }}, { &hf_ldap_matchValue, { "matchValue", "ldap.matchValue", - FT_BYTES, BASE_HEX, NULL, 0, + FT_STRING, BASE_NONE, NULL, 0, "MatchingRuleAssertion/matchValue", HFILL }}, { &hf_ldap_dnAttributes, { "dnAttributes", "ldap.dnAttributes", diff --git a/epan/dissectors/packet-ldap.h b/epan/dissectors/packet-ldap.h index 44ab35e86d..da424bbacd 100644 --- a/epan/dissectors/packet-ldap.h +++ b/epan/dissectors/packet-ldap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ldap.h */ -/* ../../tools/asn2eth.py -X -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ldap.h */ +/* ../../tools/asn2wrs.py -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.h */ diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 4b8bf76c08..2bfda8ba76 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-logotypecertextn.c */ -/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-logotypecertextn.c */ +/* ../../tools/asn2wrs.py -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ /* Input file: packet-logotype-cert-extn-template.c */ diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h index fb104a2f6e..a0dbacea5b 100644 --- a/epan/dissectors/packet-logotypecertextn.h +++ b/epan/dissectors/packet-logotypecertextn.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-logotypecertextn.h */ -/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-logotypecertextn.h */ +/* ../../tools/asn2wrs.py -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ /* Input file: packet-logotype-cert-extn-template.h */ diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 5394ec2d8f..b52fc9954f 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-mms.c */ -/* ../../tools/asn2eth.py -X -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-mms.c */ +/* ../../tools/asn2wrs.py -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ /* Input file: packet-mms-template.c */ diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h index 5af3eb02f4..d0be9e2123 100644 --- a/epan/dissectors/packet-mms.h +++ b/epan/dissectors/packet-mms.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-mms.h */ -/* ../../tools/asn2eth.py -X -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-mms.h */ +/* ../../tools/asn2wrs.py -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */ /* Input file: packet-mms-template.h */ diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index e7247ab42d..de8ecaa510 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ns_cert_exts.c */ -/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ns_cert_exts.c */ +/* ../../tools/asn2wrs.py -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ /* Input file: packet-ns_cert_exts-template.c */ diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 28bc5321da..cdf90dc5c2 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ocsp.c */ -/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ocsp.c */ +/* ../../tools/asn2wrs.py -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ /* Input file: packet-ocsp-template.c */ @@ -402,7 +402,7 @@ static int dissect_responseType(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 38 "ocsp.cnf" +#line 36 "ocsp.cnf" gint8 class; gboolean pc, ind; gint32 tag; diff --git a/epan/dissectors/packet-ocsp.h b/epan/dissectors/packet-ocsp.h index ad24f8222c..28786484b0 100644 --- a/epan/dissectors/packet-ocsp.h +++ b/epan/dissectors/packet-ocsp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ocsp.h */ -/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ocsp.h */ +/* ../../tools/asn2wrs.py -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ /* Input file: packet-ocsp-template.h */ diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index 64b97ac7b2..0d3727e42e 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkcs1.c */ -/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkcs1.c */ +/* ../../tools/asn2wrs.py -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ /* Input file: packet-pkcs1-template.c */ diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h index 79b0d9a168..6106ceb772 100644 --- a/epan/dissectors/packet-pkcs1.h +++ b/epan/dissectors/packet-pkcs1.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkcs1.h */ -/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkcs1.h */ +/* ../../tools/asn2wrs.py -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ /* Input file: packet-pkcs1-template.h */ diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index f8f2c22030..25c778221f 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkinit.c */ -/* ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkinit.c */ +/* ../../tools/asn2wrs.py -e -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ /* Input file: packet-pkinit-template.c */ diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h index 670e3ae4b9..df96f2badb 100644 --- a/epan/dissectors/packet-pkinit.h +++ b/epan/dissectors/packet-pkinit.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkinit.h */ -/* ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkinit.h */ +/* ../../tools/asn2wrs.py -e -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ /* Input file: packet-pkinit-template.h */ diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 182459e7eb..eb6db70caa 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -1,12 +1,12 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkix1explicit.c */ -/* ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkix1explicit.c */ +/* ../../tools/asn2wrs.py -e -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */ /* Input file: packet-pkix1explicit-template.c */ #line 1 "packet-pkix1explicit-template.c" -#define BER_UNI_TAG_TeletexString 20 /* workaround bug in asn2eth */ +#define BER_UNI_TAG_TeletexString 20 /* workaround bug in asn2wrs */ /* packet-pkix1explicit.c * Routines for PKIX1Explitic packet dissection diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h index 585a258c68..4ca35daad4 100644 --- a/epan/dissectors/packet-pkix1explicit.h +++ b/epan/dissectors/packet-pkix1explicit.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkix1explicit.h */ -/* ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkix1explicit.h */ +/* ../../tools/asn2wrs.py -e -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */ /* Input file: packet-pkix1explicit-template.h */ diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 62d82cb798..b135d45086 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkix1implicit.c */ -/* ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkix1implicit.c */ +/* ../../tools/asn2wrs.py -e -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ /* Input file: packet-pkix1implicit-template.c */ diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h index 2c4c839099..2ea6f16354 100644 --- a/epan/dissectors/packet-pkix1implicit.h +++ b/epan/dissectors/packet-pkix1implicit.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkix1implicit.h */ -/* ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkix1implicit.h */ +/* ../../tools/asn2wrs.py -e -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ /* Input file: packet-pkix1implicit-template.h */ diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index 1b8c79f8f5..ab9e5fa70f 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixproxy.c */ -/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkixproxy.c */ +/* ../../tools/asn2wrs.py -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.c */ diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h index 633d349645..92c59e06a4 100644 --- a/epan/dissectors/packet-pkixproxy.h +++ b/epan/dissectors/packet-pkixproxy.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixproxy.h */ -/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkixproxy.h */ +/* ../../tools/asn2wrs.py -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.h */ diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index b3d83382ae..3d18cdecd3 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixqualified.c */ -/* ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkixqualified.c */ +/* ../../tools/asn2wrs.py -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ /* Input file: packet-pkixqualified-template.c */ @@ -273,7 +273,7 @@ static int dissect_statementId(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_pkixqualified_T_statementInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 38 "pkixqualified.cnf" +#line 33 "pkixqualified.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -386,7 +386,7 @@ void proto_register_pkixqualified(void) { "Generalizedtime", HFILL }}, { &hf_pkixqualified_Directorystring_PDU, { "Directorystring", "pkixqualified.Directorystring", - FT_STRING, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0, "Directorystring", HFILL }}, { &hf_pkixqualified_Printablestring_PDU, { "Printablestring", "pkixqualified.Printablestring", diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h index 1f9001e3d5..c1a0ab609f 100644 --- a/epan/dissectors/packet-pkixqualified.h +++ b/epan/dissectors/packet-pkixqualified.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixqualified.h */ -/* ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkixqualified.h */ +/* ../../tools/asn2wrs.py -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ /* Input file: packet-pkixqualified-template.h */ diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index f66f247f1f..43df4865d9 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixtsp.c */ -/* ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkixtsp.c */ +/* ../../tools/asn2wrs.py -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */ /* Input file: packet-pkixtsp-template.c */ diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h index 002a9c3ed0..ad3c6a257c 100644 --- a/epan/dissectors/packet-pkixtsp.h +++ b/epan/dissectors/packet-pkixtsp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixtsp.h */ -/* ../../tools/asn2eth.py -X -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pkixtsp.h */ +/* ../../tools/asn2wrs.py -b -e -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */ /* Input file: packet-pkixtsp-template.h */ diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 41df42c9fb..5c2a2a3c88 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pres.c */ -/* ../../tools/asn2eth.py -X -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pres.c */ +/* ../../tools/asn2wrs.py -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn */ /* Input file: packet-pres-template.c */ @@ -386,7 +386,7 @@ static int dissect_called_presentation_selector_impl(packet_info *pinfo, proto_t static int dissect_pres_Presentation_context_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 72 "pres.cnf" +#line 69 "pres.cnf" offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &presentation_context_identifier); @@ -471,13 +471,13 @@ static const ber_sequence_t Context_list_item_sequence[] = { static int dissect_pres_Context_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 79 "pres.cnf" +#line 76 "pres.cnf" abstract_syntax_name_oid=NULL; offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, Context_list_item_sequence, hf_index, ett_pres_Context_list_item); -#line 82 "pres.cnf" +#line 79 "pres.cnf" register_ctx_id_and_oid(pinfo, presentation_context_identifier, abstract_syntax_name_oid); return offset; @@ -631,7 +631,7 @@ static int dissect_simply_encoded_data_impl(packet_info *pinfo, proto_tree *tree static int dissect_pres_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 38 "pres.cnf" +#line 35 "pres.cnf" tvbuff_t *next_tvb; char *oid; @@ -658,7 +658,7 @@ static int dissect_single_ASN1_type_impl(packet_info *pinfo, proto_tree *tree, t static int dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 51 "pres.cnf" +#line 48 "pres.cnf" tvbuff_t *next_tvb; char *oid; diff --git a/epan/dissectors/packet-pres.h b/epan/dissectors/packet-pres.h index 41214a6dbf..b94ed94acf 100644 --- a/epan/dissectors/packet-pres.h +++ b/epan/dissectors/packet-pres.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pres.h */ -/* ../../tools/asn2eth.py -X -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-pres.h */ +/* ../../tools/asn2wrs.py -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn */ /* Input file: packet-pres-template.h */ diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 5a99e8db0d..51f3578aae 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ros.c */ -/* ../../tools/asn2eth.py -X -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ros.c */ +/* ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */ /* Input file: packet-ros-template.c */ diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h index 658af8d0ed..9fb0e1b0c9 100644 --- a/epan/dissectors/packet-ros.h +++ b/epan/dissectors/packet-ros.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ros.h */ -/* ../../tools/asn2eth.py -X -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-ros.h */ +/* ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */ /* Input file: packet-ros-template.h */ diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 662dd552f6..2f9c299306 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-rtse.c */ -/* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ +/* ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ /* Input file: packet-rtse-template.c */ @@ -833,7 +833,7 @@ dissect_rtse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack guint32 len1; if(!implicit_tag) { - /* XXX asn2eth can not yet handle tagged assignment so for the + /* XXX asn2wrs can not yet handle tagged assignment so for the * time being just remove this tag manually inside the EXTERNAL * dissector. */ diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h index 29ecc90793..a8824b98ab 100644 --- a/epan/dissectors/packet-rtse.h +++ b/epan/dissectors/packet-rtse.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-rtse.h */ -/* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ +/* ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ /* Input file: packet-rtse-template.h */ diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c index a8f5a602eb..90bf5b3673 100644 --- a/epan/dissectors/packet-s4406.c +++ b/epan/dissectors/packet-s4406.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-s4406.c */ -/* ../../tools/asn2eth.py -X -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-s4406.c */ +/* ../../tools/asn2wrs.py -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */ /* Input file: packet-s4406-template.c */ @@ -294,7 +294,7 @@ static int dissect_dist_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_s4406_T_dist_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 64 "s4406.cnf" +#line 63 "s4406.cnf" /* XXX: not implemented */ @@ -439,7 +439,7 @@ static const value_string s4406_PrimaryPrecedence_vals[] = { static int dissect_s4406_PrimaryPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 69 "s4406.cnf" +#line 68 "s4406.cnf" int precedence = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &precedence); @@ -469,7 +469,7 @@ static const value_string s4406_CopyPrecedence_vals[] = { static int dissect_s4406_CopyPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 77 "s4406.cnf" +#line 76 "s4406.cnf" int precedence = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &precedence); diff --git a/epan/dissectors/packet-s4406.h b/epan/dissectors/packet-s4406.h index cec26101a7..a656514101 100644 --- a/epan/dissectors/packet-s4406.h +++ b/epan/dissectors/packet-s4406.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-s4406.h */ -/* ../../tools/asn2eth.py -X -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-s4406.h */ +/* ../../tools/asn2wrs.py -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */ /* Input file: packet-s4406-template.h */ diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index df13df5b80..0046422a84 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-smrse.c */ -/* ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-smrse.c */ +/* ../../tools/asn2wrs.py -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */ /* Input file: packet-smrse-template.c */ diff --git a/epan/dissectors/packet-smrse.h b/epan/dissectors/packet-smrse.h index c91d148b29..4aa873625b 100644 --- a/epan/dissectors/packet-smrse.h +++ b/epan/dissectors/packet-smrse.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-smrse.h */ -/* ../../tools/asn2eth.py -X -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-smrse.h */ +/* ../../tools/asn2wrs.py -b -e -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */ /* Input file: packet-smrse-template.h */ diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 5824eb09aa..6361a0f3f9 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-spnego.c */ -/* ../../tools/asn2eth.py -X -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-spnego.c */ +/* ../../tools/asn2wrs.py -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */ /* Input file: packet-spnego-template.c */ @@ -13,7 +13,7 @@ * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com> * Copyright 2005, Ronnie Sahlberg (krb decryption) - * Copyright 2005, Anders Broman (converted to asn2eth generated dissector) + * Copyright 2005, Anders Broman (converted to asn2wrs generated dissector) * * $Id$ * @@ -136,7 +136,7 @@ static dissector_handle_t data_handle; /* * Unfortunately, we have to have a forward declaration of this, - * as the code generated by asn2eth includes a call before the + * as the code generated by asn2wrs includes a call before the * definition. */ static int dissect_spnego_PrincipalSeq(gboolean implicit_tag, tvbuff_t *tvb, diff --git a/epan/dissectors/packet-spnego.h b/epan/dissectors/packet-spnego.h index cbaae9eda4..804173fb2f 100644 --- a/epan/dissectors/packet-spnego.h +++ b/epan/dissectors/packet-spnego.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-spnego.h */ -/* ../../tools/asn2eth.py -X -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-spnego.h */ +/* ../../tools/asn2wrs.py -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */ /* Input file: packet-spnego-template.h */ diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index a4969ef35c..fd2af30466 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* .\packet-tcap.c */ -/* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ +/* ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ /* Input file: packet-tcap-template.c */ diff --git a/epan/dissectors/packet-tcap.h b/epan/dissectors/packet-tcap.h index 97cf104336..21fbc491d2 100644 --- a/epan/dissectors/packet-tcap.h +++ b/epan/dissectors/packet-tcap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-tcap.h */ -/* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-tcap.h */ +/* ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ /* Input file: packet-tcap-template.h */ diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index e25e5cd958..e0e4e68061 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-wlancertextn.c */ -/* ../../tools/asn2eth.py -X -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-wlancertextn.c */ +/* ../../tools/asn2wrs.py -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ /* Input file: packet-wlancertextn-template.c */ diff --git a/epan/dissectors/packet-wlancertextn.h b/epan/dissectors/packet-wlancertextn.h index 7136309f88..9a0528cc90 100644 --- a/epan/dissectors/packet-wlancertextn.h +++ b/epan/dissectors/packet-wlancertextn.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-wlancertextn.h */ -/* ../../tools/asn2eth.py -X -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-wlancertextn.h */ +/* ../../tools/asn2wrs.py -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ /* Input file: packet-wlancertextn-template.h */ diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 94b8f5bdb5..b89bbdea0b 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x411.c */ -/* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x411.c */ +/* ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */ /* Input file: packet-x411-template.c */ @@ -788,7 +788,7 @@ static int dissect_empty_result(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_x411_MTAName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 376 "x411.cnf" +#line 370 "x411.cnf" tvbuff_t *mtaname = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, @@ -908,7 +908,7 @@ static int dissect_token_type_identifier_impl(packet_info *pinfo, proto_tree *tr static int dissect_x411_TokenTypeData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 646 "x411.cnf" +#line 640 "x411.cnf" if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1054,7 +1054,7 @@ static const ber_choice_t Credentials_choice[] = { static int dissect_x411_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 654 "x411.cnf" +#line 648 "x411.cnf" guint32 credentials; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -1143,7 +1143,7 @@ static int dissect_privacy_mark(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_x411_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 323 "x411.cnf" +#line 317 "x411.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1164,7 +1164,7 @@ static int dissect_category_type_impl(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_x411_CategoryValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 244 "x411.cnf" +#line 238 "x411.cnf" offset = dissect_unknown_ber(pinfo, tvb, offset, tree); @@ -1358,7 +1358,7 @@ static const value_string x411_MTABindError_vals[] = { static int dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 637 "x411.cnf" +#line 631 "x411.cnf" int error = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &error); @@ -1375,7 +1375,7 @@ dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, static int dissect_x411_NumericString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 465 "x411.cnf" +#line 459 "x411.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1413,7 +1413,7 @@ static int dissect_sub_address_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_PrintableString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 487 "x411.cnf" +#line 481 "x411.cnf" tvbuff_t *pstring = NULL; char *fmt = NULL; @@ -1496,14 +1496,14 @@ static const ber_choice_t CountryName_choice[] = { static int dissect_x411_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 255 "x411.cnf" +#line 249 "x411.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1541,14 +1541,14 @@ static const ber_choice_t AdministrationDomainName_choice[] = { static int dissect_x411_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 277 "x411.cnf" +#line 271 "x411.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -1587,7 +1587,7 @@ static const ber_choice_t PrivateDomainIdentifier_choice[] = { static int dissect_x411_PrivateDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 427 "x411.cnf" +#line 421 "x411.cnf" if(doing_address) g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN); @@ -1618,7 +1618,7 @@ static const ber_sequence_t GlobalDomainIdentifier_sequence[] = { static int dissect_x411_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 534 "x411.cnf" +#line 528 "x411.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = tree; @@ -1649,7 +1649,7 @@ static int dissect_attempted_domain(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_LocalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 548 "x411.cnf" +#line 542 "x411.cnf" tvbuff_t *id = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, @@ -1677,7 +1677,7 @@ static const ber_sequence_t MTSIdentifier_sequence[] = { static int dissect_x411_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 556 "x411.cnf" +#line 550 "x411.cnf" doing_address = TRUE; @@ -1708,7 +1708,7 @@ static int dissect_message_identifier(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_x411_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 396 "x411.cnf" +#line 390 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1743,7 +1743,7 @@ static int dissect_network_address_impl(packet_info *pinfo, proto_tree *tree, tv static int dissect_x411_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 410 "x411.cnf" +#line 404 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1779,7 +1779,7 @@ static const ber_choice_t PrivateDomainName_choice[] = { static int dissect_x411_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 420 "x411.cnf" +#line 414 "x411.cnf" if(doing_address) g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN); @@ -1801,7 +1801,7 @@ static int dissect_private_domain_name_impl(packet_info *pinfo, proto_tree *tree static int dissect_x411_OrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 437 "x411.cnf" +#line 431 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1902,7 +1902,7 @@ static const ber_sequence_t BuiltInStandardAttributes_sequence[] = { static int dissect_x411_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 573 "x411.cnf" +#line 567 "x411.cnf" address_item = tree; @@ -1978,7 +1978,7 @@ static int dissect_extension_attribute_type_impl(packet_info *pinfo, proto_tree static int dissect_x411_T_extension_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 248 "x411.cnf" +#line 242 "x411.cnf" offset=call_x411_oid_callback("x411.extension-attribute", tvb, offset, pinfo, tree); @@ -2035,7 +2035,7 @@ static const ber_sequence_t ORName_sequence[] = { int dissect_x411_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 521 "x411.cnf" +#line 515 "x411.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = NULL; @@ -2168,7 +2168,7 @@ static int dissect_g3_facsimile_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x411_TeletexString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 475 "x411.cnf" +#line 469 "x411.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -2322,7 +2322,7 @@ static const value_string x411_BuiltInContentType_vals[] = { static int dissect_x411_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 347 "x411.cnf" +#line 341 "x411.cnf" guint32 ict = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -2356,7 +2356,7 @@ static int dissect_built_in_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t int dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 331 "x411.cnf" +#line 325 "x411.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &content_type_id); @@ -2413,14 +2413,14 @@ static int dissect_ContentTypes_item(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x411_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 297 "x411.cnf" +#line 291 "x411.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; guint32 len1; if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this + /* XXX asn2wrs can not yet handle tagged assignment yes so this * XXX is some conformance file magic to work around that bug */ offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); @@ -2499,7 +2499,7 @@ static int dissect_per_message_indicators(packet_info *pinfo, proto_tree *tree, static int dissect_x411_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 616 "x411.cnf" +#line 610 "x411.cnf" tvbuff_t *arrival = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime, @@ -2638,7 +2638,7 @@ static const value_string x411_RoutingAction_vals[] = { static int dissect_x411_RoutingAction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 627 "x411.cnf" +#line 621 "x411.cnf" int action = 0; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -2714,7 +2714,7 @@ static const ber_sequence_t DomainSuppliedInformation_set[] = { static int dissect_x411_DomainSuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 595 "x411.cnf" +#line 589 "x411.cnf" doing_address = FALSE; @@ -2742,7 +2742,7 @@ static const ber_sequence_t TraceInformationElement_sequence[] = { static int dissect_x411_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 579 "x411.cnf" +#line 573 "x411.cnf" doing_address = TRUE; @@ -2825,7 +2825,7 @@ static int dissect_criticality_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 232 "x411.cnf" +#line 226 "x411.cnf" const char *name; if(extension_id != -1) @@ -3029,7 +3029,7 @@ static int dissect_message_envelope(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_Content(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 364 "x411.cnf" +#line 358 "x411.cnf" tvbuff_t *next_tvb; /* we can do this now constructed octet strings are supported */ @@ -3252,7 +3252,7 @@ static int dissect_subject_intermediate_trace_information(packet_info *pinfo, pr static int dissect_x411_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 226 "x411.cnf" +#line 220 "x411.cnf" /*XXX not implemented yet */ @@ -3707,7 +3707,7 @@ static const ber_sequence_t MTASuppliedInformation_set[] = { static int dissect_x411_MTASuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 604 "x411.cnf" +#line 598 "x411.cnf" doing_address = FALSE; @@ -3736,7 +3736,7 @@ static const ber_sequence_t InternalTraceInformationElement_sequence[] = { static int dissect_x411_InternalTraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 587 "x411.cnf" +#line 581 "x411.cnf" doing_address = TRUE; @@ -4843,7 +4843,7 @@ static int dissect_built_in_argument_impl(packet_info *pinfo, proto_tree *tree, static int dissect_x411_T_refused_extension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 252 "x411.cnf" +#line 246 "x411.cnf" /*XXX not implemented yet */ @@ -5296,7 +5296,7 @@ static int dissect_standard_parameters_impl(packet_info *pinfo, proto_tree *tree static int dissect_x411_T_extensions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 229 "x411.cnf" +#line 223 "x411.cnf" /*XXX not implemented yet */ @@ -5662,7 +5662,7 @@ static const ber_sequence_t ORAddress_sequence[] = { int dissect_x411_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 508 "x411.cnf" +#line 502 "x411.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; doing_address = TRUE; @@ -6207,7 +6207,7 @@ dissect_x411_CertificateSelectors(gboolean implicit_tag _U_, tvbuff_t *tvb, int static int dissect_x411_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 450 "x411.cnf" +#line 444 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -6893,7 +6893,7 @@ static const ber_sequence_t MTANameAndOptionalGDI_sequence[] = { static int dissect_x411_MTANameAndOptionalGDI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 564 "x411.cnf" +#line 558 "x411.cnf" doing_address = TRUE; diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h index 1ba8e09358..6a70d0f966 100644 --- a/epan/dissectors/packet-x411.h +++ b/epan/dissectors/packet-x411.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x411.h */ -/* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x411.h */ +/* ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */ /* Input file: packet-x411-template.h */ diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 50920b9b40..8463ba549f 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x420.c */ -/* ../../tools/asn2eth.py -X -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x420.c */ +/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */ /* Input file: packet-x420-template.c */ @@ -645,7 +645,7 @@ static int dissect_telex_compatible_impl(packet_info *pinfo, proto_tree *tree, t static int dissect_x420_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 116 "x420.cnf" +#line 113 "x420.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); @@ -666,7 +666,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_x420_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 124 "x420.cnf" +#line 121 "x420.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -903,7 +903,7 @@ static int dissect_related_IPMs_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x420_SubjectField(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 146 "x420.cnf" +#line 143 "x420.cnf" tvbuff_t *subject=NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -1235,7 +1235,7 @@ static int dissect_g3_facsimile_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x420_Interchange_Data_Element(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 165 "x420.cnf" +#line 162 "x420.cnf" /* XXX Not implemented yet */ @@ -1551,7 +1551,7 @@ static int dissect_bilaterally_defined_impl(packet_info *pinfo, proto_tree *tree static int dissect_x420_NationallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 168 "x420.cnf" +#line 165 "x420.cnf" /* XXX Not implemented yet */ @@ -1652,7 +1652,7 @@ static const ber_sequence_t IPM_sequence[] = { int dissect_x420_IPM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 128 "x420.cnf" +#line 125 "x420.cnf" if((hf_index == hf_x420_ipm) && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " Message"); @@ -1978,7 +1978,7 @@ static const ber_sequence_t IPN_set[] = { int dissect_x420_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 136 "x420.cnf" +#line 133 "x420.cnf" if((hf_index == hf_x420_ipn) && check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " Notification"); @@ -2664,7 +2664,7 @@ dissect_x420_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa static int dissect_x420_CharacterSetRegistration(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 157 "x420.cnf" +#line 154 "x420.cnf" guint32 crs; proto_item *pi; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, diff --git a/epan/dissectors/packet-x420.h b/epan/dissectors/packet-x420.h index 6588721b8b..9b5b903f74 100644 --- a/epan/dissectors/packet-x420.h +++ b/epan/dissectors/packet-x420.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x420.h */ -/* ../../tools/asn2eth.py -X -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x420.h */ +/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */ /* Input file: packet-x420-template.h */ diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 604fa506d9..0e4d0a6a37 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509af.c */ -/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509af.c */ +/* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */ /* Input file: packet-x509af-template.c */ @@ -264,7 +264,7 @@ static int dissect_serial(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i static int dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 74 "x509af.cnf" +#line 69 "x509af.cnf" const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_x509af_algorithm_id, &algorithm_id); @@ -288,7 +288,7 @@ static int dissect_algorithmId(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_x509af_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 85 "x509af.cnf" +#line 80 "x509af.cnf" offset=call_ber_oid_callback(algorithm_id, tvb, offset, pinfo, tree); @@ -426,7 +426,7 @@ static const ber_choice_t SubjectName_choice[] = { static int dissect_x509af_SubjectName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 112 "x509af.cnf" +#line 107 "x509af.cnf" const char* str; offset = dissect_ber_choice(pinfo, tree, tvb, offset, @@ -487,7 +487,7 @@ static int dissect_subjectPublicKeyInfo(packet_info *pinfo, proto_tree *tree, tv static int dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 91 "x509af.cnf" +#line 86 "x509af.cnf" const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_x509af_extension_id, &extension_id); @@ -523,7 +523,7 @@ static int dissect_critical(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_x509af_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 102 "x509af.cnf" +#line 97 "x509af.cnf" gint8 class; gboolean pc, ind; gint32 tag; diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h index 74ced8197d..c6beb1f83b 100644 --- a/epan/dissectors/packet-x509af.h +++ b/epan/dissectors/packet-x509af.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509af.h */ -/* ../../tools/asn2eth.py -X -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509af.h */ +/* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */ /* Input file: packet-x509af-template.h */ diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 6cff673bb8..1421e0741c 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509ce.c */ -/* ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509ce.c */ +/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */ /* Input file: packet-x509ce-template.c */ @@ -349,7 +349,7 @@ static int dissect_type_id(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_x509ce_OtherNameValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 123 "x509ce.cnf" +#line 120 "x509ce.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -420,7 +420,7 @@ static int dissect_ediPartyName_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x509ce_T_iPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 116 "x509ce.cnf" +#line 113 "x509ce.cnf" proto_tree_add_item(tree, hf_x509ce_IPAddress, tvb, offset, 4, FALSE); offset+=4; @@ -696,7 +696,7 @@ static int dissect_policyQualifierId(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x509ce_PolicyQualifierValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 113 "x509ce.cnf" +#line 110 "x509ce.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h index b2abb784e6..25482254be 100644 --- a/epan/dissectors/packet-x509ce.h +++ b/epan/dissectors/packet-x509ce.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509ce.h */ -/* ../../tools/asn2eth.py -X -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509ce.h */ +/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */ /* Input file: packet-x509ce-template.h */ diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 951ca19b17..80923b84a5 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509if.c */ -/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509if.c */ +/* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */ /* Input file: packet-x509if-template.c */ @@ -372,7 +372,7 @@ static int dissect_description(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 140 "x509if.cnf" +#line 137 "x509if.cnf" const char *fmt; const char *name; @@ -433,7 +433,7 @@ static int dissect_restrictionType(packet_info *pinfo, proto_tree *tree, tvbuff_ int dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 170 "x509if.cnf" +#line 167 "x509if.cnf" int old_offset = offset; tvbuff_t *out_tvb; char *value = NULL; @@ -506,7 +506,7 @@ static int dissect_selectedValues_item(packet_info *pinfo, proto_tree *tree, tvb static int dissect_x509if_ValuesWithContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 222 "x509if.cnf" +#line 219 "x509if.cnf" offset=call_ber_oid_callback("unknown", tvb, offset, pinfo, tree); @@ -691,7 +691,7 @@ static int dissect_ca_contextType(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_x509if_ContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 134 "x509if.cnf" +#line 131 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -790,7 +790,7 @@ static const ber_sequence_t AttributeValueAssertion_sequence[] = { int dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 299 "x509if.cnf" +#line 296 "x509if.cnf" ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; @@ -892,7 +892,7 @@ dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvb static int dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 253 "x509if.cnf" +#line 250 "x509if.cnf" if(!rdn_one_value) { top_of_rdn = tree; @@ -923,7 +923,7 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { int dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 225 "x509if.cnf" +#line 222 "x509if.cnf" char *temp_dn; rdn_one_value = FALSE; @@ -962,7 +962,7 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 288 "x509if.cnf" +#line 285 "x509if.cnf" if(!dn_one_rdn) { /* this is the first element - record the top */ @@ -989,7 +989,7 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = { int dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 268 "x509if.cnf" +#line 265 "x509if.cnf" const char *fmt; dn_one_rdn = FALSE; /* reset */ @@ -1510,7 +1510,7 @@ static int dissect_level(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in static int dissect_x509if_SelectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 213 "x509if.cnf" +#line 210 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1553,7 +1553,7 @@ static int dissect_entryType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_x509if_DefaultValueValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 219 "x509if.cnf" +#line 216 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h index d0380915a0..e13af737fb 100644 --- a/epan/dissectors/packet-x509if.h +++ b/epan/dissectors/packet-x509if.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509if.h */ -/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509if.h */ +/* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */ /* Input file: packet-x509if-template.h */ diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 5e314e19dc..28cf0005b5 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509sat.c */ -/* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509sat.c */ +/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.c */ @@ -2138,65 +2138,65 @@ void proto_register_x509sat(void) { FT_BOOLEAN, 8, NULL, 0, "Boolean", HFILL }}, { &hf_x509sat_SyntaxGeneralizedTime_PDU, - { "GeneralizedTime", "x509sat.GeneralizedTime", + { "SyntaxGeneralizedTime", "x509sat.SyntaxGeneralizedTime", FT_STRING, BASE_NONE, NULL, 0, - "GeneralizedTime", HFILL }}, + "SyntaxGeneralizedTime", HFILL }}, { &hf_x509sat_SyntaxUTCTime_PDU, - { "UTCTime", "x509sat.UTCTime", + { "SyntaxUTCTime", "x509sat.SyntaxUTCTime", FT_STRING, BASE_NONE, NULL, 0, - "UTCTime", HFILL }}, + "SyntaxUTCTime", HFILL }}, { &hf_x509sat_SyntaxNumericString_PDU, - { "NumericString", "x509sat.NumericString", + { "SyntaxNumericString", "x509sat.SyntaxNumericString", FT_STRING, BASE_NONE, NULL, 0, - "NumericString", HFILL }}, + "SyntaxNumericString", HFILL }}, { &hf_x509sat_SyntaxPrintableString_PDU, - { "PrintableString", "x509sat.PrintableString", + { "SyntaxPrintableString", "x509sat.SyntaxPrintableString", FT_STRING, BASE_NONE, NULL, 0, - "PrintableString", HFILL }}, + "SyntaxPrintableString", HFILL }}, { &hf_x509sat_SyntaxIA5String_PDU, - { "IA5String", "x509sat.IA5String", + { "SyntaxIA5String", "x509sat.SyntaxIA5String", FT_STRING, BASE_NONE, NULL, 0, - "IA5String", HFILL }}, + "SyntaxIA5String", HFILL }}, { &hf_x509sat_SyntaxBMPString_PDU, - { "BMPString", "x509sat.BMPString", + { "SyntaxBMPString", "x509sat.SyntaxBMPString", FT_STRING, BASE_NONE, NULL, 0, - "BMPString", HFILL }}, + "SyntaxBMPString", HFILL }}, { &hf_x509sat_SyntaxUniversalString_PDU, - { "UniversalString", "x509sat.UniversalString", + { "SyntaxUniversalString", "x509sat.SyntaxUniversalString", FT_STRING, BASE_NONE, NULL, 0, - "UniversalString", HFILL }}, + "SyntaxUniversalString", HFILL }}, { &hf_x509sat_SyntaxUTF8String_PDU, - { "UTF8String", "x509sat.UTF8String", + { "SyntaxUTF8String", "x509sat.SyntaxUTF8String", FT_STRING, BASE_NONE, NULL, 0, - "UTF8String", HFILL }}, + "SyntaxUTF8String", HFILL }}, { &hf_x509sat_SyntaxTeletexString_PDU, - { "TeletexString", "x509sat.TeletexString", + { "SyntaxTeletexString", "x509sat.SyntaxTeletexString", FT_STRING, BASE_NONE, NULL, 0, - "TeletexString", HFILL }}, + "SyntaxTeletexString", HFILL }}, { &hf_x509sat_SyntaxT61String_PDU, - { "T61String", "x509sat.T61String", + { "SyntaxT61String", "x509sat.SyntaxT61String", FT_STRING, BASE_NONE, NULL, 0, - "T61String", HFILL }}, + "SyntaxT61String", HFILL }}, { &hf_x509sat_SyntaxVideotexString_PDU, - { "VideotexString", "x509sat.VideotexString", + { "SyntaxVideotexString", "x509sat.SyntaxVideotexString", FT_STRING, BASE_NONE, NULL, 0, - "VideotexString", HFILL }}, + "SyntaxVideotexString", HFILL }}, { &hf_x509sat_SyntaxGraphicString_PDU, - { "GraphicString", "x509sat.GraphicString", + { "SyntaxGraphicString", "x509sat.SyntaxGraphicString", FT_STRING, BASE_NONE, NULL, 0, - "GraphicString", HFILL }}, + "SyntaxGraphicString", HFILL }}, { &hf_x509sat_SyntaxISO646String_PDU, - { "ISO646String", "x509sat.ISO646String", + { "SyntaxISO646String", "x509sat.SyntaxISO646String", FT_STRING, BASE_NONE, NULL, 0, - "ISO646String", HFILL }}, + "SyntaxISO646String", HFILL }}, { &hf_x509sat_SyntaxVisibleString_PDU, - { "VisibleString", "x509sat.VisibleString", + { "SyntaxVisibleString", "x509sat.SyntaxVisibleString", FT_STRING, BASE_NONE, NULL, 0, - "VisibleString", HFILL }}, + "SyntaxVisibleString", HFILL }}, { &hf_x509sat_SyntaxGeneralString_PDU, - { "GeneralString", "x509sat.GeneralString", + { "SyntaxGeneralString", "x509sat.SyntaxGeneralString", FT_STRING, BASE_NONE, NULL, 0, - "GeneralString", HFILL }}, + "SyntaxGeneralString", HFILL }}, { &hf_x509sat_teletexString, { "teletexString", "x509sat.teletexString", FT_STRING, BASE_NONE, NULL, 0, diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index 6589a44c60..f32df5f418 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-x509sat.h */ -/* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ +/* It is created automatically by the ASN.1 to Wireshark dissector compiler */ +/* .\packet-x509sat.h */ +/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.h */ |