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

Don't do heuristic check for 'dstport being even' if checking for rtp over stun. 

See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6322

svn path=/trunk/; revision=38953
This commit is contained in:
Bill Meier 2011-09-09 20:37:49 +00:00
parent 4a91af2383
commit b3c369619b
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/packet-rtp.c
View File

@ -676,9 +676,9 @@ void rtp_add_address(packet_info *pinfo,
}
static gboolean
dissect_rtp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
dissect_rtp_heur_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean check_destport )
{
guint8 octet1;
guint8 octet1;
unsigned int version;
unsigned int offset = 0;
@ -721,7 +721,7 @@ dissect_rtp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
}
/* Was it sent to an even-numbered port? */
if ((pinfo->destport % 2) != 0) {
if (check_destport && ((pinfo->destport % 2) != 0)) {
return FALSE;
}
@ -729,6 +729,18 @@ dissect_rtp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
return TRUE;
}
static gboolean
dissect_rtp_heur_udp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
{
return dissect_rtp_heur_common(tvb, pinfo, tree, TRUE);
}
static gboolean
dissect_rtp_heur_stun( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
{
return dissect_rtp_heur_common(tvb, pinfo, tree, FALSE);
}
/*
* Process the payload of the RTP packet, hand it to the subdissector
*/
@ -2169,8 +2181,8 @@ proto_reg_handoff_rtp(void)
dissector_add_handle("udp.port", rtp_handle); /* for 'decode-as' */
dissector_add_string("rtp_dyn_payload_type", "red", rtp_rfc2198_handle);
heur_dissector_add( "udp", dissect_rtp_heur, proto_rtp);
heur_dissector_add("stun", dissect_rtp_heur, proto_rtp);
heur_dissector_add( "udp", dissect_rtp_heur_udp, proto_rtp);
heur_dissector_add("stun", dissect_rtp_heur_stun, proto_rtp);
data_handle = find_dissector("data");
classicstun_handle = find_dissector("classicstun");