diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-01-22 03:33:45 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-01-22 03:33:45 +0000 |
commit | 9f2c88966a252520a4bafaa5fee36cf39c1eb85a (patch) | |
tree | d6278fa82b47a9aa4ce9153dbf718e6cfc6b8fdc /packet-ncp.c | |
parent | 79e1fdb9e56339d8d7e8d9df090dc0386cf4131e (diff) |
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Make the IP dissector static, as it's called only via dissector tables
or dissector handles. Also make the "dissect the TOS field as the
DiffServ DS field" flag static, as it's not referred to outside of
"packet-ip.c".
In the NCP dissector, refer to the port type through "pinfo" rather than
through the global "pi", as it's a tvbuffified dissector.
svn path=/trunk/; revision=2929
Diffstat (limited to 'packet-ncp.c')
-rw-r--r-- | packet-ncp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packet-ncp.c b/packet-ncp.c index 6ccd1d2b6b..f3ab871fd0 100644 --- a/packet-ncp.c +++ b/packet-ncp.c @@ -3,7 +3,7 @@ * Gilbert Ramirez <gram@xiexie.org> * Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net> * - * $Id: packet-ncp.c,v 1.46 2001/01/09 06:31:39 guy Exp $ + * $Id: packet-ncp.c,v 1.47 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -260,15 +260,12 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int hdr_offset = 0; int commhdr; - CHECK_DISPLAY_AS_DATA(proto_ncp, tvb, pinfo, tree); - - pinfo->current_proto = "NCP"; if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "NCP"); if (check_col(pinfo->fd, COL_INFO)) col_clear(pinfo->fd, COL_INFO); - if ( pi.ptype == PT_TCP || pi.ptype == PT_UDP ) { + if ( pinfo->ptype == PT_TCP || pinfo->ptype == PT_UDP ) { ncpiph.signature = tvb_get_ntohl(tvb, 0); ncpiph.length = tvb_get_ntohl(tvb, 4); hdr_offset += 8; @@ -294,7 +291,7 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_ncp, tvb, 0, tvb_length(tvb), FALSE); ncp_tree = proto_item_add_subtree(ti, ett_ncp); - if ( pi.ptype == PT_TCP || pi.ptype == PT_UDP ) { + if ( pinfo->ptype == PT_TCP || pinfo->ptype == PT_UDP ) { proto_tree_add_uint(ncp_tree, hf_ncp_ip_sig, tvb, 0, 4, ncpiph.signature); proto_tree_add_uint(ncp_tree, hf_ncp_ip_length, tvb, 4, 4, ncpiph.length); if ( ncpiph.signature == NCPIP_RQST ) { |