2 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c
index 390a205d86..8eda310152 100644
--- a/epan/dissectors/packet-exported_pdu.c
+++ b/epan/dissectors/packet-exported_pdu.c
@@ -148,8 +148,6 @@ static port_type exp_pdu_old_to_new_port_type(guint type)
         return PT_DCCP;
     case OLD_PT_IPX:
         return PT_IPX;
-    case OLD_PT_EXCHG:
-        return PT_EXCHG;
     case OLD_PT_DDP:
         return PT_DDP;
     case OLD_PT_IDP:
@@ -162,6 +160,7 @@ static port_type exp_pdu_old_to_new_port_type(guint type)
         return PT_IBQP;
     case OLD_PT_BLUETOOTH:
         return PT_BLUETOOTH;
+    case OLD_PT_EXCHG:
     case OLD_PT_TIPC:
     case OLD_PT_TDMOP:
     case OLD_PT_NCP:
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);