aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2018-12-05 15:27:16 +0100
committerAnders Broman <a.broman58@gmail.com>2018-12-05 15:15:56 +0000
commitff0193f07f1f2d350b3f7712f83bc0f8a9552557 (patch)
treec0ba7213ead2a3a12730f6af484d7c2907c160bd
parentbd8cfad8b83737e0cd19932a5ce56e6ec345887d (diff)
SIP: Use differtent hf variables for the "real" and generated Call-id
It's not allways good to pick up frames for related call legs when filtering. Make different hf:s for the two use cases. Change-Id: I33c640636a76173f3a7952f4a740491ccfac276d Reviewed-on: https://code.wireshark.org/review/30922 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-sip.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 172f096beb..b69c61f0e6 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -224,6 +224,7 @@ static gint hf_sip_p_acc_net_i_ucid_3gpp = -1;
static gint hf_sip_service_priority = -1;
static gint hf_sip_icid_value = -1;
static gint hf_sip_icid_gen_addr = -1;
+static gint hf_sip_call_id_gen = -1;
/* Initialize the subtree pointers */
static gint ett_sip = -1;
@@ -4706,7 +4707,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
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_id = hf_sip_call_id_gen;
setup_info.hf_type = SDP_TRACE_ID_HF_TYPE_STR;
setup_info.trace_id = g_strdup(call_id);
message_info.data = &setup_info;
@@ -7207,7 +7208,13 @@ void proto_register_sip(void)
{ "icid-gen-addr", "sip.icid_gen_addr",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
- }
+ },
+ { &hf_sip_call_id_gen,
+ { "Call-ID", "sip.call_id_generated",
+ FT_STRING, BASE_NONE,NULL,0x0,
+ "Use to catch call id across protocols", HFILL }
+ },
+
};
/* raw_sip header field(s) */