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

Fix some of the GCC build errors, more to come. 

svn path=/trunk/; revision=43889
This commit is contained in:
Evan Huus 2012-07-21 13:25:14 +00:00
parent f701cc63e5
commit 897d72c358
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-sdp.c
View File

@ -554,7 +554,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} }
set_rtp = TRUE; set_rtp = TRUE;
/* SPRT might use the same port... */ /* SPRT might use the same port... */
p_add_proto_data(pinfo->fd, proto_sprt, (void*)port); p_add_proto_data(pinfo->fd, proto_sprt, &port);
} }
if (rtcp_handle) { if (rtcp_handle) {
port++; port++;
@ -571,7 +571,9 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
src_addr.data=(guint8*)&ipaddr; src_addr.data=(guint8*)&ipaddr;
if(sprt_handle) { if(sprt_handle) {
if(port == 0) { if(port == 0) {
sprt_add_address(pinfo, &src_addr, (int)p_get_proto_data(pinfo->fd, proto_sprt), 0, "SDP", pinfo->fd->num); /* will use same port as RTP */ sprt_add_address(pinfo, &src_addr,
*(guint32*)p_get_proto_data(pinfo->fd, proto_sprt),
0, "SDP", pinfo->fd->num); /* will use same port as RTP */
} else { } else {
sprt_add_address(pinfo, &src_addr, port, 0, "SDP", pinfo->fd->num); sprt_add_address(pinfo, &src_addr, port, 0, "SDP", pinfo->fd->num);
} }

2
epan/dissectors/packet-sprt.c
View File

@ -624,7 +624,7 @@ dissect_sprt_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/ */
if(tvb_length(tvb) < 6) if(tvb_length(tvb) < 6)
return FALSE; /* packet is waay to short return FALSE; /* packet is waay to short */
/* Get the fields in the first two octets */ /* Get the fields in the first two octets */
extension_bit = tvb_get_guint8(tvb, offset) & 0x7F; extension_bit = tvb_get_guint8(tvb, offset) & 0x7F;