diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-10-29 10:12:59 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-29 16:53:57 +0000 |
| commit | abfb6441177961fbdfa9648fdd2c40ef0ef3cefd (patch) | |
| tree | dc5d1b438a052e73ec243d2f10e772e39fec3894 /epan/dissectors/packet-rtcp.c | |
| parent | 1bc6d4e96573f89ecdd719cb3cac92754b91f52c (diff) | |
Add conversation endpoint type
For the moment this mirrors the port_type enumeration (PT_XXX), but the
intent is to move away from using "port types", eliminating most (if not
all)
Added conversation_pt_to_endpoint_type() so that conversations deal with the
correct enumeration. This is for dissector that use pinfo->ptype as input
to conversation APIs. Explicit use of port types are converted to using
ENDPOINT_XXX type.
Change-Id: Ia0bf553a3943b702c921f185407e03ce93ebf0ef
Reviewed-on: https://code.wireshark.org/review/24166
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-rtcp.c')
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 1632778724..cacad6f12c 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -748,14 +748,14 @@ void srtcp_add_address( packet_info *pinfo, * Check if the ip address and port combination is not * already registered as a conversation. */ - p_conv = find_conversation( pinfo->num, addr, &null_addr, PT_UDP, port, other_port, + p_conv = find_conversation( pinfo->num, addr, &null_addr, ENDPOINT_UDP, port, other_port, NO_ADDR_B | (!other_port ? NO_PORT_B : 0)); /* * If not, create a new conversation. */ if ( ! p_conv ) { - p_conv = conversation_new( pinfo->num, addr, &null_addr, PT_UDP, + p_conv = conversation_new( pinfo->num, addr, &null_addr, ENDPOINT_UDP, (guint32)port, (guint32)other_port, NO_ADDR2 | (!other_port ? NO_PORT2 : 0)); } @@ -2990,7 +2990,7 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_t *p_conv; /* First time, get info from conversation */ p_conv = find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src, - pinfo->ptype, + conversation_pt_to_endpoint_type(pinfo->ptype), pinfo->destport, pinfo->srcport, NO_ADDR_B); if (p_conv) @@ -3068,13 +3068,13 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr) Even though we think of this as an outgoing packet being sent, we store the time as being received by the destination. */ p_conv = find_conversation(pinfo->num, &pinfo->net_dst, &pinfo->net_src, - pinfo->ptype, + conversation_pt_to_endpoint_type(pinfo->ptype), pinfo->destport, pinfo->srcport, NO_ADDR_B); /* If the conversation doesn't exist, create it now. */ if (!p_conv) { - p_conv = conversation_new(pinfo->num, &pinfo->net_dst, &pinfo->net_src, PT_UDP, + p_conv = conversation_new(pinfo->num, &pinfo->net_dst, &pinfo->net_src, ENDPOINT_UDP, pinfo->destport, pinfo->srcport, NO_ADDR2); if (!p_conv) @@ -3160,7 +3160,7 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo, /* Look for captured timestamp of last SR in conversation of sender */ /* of this packet */ p_conv = find_conversation(pinfo->num, &pinfo->net_src, &pinfo->net_dst, - pinfo->ptype, + conversation_pt_to_endpoint_type(pinfo->ptype), pinfo->srcport, pinfo->destport, NO_ADDR_B); if (!p_conv) { @@ -3314,7 +3314,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U /* first see if this conversation is encrypted SRTP, and if so do not try to dissect the payload(s) */ p_conv = find_conversation(pinfo->num, &pinfo->net_src, &pinfo->net_dst, - pinfo->ptype, + conversation_pt_to_endpoint_type(pinfo->ptype), pinfo->srcport, pinfo->destport, NO_ADDR_B); if (p_conv) { |