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-aeron.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-aeron.c')
| -rw-r--r-- | epan/dissectors/packet-aeron.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index af39168d1a..0f74f5ea7a 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -288,7 +288,6 @@ typedef struct { address * addr1; address * addr2; - port_type ptype; guint16 port1; guint16 port2; } aeron_conversation_info_t; @@ -397,10 +396,10 @@ static aeron_transport_t * aeron_transport_add(const aeron_conversation_info_t * conversation_t * conv; wmem_map_t * session_map; - conv = find_conversation(frame, cinfo->addr1, cinfo->addr2, cinfo->ptype, cinfo->port1, cinfo->port2, 0); + conv = find_conversation(frame, cinfo->addr1, cinfo->addr2, ENDPOINT_UDP, cinfo->port1, cinfo->port2, 0); if (conv == NULL) { - conv = conversation_new(frame, cinfo->addr1, cinfo->addr2, cinfo->ptype, cinfo->port1, cinfo->port2, 0); + conv = conversation_new(frame, cinfo->addr1, cinfo->addr2, ENDPOINT_UDP, cinfo->port1, cinfo->port2, 0); } if (frame > conv->last_frame) { @@ -676,17 +675,7 @@ static char * aeron_format_transport_uri(const aeron_conversation_info_t * cinfo { wmem_strbuf_t * uri; - uri = wmem_strbuf_new(wmem_packet_scope(), "aeron:"); - switch (cinfo->ptype) - { - case PT_UDP: - wmem_strbuf_append(uri, "udp"); - break; - default: - wmem_strbuf_append(uri, "unknown"); - break; - } - wmem_strbuf_append_c(uri, '?'); + uri = wmem_strbuf_new(wmem_packet_scope(), "aeron:udp?"); if (aeron_is_address_multicast(cinfo->addr2)) { switch (cinfo->addr2->type) @@ -858,7 +847,6 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in int addr_len = pinfo->dst.len; cinfo = wmem_new0(wmem_packet_scope(), aeron_conversation_info_t); - cinfo->ptype = pinfo->ptype; switch (pinfo->dst.type) { case AT_IPv4: |