diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-09-13 08:02:11 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-09-13 08:02:11 +0000 |
commit | aa12c7a1065177ab75cc9b4aa024f82b352a463c (patch) | |
tree | b2a45ee8ca5f0074eccf30fa152e40480c3d07b0 | |
parent | 69a21c7be66ce61e93c74bae4e76feb8fa819029 (diff) |
NLM fix, and change of status monitor callback protocol name to use "_"
rather than "-" ("-" upsets the display filter parser), from Ronnie
Sahlberg.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3924 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | packet-nlm.c | 8 | ||||
-rw-r--r-- | packet-stat-notify.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/packet-nlm.c b/packet-nlm.c index 7232bf1866..0ff4e09afe 100644 --- a/packet-nlm.c +++ b/packet-nlm.c @@ -1,7 +1,7 @@ /* packet-nlm.c * Routines for nlm dissection * - * $Id: packet-nlm.c,v 1.18 2001/06/18 02:17:50 guy Exp $ + * $Id: packet-nlm.c,v 1.19 2001/09/13 08:02:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -71,6 +71,7 @@ static int hf_nlm_lock_l_offset = -1; static int hf_nlm_lock_l_len = -1; static int hf_nlm_reclaim = -1; static int hf_nlm_state = -1; +static int hf_nlm_stat = -1; static int hf_nlm_test_stat = -1; static int hf_nlm_test_stat_stat = -1; static int hf_nlm_holder = -1; @@ -203,7 +204,7 @@ dissect_nlm_lock(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset); offset = dissect_lock(tvb, pinfo, tree, version, offset); offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_reclaim, offset); - offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_state, offset); + offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset); return offset; } @@ -716,6 +717,9 @@ proto_register_nlm(void) { &hf_nlm_reclaim, { "reclaim", "nlm.reclaim", FT_BOOLEAN, BASE_NONE, &yesno, 0, "reclaim", HFILL }}, + { &hf_nlm_stat, { + "stat", "nlm.stat", FT_UINT32, BASE_DEC, + NULL, 0, "STATD state", HFILL }}, { &hf_nlm_state, { "state", "nlm.state", FT_UINT32, BASE_DEC, VALS(names_nlm_state), 0, "state", HFILL }}, diff --git a/packet-stat-notify.c b/packet-stat-notify.c index c68a333349..962fecb616 100644 --- a/packet-stat-notify.c +++ b/packet-stat-notify.c @@ -2,7 +2,7 @@ * Routines for async NSM stat callback dissection * 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au> * - * $Id: packet-stat-notify.c,v 1.5 2001/06/18 02:17:53 guy Exp $ + * $Id: packet-stat-notify.c,v 1.6 2001/09/13 08:02:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -88,7 +88,7 @@ proto_register_statnotify(void) &ett_statnotify, }; - proto_statnotify = proto_register_protocol("Network Status Monitor CallBack Protocol", "STAT-CB", "stat-cb"); + proto_statnotify = proto_register_protocol("Network Status Monitor CallBack Protocol", "STAT_CB", "stat_cb"); proto_register_field_array(proto_statnotify, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } |