aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-catapult-dct2000.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-11-15 20:35:51 -0500
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-11-16 13:45:18 +0000
commitf92ed4df2d4720720080d8013da124a0eb956de7 (patch)
tree2b3bf92972a849fe668f121e53e45bfe1b7c6451 /epan/dissectors/packet-catapult-dct2000.c
parent3b8ed366ddd149f2cc1428a713235c18afc192e7 (diff)
Remove ipproto member of packet_info.
All situations can be handled with "shimmed" dissector functions. Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8 Reviewed-on: https://code.wireshark.org/review/5327 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
-rw-r--r--epan/dissectors/packet-catapult-dct2000.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index e947d589b4..28307ecce5 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -2598,16 +2598,6 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Try to add right stuff to pinfo so conversation stuff works... */
pinfo->ptype = type_of_port;
- switch (type_of_port) {
- case PT_UDP:
- pinfo->ipproto = IP_PROTO_UDP;
- break;
- case PT_TCP:
- pinfo->ipproto = IP_PROTO_TCP;
- break;
- default:
- pinfo->ipproto = IP_PROTO_NONE;
- }
/* Add addresses & ports into ipprim tree.
Also set address info in pinfo for conversations... */
@@ -2764,8 +2754,6 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Add these SCTPPRIM fields inside an SCTPPRIM subtree */
sctpprim_tree = proto_item_add_subtree(ti_local, ett_catapult_dct2000_sctpprim);
- pinfo->ipproto = IP_PROTO_SCTP;
-
/* Destination address */
if (dest_addr_offset != 0) {
proto_item *addr_ti;