From Ulf Lamping: extend the progress dialog box to give more progress

[obnox/wireshark/wip.git] / packet-klm.c

diff --git a/packet-klm.c b/packet-klm.c
index b08bbcb509e73a22445a5e8b78a4612b225154d6..0bc653aa69bed111ef3cf31ec982f49e477a2213 100644 (file)
--- a/packet-klm.c
+++ b/packet-klm.c
@@ -1,7 +1,7 @@
-/* packet-klm.c    2001 Ronnie Sahlberg <rsahlber@bigpond.net.au>
+/* packet-klm.c    2001 Ronnie Sahlberg <See AUTHORS for email>
  * Routines for klm dissection
  *
- * $Id: packet-klm.c,v 1.5 2001/11/27 22:37:20 guy Exp $
+ * $Id: packet-klm.c,v 1.9 2002/08/02 23:35:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -27,10 +27,6 @@
 #endif
 
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 
 #include "packet-rpc.h"
 #include "packet-nfs.h"
@@ -65,54 +61,54 @@ static const value_string names_klm_stats[] =
 };
 
 static int
-dissect_holder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
+dissect_holder(tvbuff_t *tvb, proto_tree *tree, int offset)
 {
        proto_item* lock_item = NULL;
        proto_tree* lock_tree = NULL;
 
        lock_item = proto_tree_add_item(tree, hf_klm_holder, tvb,
-                       offset, tvb_length_remaining(tvb, offset), FALSE);
+                       offset, -1, FALSE);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_klm_holder);
 
-       offset = dissect_rpc_bool( tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_bool( tvb, lock_tree, 
                        hf_klm_exclusive, offset);
 
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree, 
                        hf_klm_pid, offset);
 
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree, 
                        hf_klm_offset, offset);
 
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree, 
                        hf_klm_len, offset);
 
        return offset;
 }
        
 static int
-dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
+dissect_lock(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset)
 {
        proto_item* lock_item = NULL;
        proto_tree* lock_tree = NULL;
 
        lock_item = proto_tree_add_item(tree, hf_klm_lock, tvb,
-                       offset, tvb_length_remaining(tvb, offset), FALSE);
+                       offset, -1, FALSE);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_klm_lock);
 
-       offset = dissect_rpc_string(tvb, pinfo, lock_tree,
+       offset = dissect_rpc_string(tvb, lock_tree,
                        hf_klm_servername, offset, NULL);
 
        offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh");
 
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree, 
                        hf_klm_pid, offset);
 
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree, 
                        hf_klm_offset, offset);
 
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree, 
                        hf_klm_len, offset);
 
        return offset;
@@ -127,10 +123,10 @@ dissect_klm_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 }
 
 static int
-dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 
-       offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+       offset = dissect_rpc_uint32(tvb, tree, 
                        hf_klm_stats, offset);
 
        return offset;
@@ -139,10 +135,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, pinfo, tree, 
+       offset = dissect_rpc_bool( tvb, tree, 
                        hf_klm_block, offset);
 
-       offset = dissect_rpc_bool( tvb, pinfo, tree, 
+       offset = dissect_rpc_bool( tvb, tree, 
                        hf_klm_exclusive, offset);
 
        offset = dissect_lock(tvb, pinfo, tree, offset);
@@ -151,17 +147,17 @@ dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 }
 
 static int
-dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
        gint32  stats;
 
        stats = tvb_get_ntohl(tvb, offset);
 
-       offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+       offset = dissect_rpc_uint32(tvb, tree, 
                        hf_klm_stats, offset);
 
        if (stats == KLM_DENIED) {
-               offset = dissect_holder(tvb, pinfo, tree, offset);
+               offset = dissect_holder(tvb, tree, offset);
        }
 
        return offset;
@@ -170,7 +166,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, pinfo, tree, 
+       offset = dissect_rpc_bool( tvb, tree, 
                        hf_klm_exclusive, offset);
 
        offset = dissect_lock(tvb, pinfo, tree, offset);
@@ -258,4 +254,3 @@ proto_reg_handoff_klm(void)
        /* Register the procedure tables */
        rpc_init_proc_table(KLM_PROGRAM, 1, klm1_proc);
 }
-