osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Allow DCT2000 support to find a couple of more protocols. 

Try to squash some warnings seen on the ubuntu buildbot log

svn path=/trunk/; revision=19683
This commit is contained in:
Martin Mathieson 2006-10-25 16:46:27 +00:00
parent 131db54e82
commit e694978c74
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-catapult-dct2000.c
View File

@ -86,6 +86,7 @@ static const value_string encap_vals[] = {
{ DCT2000_ENCAP_SSCOP, "SSCOP" },
{ WTAP_ENCAP_FRELAY, "Frame Relay" },
{ WTAP_ENCAP_MTP2, "MTP2" },
{ DCT2000_ENCAP_NBAP, "NBAP" },
{ DCT2000_ENCAP_UNHANDLED, "Unhandled Protocol" },
{ 0, NULL },
};
@ -103,6 +104,9 @@ void proto_reg_handoff_catapult_dct2000(void);
void proto_register_catapult_dct2000(void);
static dissector_handle_t look_for_dissector(char *protocol_name);
static void parse_outhdr_string(char *outhdr_string);
static void attach_fp_info(packet_info *pinfo, gboolean received,
const char *protocol_name, int variant);
/* Look for the protocol data within an ipprim packet.
@ -412,6 +416,11 @@ dissector_handle_t look_for_dissector(char *protocol_name)
{
return find_dissector("nbap");
}
else
if (strncmp(protocol_name, "gtp", strlen("gtp")) == 0)
{
return find_dissector("gtp");
}
/* Try for an exact match */
else
@ -449,7 +458,7 @@ void parse_outhdr_string(char *outhdr_string)
/* Convert digits into value */
outhdr_values[outhdr_values_found++] =
atoi(format_text(outhdr_string+start_i, digits));
atoi((char*)format_text(outhdr_string+start_i, digits));
/* Skip comma */
n++;
@ -691,9 +700,9 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
(strcmp(protocol_name, "fp_r5") == 0) ||
(strcmp(protocol_name, "fp_r6") == 0))
{
parse_outhdr_string(tvb_get_ephemeral_string(tvb, outhdr_start, outhdr_length));
parse_outhdr_string((char*)tvb_get_ephemeral_string(tvb, outhdr_start, outhdr_length));
attach_fp_info(pinfo, direction, protocol_name,
atoi(tvb_get_ephemeral_string(tvb, variant_start, variant_length)));
atoi((char*)tvb_get_ephemeral_string(tvb, variant_start, variant_length)));
}

5
epan/dissectors/packet-smtp.c
View File

@ -549,7 +549,6 @@ proto_register_smtp(void)
};
module_t *smtp_module;
/* No Configuration options to register? */
proto_smtp = proto_register_protocol("Simple Mail Transfer Protocol",
"SMTP", "smtp");
@ -557,6 +556,10 @@ proto_register_smtp(void)
proto_register_field_array(proto_smtp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
/* Allow dissector to find be found by name. */
register_dissector("smtp", dissect_smtp, proto_smtp);
/* Preferences */
smtp_module = prefs_register_protocol(proto_smtp, NULL);
prefs_register_bool_preference(smtp_module, "desegment_lines",
"Reassemble SMTP command and response lines\nspanning multiple TCP segments",