Skip to content

Commit

Permalink
Fix display filter errors caught by checkfiltername.pl
Browse files Browse the repository at this point in the history 
svn path=/trunk/; revision=50399
  • Loading branch information
@mmann78
mmann78 committed Jul 6, 2013
1 parent 9822a1f commit 225698e
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion asn1/c1222/c1222.asn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion asn1/c1222/c1222.cnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ IMPORT ../acse/acse.inf
#.EXPORTS

#.PDU
C1222-MESSAGE
MESSAGE

#.NO_EMIT

Expand Down
2 changes: 1 addition & 1 deletion asn1/c1222/packet-c1222-template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions asn1/mpeg-audio/packet-mpeg-audio-template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }},
};

Expand Down
26 changes: 13 additions & 13 deletions epan/dissectors/packet-c1222.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 },
Expand All @@ -1484,29 +1484,29 @@ 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;
}



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);
}


Expand All @@ -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);
}
}

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions epan/dissectors/packet-eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions epan/dissectors/packet-iax2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions epan/dissectors/packet-mpeg-audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }},
};

Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-mpeg-dsmcc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }},
};

Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-ncp-sss.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions epan/dissectors/packet-roofnet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-rsvp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
},
Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-vrrp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 225698e

Please sign in to comment.