osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make dissect_tivoconnect() a proper "new-style" dissector, and register 

it as such.

Use "tvb_strncaseeql()" to do the check for "tivoconnect" at the
beginning of the packet.

svn path=/trunk/; revision=18415
This commit is contained in:
Guy Harris 2006-06-09 23:06:38 +00:00
parent 54bc6ca358
commit a85199af18
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-tivoconnect.c
View File

@ -68,7 +68,7 @@ static int hf_tivoconnect_version = -1;
static gint ett_tivoconnect = -1;
/* Code to actually dissect the packets */
static gboolean
static int
dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* parsing variables */
@ -80,11 +80,8 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gchar * packet_machine = NULL;
/* validate that we have a tivoconnect packet */
length = tvb->length;
if ( length < 11 ||
!(string = (gchar*)tvb_get_ephemeral_string(tvb, 0, length)) ||
strncasecmp(string,"tivoconnect",11) != 0) {
return FALSE;
if ( tvb_strncaseeql(tvb, 0, "tivoconnect", 11) != 0) {
return 0;
}
/* Make entries in Protocol column and Info column on summary display */
@ -198,7 +195,7 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* If this protocol has a sub-dissector call it here, see section 1.8 */
return TRUE;
return tvb_length(tvb);
}
@ -267,7 +264,7 @@ proto_reg_handoff_tivoconnect(void)
dissector_handle_t tivoconnect_handle;
tivoconnect_handle = create_dissector_handle(dissect_tivoconnect,
tivoconnect_handle = new_create_dissector_handle(dissect_tivoconnect,
proto_tivoconnect);
dissector_add("udp.port", 2190, tivoconnect_handle);
dissector_add("tcp.port", 2190, tivoconnect_handle);
@ -275,4 +272,3 @@ proto_reg_handoff_tivoconnect(void)
inited = TRUE;
}
}