osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove port_type values not set in pinfo->ptype 

NCP and SBCCS values used for conversation (endpoints) and not
to pass "type" to subdissectors.

Change-Id: I56a13d2bb7d718b340e9b5a102c43f6e0012bfb9
Reviewed-on: https://code.wireshark.org/review/24174
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-10-29 15:24:27 -04:00
parent 39ba9d4e7f
commit d597b5d61e
5 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/address.h
View File

@ -362,10 +362,8 @@ typedef enum {
PT_UDP, /* UDP */
PT_DCCP, /* DCCP */
PT_IPX, /* IPX sockets */
PT_NCP, /* NCP connection - XXX REMOVE XXX */
PT_EXCHG, /* Fibre Channel exchange */
PT_DDP, /* DDP AppleTalk connection */
PT_SBCCS, /* FICON - XXX REMOVE XXX */
PT_IDP, /* XNS IDP sockets */
PT_TIPC, /* TIPC PORT */
PT_USB, /* USB endpoint 0xffff means the host */

4
epan/conversation.c
View File

@ -1360,8 +1360,6 @@ endpoint_type conversation_pt_to_endpoint_type(port_type pt)
return ENDPOINT_DCCP;
case PT_IPX:
return ENDPOINT_IPX;
case PT_NCP:
return ENDPOINT_NCP;
case PT_EXCHG:
return ENDPOINT_EXCHG;
case PT_DDP:
@ -1376,8 +1374,6 @@ endpoint_type conversation_pt_to_endpoint_type(port_type pt)
return ENDPOINT_I2C;
case PT_IBQP:
return ENDPOINT_IBQP;
case PT_SBCCS:
return ENDPOINT_SBCCS;
case PT_BLUETOOTH:
return ENDPOINT_BLUETOOTH;
case PT_TDMOP:

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

@ -148,14 +148,10 @@ 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_NCP:
return PT_NCP;
case OLD_PT_EXCHG:
return PT_EXCHG;
case OLD_PT_DDP:
return PT_DDP;
case OLD_PT_SBCCS:
return PT_SBCCS;
case OLD_PT_IDP:
return PT_IDP;
case OLD_PT_TIPC:
@ -170,6 +166,10 @@ static port_type exp_pdu_old_to_new_port_type(guint type)
return PT_BLUETOOTH;
case OLD_PT_TDMOP:
return PT_TDMOP;
case OLD_PT_NCP:
case OLD_PT_SBCCS:
//no longer supported
break;
}
DISSECTOR_ASSERT(FALSE);

4
epan/exported_pdu.c
View File

@ -116,14 +116,10 @@ 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_NCP:
return OLD_PT_NCP;
case PT_EXCHG:
return OLD_PT_EXCHG;
case PT_DDP:
return OLD_PT_DDP;
case PT_SBCCS:
return OLD_PT_SBCCS;
case PT_IDP:
return OLD_PT_IDP;
case PT_TIPC:

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_NCP: return "NCP";
case PT_EXCHG: return "FC EXCHG";
case PT_DDP: return "DDP";
case PT_IDP: return "IDP";