diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-11 19:36:13 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-11 19:36:13 +0000 |
| commit | d5e2b5abda0bf87f68c66f2570ba9ffde8c4ad0a (patch) | |
| tree | 83e7143851b505782f70c4aba68f84f68c4613df /packet-ncp2222.inc | |
| parent | e4a3a378031f97875c9f1e7dfa533d747ef827ee (diff) | |
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6411 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-ncp2222.inc')
| -rw-r--r-- | packet-ncp2222.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/packet-ncp2222.inc b/packet-ncp2222.inc index 7369a097f7..1d26ad8542 100644 --- a/packet-ncp2222.inc +++ b/packet-ncp2222.inc @@ -8,7 +8,7 @@ * Gilbert Ramirez <gram@alumni.rice.edu> * Modified to decode NDS packets by Greg Morris <gmorris@novell.com> * - * $Id: packet-ncp2222.inc,v 1.31 2002/10/10 23:52:51 guy Exp $ + * $Id: packet-ncp2222.inc,v 1.32 2002/10/11 19:36:12 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -8187,9 +8187,14 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, } } - +/* + * XXX - this duplicates stuff in "dissect_ncp_request()"; could + * "dissect_ncp_request()" not just call "dissect_ping_req()" if + * the operation is an NCP ping, and "dissect_ping_req()" just dissect + * ping portion? + */ void -dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, +dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, guint16 nw_connection, guint8 sequence, guint16 type, proto_tree *ncp_tree) { @@ -8199,7 +8204,6 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, conversation_t *conversation; ptvcursor_t *ptvc = NULL; proto_tree *temp_tree = NULL; - guint32 nds_version = 0; gint length_remaining = 0; char flags_str[1+3+1+3+1+3+1+3+1+1]; char * sep = NULL; @@ -8301,8 +8305,8 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, subfunc, "SubFunction: %d (0x%02x)", subfunc, subfunc); - proto_tree_add_uint(ncp_tree, hf_nds_version, tvb, 8, 4, - nds_version); + proto_tree_add_item(ncp_tree, hf_nds_version, tvb, 8, 4, + FALSE); length_remaining = tvb_length_remaining(tvb, 8); if (length_remaining > 6) |