osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2017-11-05 21:34:58 -05:00
parent 0dfff8c4b4
commit 147e491025
6 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/address.h
View File

@ -362,7 +362,6 @@ typedef enum {
PT_UDP, /* UDP */
PT_DCCP, /* DCCP */
PT_IPX, /* IPX sockets */
PT_EXCHG, /* Fibre Channel exchange */
PT_DDP, /* DDP AppleTalk connection */
PT_IDP, /* XNS IDP sockets */
PT_USB, /* USB endpoint 0xffff means the host */

2
epan/conversation.c
View File

@ -1400,8 +1400,6 @@ endpoint_type conversation_pt_to_endpoint_type(port_type pt)
return ENDPOINT_DCCP;
case PT_IPX:
return ENDPOINT_IPX;
case PT_EXCHG:
return ENDPOINT_EXCHG;
case PT_DDP:
return ENDPOINT_DDP;
case PT_IDP:

3
epan/dissectors/packet-exported_pdu.c
View File

@ -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:

7
epan/dissectors/packet-fc.c
View File

@ -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);

2
epan/exported_pdu.c
View File

@ -116,8 +116,6 @@ static guint exp_pdu_new_to_old_port_type(port_type pt)
return OLD_PT_DCCP;
case PT_IPX:
return OLD_PT_IPX;
case PT_EXCHG:
return OLD_PT_EXCHG;
case PT_DDP:
return OLD_PT_DDP;
case PT_IDP:

1
epan/to_str.c
View File

@ -1137,7 +1137,6 @@ port_type_to_str (port_type type)
case PT_UDP: return "UDP";
case PT_DCCP: return "DCCP";
case PT_IPX: return "IPX";
case PT_EXCHG: return "FC EXCHG";
case PT_DDP: return "DDP";
case PT_IDP: return "IDP";
case PT_USB: return "USB";