diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-11 19:36:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-11 19:36:13 +0000 |
| commit | b348f66dd4ffd1d32fa2ba1c701eb89cccf0873c (patch) | |
| tree | 83e7143851b505782f70c4aba68f84f68c4613df /packet-ncp.c | |
| parent | 4f471acc344956899cf1aefcc3f6797f2946a338 (diff) | |
| download | wireshark-b348f66dd4ffd1d32fa2ba1c701eb89cccf0873c.tar.gz wireshark-b348f66dd4ffd1d32fa2ba1c701eb89cccf0873c.tar.bz2 wireshark-b348f66dd4ffd1d32fa2ba1c701eb89cccf0873c.zip | |
Note that "dissect_ping_req()" duplicates a bunch of stuff in
"dissect_ncp_request()".
Fix "dissect_ping_req()" to properly put the NDS version in a ping
request into the tree (although that field isn't present in the ping
requests I've seen, so perhaps it's only in NDS version 10 and later),
as big-endian (change FALSE to TRUE if it's little-endian).
Get rid of the unused "ncp_nds_verb" variable (set, but not used) in
"dissect_ncp_common()".
Call "dissect_ping_req()" from "dissect_ncp_common()" again.
svn path=/trunk/; revision=6411
Diffstat (limited to 'packet-ncp.c')
| -rw-r--r-- | packet-ncp.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/packet-ncp.c b/packet-ncp.c index b04b7bfdca..3bad2c7af7 100644 --- a/packet-ncp.c +++ b/packet-ncp.c @@ -5,7 +5,7 @@ * Modified to decode server op-lock * & NDS packets by Greg Morris <gmorris@novell.com> * - * $Id: packet-ncp.c,v 1.71 2002/10/10 03:03:30 guy Exp $ + * $Id: packet-ncp.c,v 1.72 2002/10/11 19:36:13 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -198,7 +198,6 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *flags_tree = NULL; guint16 data_len = 0; guint16 missing_fraglist_count = 0; - guint16 ncp_nds_verb; int hdr_offset = 0; int commhdr; int offset; @@ -433,7 +432,6 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case NCP_BROADCAST_SLOT: /* Server Broadcast Packet */ next_tvb = tvb_new_subset(tvb, hdr_offset, -1, -1); if (tvb_get_guint8(tvb, commhdr+6) == 0x68) { - ncp_nds_verb = tvb_get_ntohl(tvb, commhdr+4); subfunction = tvb_get_guint8(tvb, commhdr+7); switch (subfunction) { @@ -443,28 +441,11 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, header.type, ncp_tree); break; -#if 0 - /* - * According to the page at - * -http://developer.novell.com/ndk/doc/ncp/index.html?page=/ndk/doc/ncp/ncp__enu/data/a1wfz7x.html - * - * an NDS Ping request's request header doesn't - * have anything in it other than a function - * code, a subfunction code, and 3 reserved - * bytes. According to at least one capture - * I've seen, that page is correct. - * - * Therefore, we don't call "dissect_ping_req()", - * as that assumes there's a pile of additional - * junk in the packet. - */ case 0x01: /* NDS Ping */ dissect_ping_req(next_tvb, pinfo, nw_connection, header.sequence, header.type, ncp_tree); break; -#endif default: dissect_ncp_request(next_tvb, pinfo, |