diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-05-30 06:01:02 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-05-30 06:01:02 +0000 |
commit | abd9fc125fdde3f1f49925bd3b6aa3cf2ee98307 (patch) | |
tree | 7f231a2dd06425261851ed6ebafe2f46333fc5ee /packet-klm.c | |
parent | e38a3ef330eb84cd6cd1c892f7f2413eef705b2c (diff) |
There are no more old-style (non-tvbuffified) ONC RPC dissectors, so get
rid of support for them, and remove the "_tvb" from the end of the names
of RPC type dissection routines.
Update Gerald's e-mail address.
svn path=/trunk/; revision=3477
Diffstat (limited to 'packet-klm.c')
-rw-r--r-- | packet-klm.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/packet-klm.c b/packet-klm.c index 3967940d20..0cc44596c4 100644 --- a/packet-klm.c +++ b/packet-klm.c @@ -2,7 +2,7 @@ * Routines for klm dissection * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or @@ -72,16 +72,16 @@ dissect_holder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) lock_tree = proto_item_add_subtree(lock_item, ett_klm_holder); - offset = dissect_rpc_bool_tvb( tvb, pinfo, lock_tree, + offset = dissect_rpc_bool( tvb, pinfo, lock_tree, hf_klm_exclusive, offset); - offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_klm_pid, offset); - offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_klm_offset, offset); - offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_klm_len, offset); return offset; @@ -98,18 +98,18 @@ dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) lock_tree = proto_item_add_subtree(lock_item, ett_klm_lock); - offset = dissect_rpc_string_tvb(tvb, pinfo, lock_tree, + offset = dissect_rpc_string(tvb, pinfo, lock_tree, hf_klm_servername, offset, NULL); offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh"); - offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_klm_pid, offset); - offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_klm_offset, offset); - offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, + offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_klm_len, offset); return offset; @@ -127,7 +127,7 @@ static int dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, + offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_klm_stats, offset); return offset; @@ -136,10 +136,10 @@ dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_bool_tvb( tvb, pinfo, tree, + offset = dissect_rpc_bool( tvb, pinfo, tree, hf_klm_block, offset); - offset = dissect_rpc_bool_tvb( tvb, pinfo, tree, + offset = dissect_rpc_bool( tvb, pinfo, tree, hf_klm_exclusive, offset); offset = dissect_lock(tvb, pinfo, tree, offset); @@ -154,7 +154,7 @@ dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree stats = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, + offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_klm_stats, offset); if (stats == KLM_DENIED) { @@ -167,7 +167,7 @@ dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int dissect_klm_test_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_bool_tvb( tvb, pinfo, tree, + offset = dissect_rpc_bool( tvb, pinfo, tree, hf_klm_exclusive, offset); offset = dissect_lock(tvb, pinfo, tree, offset); |