diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-05-12 18:11:02 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-05-12 18:11:02 +0000 |
commit | 85a8e304ddeb73c54ad7e86271d67543484645c9 (patch) | |
tree | 1cc041f936dcdb3e5e95946361b0c75f71cd31ac /epan/dissectors/packet-rtp.c | |
parent | f2ccdd6dbf1143374e62bc645a703870f2106719 (diff) |
Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
-rw-r--r-- | epan/dissectors/packet-rtp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 0d888968a3..fac8fea3c2 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -987,7 +987,7 @@ process_rtp_payload(tvbuff_t *newtvb, packet_info *pinfo, proto_tree *tree, payload_len = tvb_length_remaining(newtvb, offset); /* first check if this is added as an SRTP stream - if so, don't try to dissector the payload data for now */ - p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp, 0); if (p_conv_data && p_conv_data->srtp_info) { srtp_info = p_conv_data->srtp_info; payload_len -= srtp_info->mki_len + srtp_info->auth_tag_len; @@ -1076,7 +1076,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 seqno; /* Retrieve RTPs idea of a converation */ - p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp, 0); if(p_conv_data != NULL) finfo = p_conv_data->rtp_conv_info; @@ -1278,7 +1278,7 @@ dissect_rtp_rfc2198(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gchar *payload_type_str; /* Retrieve RTPs idea of a converation */ - p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp, 0); /* Add try to RFC 2198 data */ ti = proto_tree_add_text(tree, tvb, offset, -1, "RFC 2198: Redundant Audio Data"); @@ -1614,7 +1614,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Look for conv and add to the frame if found */ get_conv_info(pinfo, rtp_info); - p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp, 0); if (p_conv_data) rtp_info->info_is_video = p_conv_data->is_video; @@ -1625,7 +1625,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) col_set_str( pinfo->cinfo, COL_PROTOCOL, (is_srtp) ? "SRTP" : "RTP" ); /* check if this is added as an SRTP stream - if so, don't try to dissect the payload data for now */ - p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp, 0); #if 0 /* XXX: srtp_offset never actually used ?? */ if (p_conv_data && p_conv_data->srtp_info) { @@ -2055,7 +2055,7 @@ get_conv_info(packet_info *pinfo, struct _rtp_info *rtp_info) struct _rtp_conversation_info *p_conv_data = NULL; /* Use existing packet info if available */ - p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp, 0); if (!p_conv_data) { @@ -2080,7 +2080,7 @@ get_conv_info(packet_info *pinfo, struct _rtp_info *rtp_info) p_conv_packet_data->rtp_dyn_payload = p_conv_data->rtp_dyn_payload; p_conv_packet_data->rtp_conv_info = p_conv_data->rtp_conv_info; p_conv_packet_data->srtp_info = p_conv_data->srtp_info; - p_add_proto_data(pinfo->fd, proto_rtp, p_conv_packet_data); + p_add_proto_data(pinfo->fd, proto_rtp, 0, p_conv_packet_data); /* calculate extended sequence number */ seqno = calculate_extended_seqno(p_conv_data->extended_seqno, @@ -2105,7 +2105,7 @@ show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; /* Use existing packet info if available */ - p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtp, 0); if (!p_conv_data) return; |