aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sip.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2018-12-03 06:42:34 +0100
committerAnders Broman <a.broman58@gmail.com>2018-12-03 07:37:29 +0000
commit8bd0616621effc9bd638b192227a2792f6644254 (patch)
treee091095497e25b3af205c402cfbf979682fd4ac0 /epan/dissectors/packet-sip.c
parent3a83a8476ab16830378f4372eae96fda46ca896e (diff)
SDP: Show callid from all call legs with the same RTP cpnversation.
Change-Id: If17732c2bd0b23e7f62b7464b9f154c317019f16 Reviewed-on: https://code.wireshark.org/review/30893 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-sip.c')
-rw-r--r--epan/dissectors/packet-sip.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index f04c2f068c..172f096beb 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -4703,19 +4703,19 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
if (!strcmp(media_type_str_lower_case, "application/sdp")) {
/* Resends don't count */
if (resend_for_packet == 0) {
- sdp_setup_info_t *setup_info = wmem_new(wmem_file_scope(), sdp_setup_info_t);
+ sdp_setup_info_t setup_info;
- setup_info->setup_proto = g_strdup("SIP");
- setup_info->hf_id = hf_header_array[POS_CALL_ID];
- setup_info->hf_type = SDP_TRACE_ID_HF_TYPE_STR;
- setup_info->trace_id = wmem_strdup(wmem_file_scope(), call_id);
- message_info.data = setup_info;
+ setup_info.setup_proto = g_strdup("SIP");
+ setup_info.hf_id = hf_header_array[POS_CALL_ID];
+ setup_info.hf_type = SDP_TRACE_ID_HF_TYPE_STR;
+ setup_info.trace_id = g_strdup(call_id);
+ message_info.data = &setup_info;
if (line_type == REQUEST_LINE) {
DPRINT(("calling setup_sdp_transport() SDP_EXCHANGE_OFFER frame=%d",
pinfo->num));
DINDENT();
- setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->num, sip_delay_sdp_changes, setup_info);
+ setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->num, sip_delay_sdp_changes, &setup_info);
DENDENT();
} else if (line_type == STATUS_LINE) {
if (stat_info->response_code >= 400) {
@@ -4724,7 +4724,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
request_for_response, pinfo->num));
DINDENT();
/* SIP client request failed, so SDP offer should fail */
- setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_REJECT, request_for_response, sip_delay_sdp_changes, setup_info);
+ setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_REJECT, request_for_response, sip_delay_sdp_changes, &setup_info);
DENDENT();
}
else if ((stat_info->response_code >= 200) && (stat_info->response_code <= 299)) {
@@ -4733,7 +4733,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
request_for_response, pinfo->num));
DINDENT();
/* SIP success request, so SDP offer should be accepted */
- setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_ACCEPT, request_for_response, sip_delay_sdp_changes, setup_info);
+ setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_ACCEPT, request_for_response, sip_delay_sdp_changes, &setup_info);
DENDENT();
}
}