From 225698ef0b5dedc4d3d67d742bd6676c07837330 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 6 Jul 2013 02:53:45 +0000 Subject: [PATCH] Fix display filter errors caught by checkfiltername.pl svn path=/trunk/; revision=50399 --- asn1/c1222/c1222.asn | 2 +- asn1/c1222/c1222.cnf | 2 +- asn1/c1222/packet-c1222-template.c | 2 +- asn1/mpeg-audio/packet-mpeg-audio-template.c | 4 +-- epan/dissectors/packet-c1222.c | 26 ++++++++++---------- epan/dissectors/packet-eth.c | 6 ++--- epan/dissectors/packet-iax2.c | 6 ++--- epan/dissectors/packet-mpeg-audio.c | 4 +-- epan/dissectors/packet-mpeg-dsmcc.c | 2 +- epan/dissectors/packet-ncp-sss.c | 2 +- epan/dissectors/packet-roofnet.c | 6 ++--- epan/dissectors/packet-rsvp.c | 2 +- epan/dissectors/packet-vrrp.c | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/asn1/c1222/c1222.asn b/asn1/c1222/c1222.asn index 4b75bc1047..a61105312a 100644 --- a/asn1/c1222/c1222.asn +++ b/asn1/c1222/c1222.asn @@ -4,7 +4,7 @@ C1222-PROTOCOL DEFINITIONS ::= BEGIN -C1222-MESSAGE ::= [APPLICATION 0] IMPLICIT SEQUENCE { +MESSAGE ::= [APPLICATION 0] IMPLICIT SEQUENCE { aSO-context [1] ASO-qualifier OPTIONAL, called-AP-title [2] Called-AP-title OPTIONAL, called-AP-invocation-id [4] Called-AP-invocation-id OPTIONAL, diff --git a/asn1/c1222/c1222.cnf b/asn1/c1222/c1222.cnf index d53bb9aa0c..7d1e121f8e 100644 --- a/asn1/c1222/c1222.cnf +++ b/asn1/c1222/c1222.cnf @@ -10,7 +10,7 @@ IMPORT ../acse/acse.inf #.EXPORTS #.PDU -C1222-MESSAGE +MESSAGE #.NO_EMIT diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index 98890b212f..d94620e65e 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -1035,7 +1035,7 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA); c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222); - dissect_C1222_MESSAGE_PDU(tvb, pinfo, c1222_tree); + dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree); } } diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 0270550085..0d1356642f 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -157,10 +157,10 @@ proto_register_mpeg_audio(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_id3v1, - { "ID3v1", "id3v1", + { "ID3v1", "mpeg-audio.id3v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_id3v2, - { "ID3v2", "id3v2", + { "ID3v2", "mpeg-audio.id3v2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index d5fdb495bc..f975d2cff5 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -98,7 +98,7 @@ static gboolean c1222_decrypt = TRUE; /*--- Included file: packet-c1222-hf.c ---*/ #line 1 "../../asn1/c1222/packet-c1222-hf.c" -static int hf_c1222_C1222_MESSAGE_PDU = -1; /* C1222_MESSAGE */ +static int hf_c1222_MESSAGE_PDU = -1; /* MESSAGE */ static int hf_c1222_aSO_context = -1; /* ASO_qualifier */ static int hf_c1222_called_AP_title = -1; /* Called_AP_title */ static int hf_c1222_called_AP_invocation_id = -1; /* Called_AP_invocation_id */ @@ -219,7 +219,7 @@ static guint32 iv_element_len = 0; /*--- Included file: packet-c1222-ett.c ---*/ #line 1 "../../asn1/c1222/packet-c1222-ett.c" -static gint ett_c1222_C1222_MESSAGE_U = -1; +static gint ett_c1222_MESSAGE_U = -1; static gint ett_c1222_AP_title = -1; static gint ett_c1222_Calling_authentication_value_U = -1; static gint ett_c1222_Authentication_value_encoding = -1; @@ -1470,7 +1470,7 @@ dissect_c1222_User_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const ber_sequence_t C1222_MESSAGE_U_sequence[] = { +static const ber_sequence_t MESSAGE_U_sequence[] = { { &hf_c1222_aSO_context , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_c1222_ASO_qualifier }, { &hf_c1222_called_AP_title, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_c1222_Called_AP_title }, { &hf_c1222_called_AP_invocation_id, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_c1222_Called_AP_invocation_id }, @@ -1484,9 +1484,9 @@ static const ber_sequence_t C1222_MESSAGE_U_sequence[] = { }; static int -dissect_c1222_C1222_MESSAGE_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_c1222_MESSAGE_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - C1222_MESSAGE_U_sequence, hf_index, ett_c1222_C1222_MESSAGE_U); + MESSAGE_U_sequence, hf_index, ett_c1222_MESSAGE_U); return offset; } @@ -1494,19 +1494,19 @@ dissect_c1222_C1222_MESSAGE_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int -dissect_c1222_C1222_MESSAGE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_c1222_MESSAGE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, - hf_index, BER_CLASS_APP, 0, TRUE, dissect_c1222_C1222_MESSAGE_U); + hf_index, BER_CLASS_APP, 0, TRUE, dissect_c1222_MESSAGE_U); return offset; } /*--- PDUs ---*/ -static void dissect_C1222_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static void dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - dissect_c1222_C1222_MESSAGE(FALSE, tvb, 0, &asn1_ctx, tree, hf_c1222_C1222_MESSAGE_PDU); + dissect_c1222_MESSAGE(FALSE, tvb, 0, &asn1_ctx, tree, hf_c1222_MESSAGE_PDU); } @@ -1533,7 +1533,7 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA); c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222); - dissect_C1222_MESSAGE_PDU(tvb, pinfo, c1222_tree); + dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree); } } @@ -1796,8 +1796,8 @@ void proto_register_c1222(void) { /*--- Included file: packet-c1222-hfarr.c ---*/ #line 1 "../../asn1/c1222/packet-c1222-hfarr.c" - { &hf_c1222_C1222_MESSAGE_PDU, - { "C1222-MESSAGE", "c1222.C1222_MESSAGE_element", + { &hf_c1222_MESSAGE_PDU, + { "MESSAGE", "c1222.MESSAGE_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_c1222_aSO_context, @@ -1903,7 +1903,7 @@ void proto_register_c1222(void) { /*--- Included file: packet-c1222-ettarr.c ---*/ #line 1 "../../asn1/c1222/packet-c1222-ettarr.c" - &ett_c1222_C1222_MESSAGE_U, + &ett_c1222_MESSAGE_U, &ett_c1222_AP_title, &ett_c1222_Calling_authentication_value_U, &ett_c1222_Authentication_value_encoding, diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index f75d18b292..f9cc644adc 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -776,9 +776,9 @@ proto_register_eth(void) }; static ei_register_info ei[] = { - { &ei_eth_invalid_lentype, { "arp.duplicate-address-detected", PI_PROTOCOL, PI_WARN, "Invalid length/type", EXPFILL }}, - { &ei_eth_src_not_group, { "arp.packet-storm-detected", PI_PROTOCOL, PI_WARN, "Source MAC must not be a group address: IEEE 802.3-2002, Section 3.2.3(b)", EXPFILL }}, - { &ei_eth_fcs_bad, { "arp.packet-storm-detected", PI_CHECKSUM, PI_ERROR, "Bad checksum", EXPFILL }}, + { &ei_eth_invalid_lentype, { "eth.invalid_lentype", PI_PROTOCOL, PI_WARN, "Invalid length/type", EXPFILL }}, + { &ei_eth_src_not_group, { "eth.src_not_group", PI_PROTOCOL, PI_WARN, "Source MAC must not be a group address: IEEE 802.3-2002, Section 3.2.3(b)", EXPFILL }}, + { &ei_eth_fcs_bad, { "eth.fcs_bad", PI_CHECKSUM, PI_ERROR, "Bad checksum", EXPFILL }}, }; module_t *eth_module; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index e1ad8494ee..89827b765b 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -3079,9 +3079,9 @@ proto_register_iax2(void) }; static ei_register_info ei[] = { - { &ei_iax_too_many_transfers, { "iax.too_many_transfers", PI_PROTOCOL, PI_WARN, "Too many transfers for iax_call", EXPFILL }}, - { &ei_iax_circuit_id_conflict, { "iax.circuit_id_conflict", PI_PROTOCOL, PI_WARN, "Circuit ID conflict", EXPFILL }}, - { &ei_iax_peer_address_unsupported, { "iax.peer_address_unsupported", PI_PROTOCOL, PI_WARN, "Peer address unsupported", EXPFILL }}, + { &ei_iax_too_many_transfers, { "iax2.too_many_transfers", PI_PROTOCOL, PI_WARN, "Too many transfers for iax_call", EXPFILL }}, + { &ei_iax_circuit_id_conflict, { "iax2.circuit_id_conflict", PI_PROTOCOL, PI_WARN, "Circuit ID conflict", EXPFILL }}, + { &ei_iax_peer_address_unsupported, { "iax2.peer_address_unsupported", PI_PROTOCOL, PI_WARN, "Peer address unsupported", EXPFILL }}, }; expert_module_t* expert_iax; diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 29d2ee3418..72ee8c8a47 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -662,10 +662,10 @@ proto_register_mpeg_audio(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_id3v1, - { "ID3v1", "id3v1", + { "ID3v1", "mpeg-audio.id3v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_id3v2, - { "ID3v2", "id3v2", + { "ID3v2", "mpeg-audio.id3v2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c index 1c925dc583..5390b616a9 100644 --- a/epan/dissectors/packet-mpeg-dsmcc.c +++ b/epan/dissectors/packet-mpeg-dsmcc.c @@ -1024,7 +1024,7 @@ proto_register_dsmcc(void) &ett_dsmcc_dii_module }; static ei_register_info ei[] = { - { &ei_dsmcc_invalid_value, { "dsmcc.invalid_value", PI_PROTOCOL, PI_WARN, "Invalid value", EXPFILL }}, + { &ei_dsmcc_invalid_value, { "mpeg_dsmcc.invalid_value", PI_PROTOCOL, PI_WARN, "Invalid value", EXPFILL }}, { &ei_dsmcc_crc_invalid, { "mpeg_sect.crc.invalid", PI_CHECKSUM, PI_WARN, "Invalid CRC", EXPFILL }}, }; diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index bb8cfa66a8..5152e715d5 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -933,7 +933,7 @@ proto_register_sss(void) }; static ei_register_info ei[] = { - { &ei_return_code, { "ncp.return_code.expert", PI_RESPONSE_CODE, PI_NOTE, "SSS Error", EXPFILL }}, + { &ei_return_code, { "sss.return_code.expert", PI_RESPONSE_CODE, PI_NOTE, "SSS Error", EXPFILL }}, }; expert_module_t* expert_sss; diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index fd1fbbd69f..e5c6b08b3f 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -104,7 +104,7 @@ static int hf_roofnet_link_dst = -1; static gint ett_roofnet = -1; static gint ett_roofnet_link = -1; -static expert_field ei_rooftop_too_many_links = EI_INIT; +static expert_field ei_roofnet_too_many_links = EI_INIT; /* * dissect the header of roofnet @@ -222,7 +222,7 @@ static void dissect_roofnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) roofnet_nlinks= tvb_get_guint8(tvb, ROOFNET_OFFSET_NLINKS); /* Check that we do not have a malformed roofnet packet */ if ((roofnet_nlinks*6*4)+ROOFNET_HEADER_LENGTH > ROOFNET_MAX_LENGTH) { - expert_add_info_format_text(pinfo, it, &ei_rooftop_too_many_links, "Too many links (%u)\n", roofnet_nlinks); + expert_add_info_format_text(pinfo, it, &ei_roofnet_too_many_links, "Too many links (%u)\n", roofnet_nlinks); return; } @@ -335,7 +335,7 @@ void proto_register_roofnet(void) }; static ei_register_info ei[] = { - { &ei_rooftop_too_many_links, { "rooftop.too_many_links", PI_MALFORMED, PI_ERROR, "Too many links", EXPFILL }}, + { &ei_roofnet_too_many_links, { "roofnet.too_many_links", PI_MALFORMED, PI_ERROR, "Too many links", EXPFILL }}, }; expert_module_t* expert_roofnet; diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index ea2b205bc9..8b56f69d04 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -8412,7 +8412,7 @@ proto_register_rsvp(void) NULL, HFILL } }, { &hf_rsvp_3gpp_obj_pf_tos_tc, - { "Type of Service (IPv4)/Traffic Class (IPv6)", "rsvp.3gpp_obj._pf_tos_tc", + { "Type of Service (IPv4)/Traffic Class (IPv6)", "rsvp.3gpp_obj.pf_tos_tc", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 061f73b673..e7d172d5a6 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -310,7 +310,7 @@ void proto_register_vrrp(void) }; static ei_register_info ei[] = { - { &ei_vrrp_checksum, { "vrrp.vrrp_bad.expert", PI_CHECKSUM, PI_WARN, "Bad checksum", EXPFILL }}, + { &ei_vrrp_checksum, { "vrrp.checksum_bad.expert", PI_CHECKSUM, PI_WARN, "Bad checksum", EXPFILL }}, }; expert_module_t* expert_vrrp;