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-infiniband.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-infiniband.c')
| -rw-r--r-- | epan/dissectors/packet-infiniband.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 681334f7e4..42bfca510f 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -2493,7 +2493,7 @@ static void update_sport(packet_info *pinfo) conversation_infiniband_data *conv_data; conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->dst, - PT_IBQP, pinfo->destport, pinfo->destport, NO_ADDR_B|NO_PORT_B); + ENDPOINT_IBQP, pinfo->destport, pinfo->destport, NO_ADDR_B|NO_PORT_B); if (!conv) return; @@ -3178,13 +3178,13 @@ create_conv_and_add_proto_data(packet_info *pinfo, guint64 service_id, proto_data->src_qp = src_port; memcpy(&proto_data->mad_private_data[0], mad_data, MAD_DATA_SIZE); conv = conversation_new(pinfo->num, addr, addr, - PT_IBQP, port, port, options); + ENDPOINT_IBQP, port, port, options); conversation_add_proto_data(conv, proto_infiniband, proto_data); /* next, register the conversation using the LIDs */ set_address(addr, AT_IB, sizeof(guint16), wmem_memdup(pinfo->pool, &lid, sizeof lid)); conv = conversation_new(pinfo->num, addr, addr, - PT_IBQP, port, port, options); + ENDPOINT_IBQP, port, port, options); conversation_add_proto_data(conv, proto_infiniband, proto_data); } @@ -3230,7 +3230,7 @@ static void save_conversation_info(packet_info *pinfo, guint8 *local_gid, guint8 proto_data->client_to_server = TRUE; conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, - PT_IBQP, pinfo->srcport, pinfo->destport, 0); + ENDPOINT_IBQP, pinfo->srcport, pinfo->destport, 0); conversation_add_proto_data(conv, proto_infiniband, proto_data); /* create unidirection conversation for packets that will flow from @@ -3437,7 +3437,7 @@ static void create_bidi_conv(packet_info *pinfo, connection_context *connection) proto_data->client_to_server = FALSE; memset(&proto_data->mad_private_data[0], 0, MAD_DATA_SIZE); conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, - PT_IBQP, connection->resp_qp, + ENDPOINT_IBQP, connection->resp_qp, connection->req_qp, 0); conversation_add_proto_data(conv, proto_infiniband, proto_data); } @@ -3488,7 +3488,7 @@ static void update_passive_conv_info(packet_info *pinfo, conversation_infiniband_data *conv_data; conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->dst, - PT_IBQP, connection->req_qp, connection->req_qp, + ENDPOINT_IBQP, connection->req_qp, connection->req_qp, NO_ADDR_B|NO_PORT_B); if (!conv) return; /* nothing to do with no conversation context */ |