/* packet-stat.c
* Routines for stat dissection
*
- * $Id: packet-stat.c,v 1.9 2001/05/30 06:01:02 guy Exp $
+ * $Id: packet-stat.c,v 1.16 2002/08/02 23:36:03 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
*
* Copied from packet-smb.c
*
- * 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au>
+ * 2001 Ronnie Sahlberg <See AUTHORS for email>
* Added the dissectors for STAT protocol
*
* This program is free software; you can redistribute it and/or
#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
#include "packet-rpc.h"
#include "packet-stat.h"
};
/* Calculate length (including padding) of my_id structure.
- * First read the lenght of the string and round it upwards to nearest
+ * First read the length of the string and round it upwards to nearest
* multiple of 4, then add 16 (4*uint32)
*/
static int
}
/* Calculate length (including padding) of my_id structure.
- * First read the lenght of the string and round it upwards to nearest
+ * First read the length of the string and round it upwards to nearest
* multiple of 4, then add 4 (string len) and size of my_id struct.
*/
static int
}
static int
-dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
if (tree)
{
- offset = dissect_rpc_string(tvb,pinfo,tree,hf_stat_mon_name,offset,NULL);
+ offset = dissect_rpc_string(tvb,tree,hf_stat_mon_name,offset,NULL);
}
return offset;
}
static int
-dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
- proto_item* lock_item = NULL;
- proto_tree* lock_tree = NULL;
+ proto_item* sub_item = NULL;
+ proto_tree* sub_tree = NULL;
gint32 res;
gint32 state;
if (tree) {
- lock_item = proto_tree_add_item(tree, hf_stat_stat_res, tvb,
- offset, tvb_length_remaining(tvb, offset), FALSE);
- if (lock_item)
- lock_tree = proto_item_add_subtree(lock_item, ett_stat_stat_res);
+ sub_item = proto_tree_add_item(tree, hf_stat_stat_res, tvb,
+ offset, -1, FALSE);
+ if (sub_item)
+ sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_res);
}
res = tvb_get_ntohl(tvb, offset);
- offset = dissect_rpc_uint32(tvb,pinfo,lock_tree,hf_stat_stat_res_res,offset);
+ offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_stat_res_res,offset);
if (res==STAT_SUCC) {
state = tvb_get_ntohl(tvb, offset);
- offset = dissect_rpc_uint32(tvb,pinfo,lock_tree,hf_stat_stat_res_state,offset);
+ offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_stat_res_state,offset);
} else {
offset += 4;
}
}
static int
-dissect_stat_my_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_my_id(tvbuff_t *tvb, int offset, proto_tree *tree)
{
- proto_item* lock_item = NULL;
- proto_tree* lock_tree = NULL;
+ proto_item* sub_item = NULL;
+ proto_tree* sub_tree = NULL;
if (tree) {
- lock_item = proto_tree_add_item(tree, hf_stat_my_id, tvb,
+ sub_item = proto_tree_add_item(tree, hf_stat_my_id, tvb,
offset, my_id_len(tvb,offset), FALSE);
- if (lock_item)
- lock_tree = proto_item_add_subtree(lock_item, ett_stat_my_id);
+ if (sub_item)
+ sub_tree = proto_item_add_subtree(sub_item, ett_stat_my_id);
}
- offset = dissect_rpc_string(tvb,pinfo,lock_tree,hf_stat_my_id_hostname,offset,NULL);
- offset = dissect_rpc_uint32(tvb,pinfo,lock_tree,hf_stat_my_id_prog,offset);
- offset = dissect_rpc_uint32(tvb,pinfo,lock_tree,hf_stat_my_id_vers,offset);
- offset = dissect_rpc_uint32(tvb,pinfo,lock_tree,hf_stat_my_id_proc,offset);
+ offset = dissect_rpc_string(tvb,sub_tree,hf_stat_my_id_hostname,offset,NULL);
+ offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_my_id_prog,offset);
+ offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_my_id_vers,offset);
+ offset = dissect_rpc_uint32(tvb,sub_tree,hf_stat_my_id_proc,offset);
return offset;
}
static int
-dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
- proto_item* lock_item = NULL;
- proto_tree* lock_tree = NULL;
+ proto_item* sub_item = NULL;
+ proto_tree* sub_tree = NULL;
if (tree) {
- lock_item = proto_tree_add_item(tree, hf_stat_mon, tvb,
+ sub_item = proto_tree_add_item(tree, hf_stat_mon, tvb,
offset, mon_id_len(tvb,offset), FALSE);
- if (lock_item)
- lock_tree = proto_item_add_subtree(lock_item, ett_stat_mon);
+ if (sub_item)
+ sub_tree = proto_item_add_subtree(sub_item, ett_stat_mon);
}
- offset = dissect_rpc_string(tvb,pinfo,lock_tree,hf_stat_mon_id_name,offset,NULL);
+ offset = dissect_rpc_string(tvb,sub_tree,hf_stat_mon_id_name,offset,NULL);
- offset = dissect_stat_my_id(tvb,offset,pinfo,lock_tree);
+ offset = dissect_stat_my_id(tvb,offset,sub_tree);
return offset;
}
static int
-dissect_stat_priv(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_priv(tvbuff_t *tvb, int offset, proto_tree *tree)
{
proto_tree_add_item(tree, hf_stat_priv, tvb, offset, 16, FALSE);
offset += 16;
offset = dissect_stat_mon_id(tvb,offset,pinfo,tree);
- offset = dissect_stat_priv(tvb,offset,pinfo,tree);
+ offset = dissect_stat_priv(tvb,offset,tree);
return offset;
}
static int
-dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
- offset = dissect_rpc_uint32(tvb,pinfo,tree,hf_stat_state,offset);
+ offset = dissect_rpc_uint32(tvb,tree,hf_stat_state,offset);
return offset;
}
static int
-dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
- proto_item* lock_item = NULL;
- proto_tree* lock_tree = NULL;
+ proto_item* sub_item = NULL;
+ proto_tree* sub_tree = NULL;
+ int start_offset = offset;
if (tree) {
- lock_item = proto_tree_add_item(tree, hf_stat_stat_chge, tvb,
- offset, tvb_length_remaining(tvb, offset)-4, FALSE);
- if (lock_item)
- lock_tree = proto_item_add_subtree(lock_item, ett_stat_stat_chge);
+ sub_item = proto_tree_add_item(tree, hf_stat_stat_chge, tvb,
+ offset, -1, FALSE);
+ if (sub_item)
+ sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_chge);
}
- offset = dissect_rpc_string(tvb,pinfo,lock_tree,hf_stat_mon_id_name,offset,NULL);
+ offset = dissect_rpc_string(tvb,sub_tree,hf_stat_mon_id_name,offset,NULL);
- offset = dissect_rpc_uint32(tvb,pinfo,tree,hf_stat_state,offset);
+ offset = dissect_rpc_uint32(tvb,tree,hf_stat_state,offset);
+
+ if(sub_item)
+ proto_item_set_len(sub_item, offset - start_offset);
return offset;
}
static int
-dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
{
- offset = dissect_stat_my_id(tvb,offset,pinfo,tree);
+ offset = dissect_stat_my_id(tvb,offset,tree);
return offset;
}
static hf_register_info hf[] = {
{ &hf_stat_mon_name, {
"Name", "stat.name", FT_STRING, BASE_DEC,
- NULL, 0, "Name" }},
+ NULL, 0, "Name", HFILL }},
{ &hf_stat_stat_res, {
"Status Result", "stat.stat_res", FT_NONE,0,
- NULL, 0, "Status Result" }},
+ NULL, 0, "Status Result", HFILL }},
{ &hf_stat_stat_res_res, {
"Result", "stat.stat_res.res", FT_UINT32, BASE_DEC,
- VALS(stat_res), 0, "Result" }},
+ VALS(stat_res), 0, "Result", HFILL }},
{ &hf_stat_stat_res_state, {
"State", "stat.stat_res.state", FT_UINT32, BASE_DEC,
- NULL, 0, "State" }},
+ NULL, 0, "State", HFILL }},
{ &hf_stat_mon, {
"Monitor", "stat.mon", FT_NONE, 0,
- NULL, 0, "Monitor Host" }},
+ NULL, 0, "Monitor Host", HFILL }},
{ &hf_stat_mon_id_name, {
"Monitor ID Name", "stat.mon_id.name", FT_STRING, BASE_DEC,
- NULL, 0, "Monitor ID Name" }},
+ NULL, 0, "Monitor ID Name", HFILL }},
{ &hf_stat_my_id, {
"My ID", "stat.my_id", FT_NONE,0,
- NULL, 0, "My_ID structure" }},
+ NULL, 0, "My_ID structure", HFILL }},
{ &hf_stat_my_id_hostname, {
"Hostname", "stat.my_id.hostname", FT_STRING, BASE_DEC,
- NULL, 0, "My_ID Host to callback" }},
+ NULL, 0, "My_ID Host to callback", HFILL }},
{ &hf_stat_my_id_prog, {
"Program", "stat.my_id.prog", FT_UINT32, BASE_DEC,
- NULL, 0, "My_ID Program to callback" }},
+ NULL, 0, "My_ID Program to callback", HFILL }},
{ &hf_stat_my_id_vers, {
"Version", "stat.my_id.vers", FT_UINT32, BASE_DEC,
- NULL, 0, "My_ID Version of callback" }},
+ NULL, 0, "My_ID Version of callback", HFILL }},
{ &hf_stat_my_id_proc, {
"Procedure", "stat.my_id.proc", FT_UINT32, BASE_DEC,
- NULL, 0, "My_ID Procedure to callback" }},
+ NULL, 0, "My_ID Procedure to callback", HFILL }},
{ &hf_stat_priv, {
"Priv", "stat.priv", FT_BYTES, BASE_HEX,
- NULL, 0, "Private client supplied opaque data" }},
+ NULL, 0, "Private client supplied opaque data", HFILL }},
{ &hf_stat_state, {
"State", "stat.state", FT_UINT32, BASE_DEC,
- NULL, 0, "State of local NSM" }},
+ NULL, 0, "State of local NSM", HFILL }},
{ &hf_stat_stat_chge, {
"Status Change", "stat.stat_chge", FT_NONE, 0,
- NULL, 0, "Status Change structure" }},
+ NULL, 0, "Status Change structure", HFILL }},
};
static gint *ett[] = {
git.samba.org / obnox / wireshark / wip.git / blobdiff