diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-11-05 21:34:58 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-11-06 15:19:15 +0000 |
| commit | 147e491025ff8ca590e28fb066a833fddda87291 (patch) | |
| tree | 36b3dd1760db4eb175efc0231211818d5a0a3b48 /epan/dissectors/packet-fc.c | |
| parent | 0dfff8c4b4e4ea26b3a22ef6800213ba8a9f4f03 (diff) | |
Convert PT_EXCHG into using conversation endpoints
Change-Id: Id5857a58513c38dd0ab5b30b61113bcc14e1ecee
Reviewed-on: https://code.wireshark.org/review/24258
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-fc.c')
| -rw-r--r-- | epan/dissectors/packet-fc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 762884b3dd..04a3cdbf37 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -733,8 +733,9 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean if(!is_ifcp){ set_address_tvb (&pinfo->dst, AT_FC, 3, tvb, offset+1); set_address_tvb (&pinfo->src, AT_FC, 3, tvb, offset+5); - pinfo->srcport=0; - pinfo->destport=0; + conversation_create_endpoint(pinfo, &pinfo->src, &pinfo->dst, ENDPOINT_EXCHG, 0, 0, 0); + } else { + conversation_create_endpoint(pinfo, &pinfo->src, &pinfo->dst, ENDPOINT_EXCHG, pinfo->srcport, pinfo->destport, 0); } set_address(&fchdr->d_id, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); set_address(&fchdr->s_id, pinfo->src.type, pinfo->src.len, pinfo->src.data); @@ -749,8 +750,6 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean param = tvb_get_ntohl (tvb, offset+20); seq_id = tvb_get_guint8 (tvb, offset+12); - pinfo->ptype = PT_EXCHG; - /* set up a conversation and conversation data */ /* TODO treat the fc address s_id==00.00.00 as a wildcard matching anything */ conversation=find_or_create_conversation(pinfo); |