Rename "ncp.nds_string" to "ncp.nds_tree_name", as it's not a generic
string, it's a tree name (as the field's display name suggests). Get rid of the unused "ncp.nds_string_value" field. Fix up the names of some fields, and use "proto_tree_add_uint()" rather than "proto_tree_add_uint_format()" to add them to the protocol tree. svn path=/trunk/; revision=6408
This commit is contained in:
parent
ce4a4b3149
commit
15c6ff4f2f
16
ncp2222.py
16
ncp2222.py
|
@ -24,7 +24,7 @@ http://developer.novell.com/ndk/doc/docui/index.htm#../ncp/ncp__enu/data/
|
|||
for a badly-formatted HTML version of the same PDF.
|
||||
|
||||
|
||||
$Id: ncp2222.py,v 1.35 2002/09/26 02:08:20 jmayer Exp $
|
||||
$Id: ncp2222.py,v 1.36 2002/10/10 23:32:01 guy Exp $
|
||||
|
||||
|
||||
Copyright (c) 2000-2002 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
@ -5769,8 +5769,7 @@ static int hf_bit13l1flagsh = -1;
|
|||
static int hf_bit14l1flagsh = -1;
|
||||
static int hf_bit15l1flagsh = -1;
|
||||
static int hf_bit16l1flagsh = -1;
|
||||
static int hf_nds_string = -1;
|
||||
static int hf_nds_string_value = -1;
|
||||
static int hf_nds_tree_name = -1;
|
||||
static int hf_nds_reply_error = -1;
|
||||
static int hf_nds_net = -1;
|
||||
static int hf_nds_node = -1;
|
||||
|
@ -6321,13 +6320,10 @@ proto_register_ncp2222(void)
|
|||
{ "NDS Version", "ncp.ping_version", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
|
||||
|
||||
{ &hf_nds_version,
|
||||
{ "NDS Version", "ncp.ndsver", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
|
||||
{ "NDS Version", "ncp.nds_version", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
|
||||
|
||||
{ &hf_nds_string,
|
||||
{ "Tree Name", "ncp.nds_string", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }},
|
||||
|
||||
{ &hf_nds_string_value,
|
||||
{ "NDS String :", "ncp.nds_string_value", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }},
|
||||
{ &hf_nds_tree_name,
|
||||
{ "Tree Name", "ncp.nds_tree_name", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }},
|
||||
|
||||
/*
|
||||
* XXX - the page at
|
||||
|
@ -7057,7 +7053,7 @@ proto_register_ncp2222(void)
|
|||
{ "Stream Name ", "ncp.nds_stream_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
|
||||
|
||||
{ &hf_nds_buffer_size,
|
||||
{ "Reply Buffer Size", "ncp.nds_reply_buf", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
|
||||
{ "NDS Reply Buffer Size", "ncp.nds_reply_buf", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
|
||||
|
||||
{ &hf_nds_ver,
|
||||
{ "NDS Version", "ncp.nds_ver", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
|
||||
|
|
|
@ -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.29 2002/10/10 23:06:00 guy Exp $
|
||||
* $Id: packet-ncp2222.inc,v 1.30 2002/10/10 23:32:00 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -4356,7 +4356,7 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
|
|||
if (ping_version == 9) {
|
||||
nds_string_len = tvb_get_ntohl(tvb, 9);
|
||||
nds_offset = nds_string_len+16;
|
||||
proto_tree_add_item(ncp_tree, hf_nds_string, tvb, 16, nds_string_len, FALSE);
|
||||
proto_tree_add_item(ncp_tree, hf_nds_tree_name, tvb, 16, nds_string_len, FALSE);
|
||||
proto_tree_add_item(ncp_tree, hf_nds_reply_depth, tvb, nds_offset, 4, FALSE);
|
||||
proto_tree_add_item(ncp_tree, hf_nds_reply_rev, tvb, (nds_offset+4), 4, FALSE);
|
||||
proto_tree_add_item(ncp_tree, hf_nds_reply_flags, tvb, (nds_offset+8), 4, TRUE);
|
||||
|
@ -4391,13 +4391,11 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
|
|||
nds_offset = 8;
|
||||
|
||||
nds_reply_buffer = tvb_get_letohl(tvb, nds_offset);
|
||||
proto_tree_add_uint_format(ncp_tree, hf_ncp_fragment_size, tvb, 8,
|
||||
4, nds_reply_buffer, "NDS Fragment Size %d",
|
||||
nds_reply_buffer);
|
||||
proto_tree_add_uint(ncp_tree, hf_ncp_fragment_size, tvb, 8,
|
||||
4, nds_reply_buffer);
|
||||
nds_frag = tvb_get_letohl(tvb, 12);
|
||||
proto_tree_add_uint_format(ncp_tree, hf_ncp_fragment_handle, tvb, 12,
|
||||
4, nds_frag, "NDS Fragment Handle 0x%08x",
|
||||
nds_frag);
|
||||
proto_tree_add_uint(ncp_tree, hf_ncp_fragment_handle, tvb, 12,
|
||||
4, nds_frag);
|
||||
if (nds_reply_buffer > 7)
|
||||
{
|
||||
proto_tree_add_uint_format(ncp_tree, hf_nds_reply_error, tvb, nds_offset,
|
||||
|
@ -5659,9 +5657,8 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo,
|
|||
foffset = 28;
|
||||
}
|
||||
nds_reply_buffer = tvb_get_letohl(tvb, foffset);
|
||||
proto_tree_add_uint_format(ncp_tree, hf_nds_buffer_size, tvb, foffset,
|
||||
4, nds_reply_buffer, "NDS Reply Buffer Size %d",
|
||||
nds_reply_buffer);
|
||||
proto_tree_add_uint(ncp_tree, hf_nds_buffer_size, tvb, foffset,
|
||||
4, nds_reply_buffer);
|
||||
foffset = foffset+4;
|
||||
switch(nds_verb) {
|
||||
|
||||
|
@ -7699,8 +7696,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo,
|
|||
subfunc, "SubFunction: %d (0x%02x)",
|
||||
subfunc, subfunc);
|
||||
|
||||
proto_tree_add_uint_format(ncp_tree, hf_ncp_fragment_handle, tvb, 8, 4,
|
||||
nds_frag, "Fragment Handle: (0x%08x)",
|
||||
proto_tree_add_uint(ncp_tree, hf_ncp_fragment_handle, tvb, 8, 4,
|
||||
nds_frag);
|
||||
|
||||
if (nds_frag == 0xffffffff) {
|
||||
|
@ -8305,8 +8301,7 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo,
|
|||
subfunc, "SubFunction: %d (0x%02x)",
|
||||
subfunc, subfunc);
|
||||
|
||||
proto_tree_add_uint_format(ncp_tree, hf_nds_version, tvb, 8, 4,
|
||||
nds_version, "NDS Version: (0x%x)",
|
||||
proto_tree_add_uint(ncp_tree, hf_nds_version, tvb, 8, 4,
|
||||
nds_version);
|
||||
|
||||
length_remaining = tvb_length_remaining(tvb, 8);
|
||||
|
|
Loading…
Reference in New Issue