/* packet-nlm.c
* Routines for nlm dissection
*
- * $Id: packet-nlm.c,v 1.9 2000/08/14 11:36:02 girlich Exp $
+ * $Id: packet-nlm.c,v 1.21 2001/10/29 21:13:08 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Copied from packet-mount.c
*
+ * 2001-JAN Ronnie Sahlberg <rsahlber@bigpond.net.au>
+ * Updates to version 1 of the protocol.
+ * Added version 3 of the protocol.
+ * Added version 4 of the protocol.
+ *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* implementations or in the nice book:
* Brent Callaghan: "NFS Illustrated", Addison-Wesley, ISBN 0-201-32570-5
* which I use here as reference (BC).
+ *
+ * They can also be found if you go to
+ *
+ * http://www.opengroup.org/publications/catalog/c702.htm
+ *
+ * and follow the links to the HTML version of the document.
*/
static int proto_nlm = -1;
static int hf_nlm_lock_owner = -1;
static int hf_nlm_lock_svid = -1;
static int hf_nlm_lock_l_offset = -1;
+static int hf_nlm_lock_l_offset64 = -1;
static int hf_nlm_lock_l_len = -1;
+static int hf_nlm_lock_l_len64 = -1;
static int hf_nlm_reclaim = -1;
+static int hf_nlm_stat = -1;
static int hf_nlm_state = -1;
+static int hf_nlm_test_stat = -1;
+static int hf_nlm_test_stat_stat = -1;
+static int hf_nlm_holder = -1;
+static int hf_nlm_share = -1;
+static int hf_nlm_share_mode = -1;
+static int hf_nlm_share_access = -1;
+static int hf_nlm_share_name = -1;
+static int hf_nlm_sequence = -1;
static gint ett_nlm = -1;
static gint ett_nlm_lock = -1;
-const value_string names_nlm_state[] =
+const value_string names_nlm_stats[] =
{
/* NLM_GRANTED is the function number 5 and the state code 0.
* So we use for the state the postfix _S.
};
-/* generic dissecting functions */
+const value_string names_fsh_mode[] =
+{
+#define FSM_DN 0
+ { FSM_DN, "deny none" },
+#define FSM_DR 1
+ { FSM_DR, "deny read" },
+#define FSM_DW 2
+ { FSM_DW, "deny write" },
+#define FSM_DRW 3
+ { FSM_DRW, "deny read/write" },
+
+ { 0, NULL }
+};
+
+
+const value_string names_fsh_access[] =
+{
+#define FSA_NONE 0
+ { FSA_NONE, "no access" },
+#define FSA_R 1
+ { FSA_R, "read-only" },
+#define FSA_W 2
+ { FSA_W, "write-only" },
+#define FSA_RW 3
+ { FSA_RW, "read/write" },
+ { 0, NULL }
+};
+
+
+
+
+
+/* **************************** */
+/* generic dissecting functions */
+/* **************************** */
static int
-dissect_nlm_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int version, int offset)
+dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int version, int offset)
{
proto_item* lock_item = NULL;
proto_tree* lock_tree = NULL;
- const guint8 *pd;
- int compat_offset;
-
- tvb_compat(tvb, &pd, &compat_offset);
if (tree) {
lock_item = proto_tree_add_item(tree, hf_nlm_lock, tvb,
lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock);
}
- offset = dissect_rpc_string_tvb(tvb,pinfo,lock_tree,
+ offset = dissect_rpc_string(tvb,pinfo,lock_tree,
hf_nlm_lock_caller_name, offset, NULL);
- offset = dissect_nfs_fh3(pd, compat_offset+offset, pinfo->fd, lock_tree,"fh") - compat_offset;
+ offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh");
+
+ offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner, offset);
+
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_svid, offset);
+
+ if (version == 4) {
+ offset = dissect_rpc_uint64(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset64, offset);
+ offset = dissect_rpc_uint64(tvb, pinfo, lock_tree, hf_nlm_lock_l_len64, offset);
+ }
+ else {
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset, offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_l_len, offset);
+ }
+
+ return offset;
+}
+
+
+static int
+dissect_nlm_test(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree, int version)
+{
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+ dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
+ offset += 4;
+ offset = dissect_lock(tvb, pinfo, tree, version, offset);
+ return offset;
+}
+
+static int
+dissect_nlm_lock(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree,int version)
+{
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+ offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_block, offset);
+ 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);
+ return offset;
+}
+
+static int
+dissect_nlm_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree,int version)
+{
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+ offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_block, offset);
+ offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
+ offset = dissect_lock(tvb, pinfo, tree, version, offset);
+ return offset;
+}
+
+static int
+dissect_nlm_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree,int version)
+{
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+ offset = dissect_lock(tvb, pinfo, tree, version, offset);
+ return offset;
+}
- offset = dissect_rpc_data_tvb(tvb, pinfo, lock_tree, hf_nlm_lock_owner, offset);
+static int
+dissect_nlm_granted(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree,int version)
+{
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+ offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
+ offset = dissect_lock(tvb, pinfo, tree, version, offset);
+ return offset;
+}
- offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, hf_nlm_lock_svid, offset);
+
+static int
+dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree,int version)
+{
+ proto_item* lock_item = NULL;
+ proto_tree* lock_tree = NULL;
+
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+
+ if (tree) {
+ lock_item = proto_tree_add_item(tree, hf_nlm_test_stat, tvb,
+ offset,
+ tvb_length_remaining(tvb, offset),
+ FALSE);
+ if (lock_item)
+ lock_tree = proto_item_add_subtree(lock_item,
+ ett_nlm_lock);
+ }
+
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_test_stat_stat,
+ offset);
+
+ /* last structure is optional, only supplied for stat==1 (LOCKED) */
+ if(!tvb_length_remaining(tvb, offset)){
+ return offset;
+ }
+
+ if (tree) {
+ lock_item = proto_tree_add_item(lock_tree, hf_nlm_holder, tvb,
+ offset,
+ tvb_length_remaining(tvb, offset),
+ FALSE);
+ if (lock_item)
+ lock_tree = proto_item_add_subtree(lock_item,
+ ett_nlm_lock);
+ }
+
+ offset = dissect_rpc_bool(tvb, pinfo, lock_tree, hf_nlm_exclusive,
+ offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_svid,
+ offset);
+ offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner,
+ offset);
if (version == 4) {
- offset = dissect_rpc_uint64_tvb(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset, offset);
- offset = dissect_rpc_uint64_tvb(tvb, pinfo, lock_tree, hf_nlm_lock_l_len, offset);
+ offset = dissect_rpc_uint64(tvb, pinfo, lock_tree,
+ hf_nlm_lock_l_offset64, offset);
+ offset = dissect_rpc_uint64(tvb, pinfo, lock_tree,
+ hf_nlm_lock_l_len64, offset);
}
else {
- offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset, offset);
- offset = dissect_rpc_uint32_tvb(tvb, pinfo, lock_tree, hf_nlm_lock_l_len, offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
+ hf_nlm_lock_l_offset, offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
+ hf_nlm_lock_l_len, offset);
}
return offset;
}
+static int
+dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree,int version)
+{
+ proto_item* lock_item = NULL;
+ proto_tree* lock_tree = NULL;
+
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+
+ if (tree) {
+ lock_item = proto_tree_add_item(tree, hf_nlm_share, tvb,
+ offset,
+ tvb_length_remaining(tvb, offset),
+ FALSE);
+ if (lock_item)
+ lock_tree = proto_item_add_subtree(lock_item,
+ ett_nlm_lock);
+ }
+
+ offset = dissect_rpc_string(tvb,pinfo,lock_tree,
+ hf_nlm_lock_caller_name, offset, NULL);
+
+ offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree, "fh");
+
+ offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner, offset);
+
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_share_mode, offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_share_access, offset);
+
+
+ offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_reclaim, offset);
+ return offset;
+}
+
+static int
+dissect_nlm_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree, int version)
+{
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_sequence, offset);
+ return offset;
+}
+
+static int
+dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree,int version)
+{
+ offset = dissect_rpc_string(tvb,pinfo,tree,
+ hf_nlm_share_name, offset, NULL);
+
+ offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
+
+ return offset;
+}
+
+
/* RPC functions */
-#if 0
+
+/* This function is identical for all NLM protocol versions (1-4)*/
static int
-dissect_nlm1_lock_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
{
-#else
-int
-dissect_nlm1_lock_call(const u_char* pd, int offset, frame_data* fd, proto_tree* tree)
+ offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+ offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
+ return offset;
+}
+
+static int
+dissect_nlm1_test(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
{
- tvbuff_t *tvb = tvb_create_from_top(offset);
- packet_info *pinfo = π
-#endif
- int noffset;
-
- noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
- noffset = dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_nlm_block, noffset);
- noffset = dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_nlm_exclusive, noffset);
- noffset = dissect_nlm_lock(tvb, pinfo, tree, 1, noffset);
- noffset = dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_nlm_reclaim, noffset);
- noffset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, hf_nlm_state, noffset);
- return tvb_raw_offset(tvb) + noffset;
+ return dissect_nlm_test(tvb,offset,pinfo,tree,1);
+}
+
+static int
+dissect_nlm4_test(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_test(tvb,offset,pinfo,tree,4);
}
-#if 0
static int
-dissect_nlm1_unlock_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_nlm1_lock(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
{
-#else
-int
-dissect_nlm1_unlock_call(const u_char* pd, int offset, frame_data* fd, proto_tree* tree)
+ return dissect_nlm_lock(tvb,offset,pinfo,tree,1);
+}
+
+static int
+dissect_nlm4_lock(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
{
- tvbuff_t *tvb = tvb_create_from_top(offset);
- packet_info *pinfo = π
-#endif
- int noffset;
+ return dissect_nlm_lock(tvb,offset,pinfo,tree,4);
+}
+
- noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
- noffset = dissect_nlm_lock(tvb, pinfo, tree, 1, noffset);
- return tvb_raw_offset(tvb) + noffset;
+static int
+dissect_nlm1_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_cancel(tvb,offset,pinfo,tree,1);
+}
+
+static int
+dissect_nlm4_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_cancel(tvb,offset,pinfo,tree,4);
}
-#if 0
static int
-dissect_nlm1_gen_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_nlm1_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
{
-#else
-int
-dissect_nlm1_gen_reply(const u_char* pd, int offset, frame_data* fd, proto_tree* tree)
+ return dissect_nlm_unlock(tvb,offset,pinfo,tree,1);
+}
+
+static int
+dissect_nlm4_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
{
- tvbuff_t *tvb = tvb_create_from_top(offset);
- packet_info *pinfo = π
-#endif
- int noffset;
+ return dissect_nlm_unlock(tvb,offset,pinfo,tree,4);
+}
+
+
+static int
+dissect_nlm1_granted(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_granted(tvb,offset,pinfo,tree,1);
+}
+
+static int
+dissect_nlm4_granted(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_granted(tvb,offset,pinfo,tree,4);
+}
+
+
+static int
+dissect_nlm1_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_test_res(tvb,offset,pinfo,tree,1);
+}
+
+static int
+dissect_nlm4_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_test_res(tvb,offset,pinfo,tree,4);
+}
- noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
- noffset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, hf_nlm_state, noffset);
- return tvb_raw_offset(tvb) + noffset;
+static int
+dissect_nlm3_share(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_share(tvb,offset,pinfo,tree,3);
+}
+
+static int
+dissect_nlm4_share(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_share(tvb,offset,pinfo,tree,4);
}
+static int
+dissect_nlm3_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_shareres(tvb,offset,pinfo,tree,3);
+}
+
+static int
+dissect_nlm4_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_shareres(tvb,offset,pinfo,tree,4);
+}
+
+static int
+dissect_nlm3_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_freeall(tvb,offset,pinfo,tree,3);
+}
+
+static int
+dissect_nlm4_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree)
+{
+ return dissect_nlm_freeall(tvb,offset,pinfo,tree,4);
+}
+
+
+
/* proc number, "proc name", dissect_request, dissect_reply */
-/* NULL as function pointer means: take the generic one. */
+/* NULL as function pointer means: type of arguments is "void". */
/* NLM protocol version 1 */
-const vsff nlm1_proc[] = {
- { NLM_NULL, "NULL", /* OK */
- NULL, NULL },
+static const vsff nlm1_proc[] = {
+ { NLM_NULL, "NULL",
+ NULL, NULL },
{ NLM_TEST, "TEST",
- NULL, NULL },
- { NLM_LOCK, "LOCK", /* OK */
- dissect_nlm1_lock_call, dissect_nlm1_gen_reply },
+ dissect_nlm1_test, dissect_nlm1_test_res },
+ { NLM_LOCK, "LOCK",
+ dissect_nlm1_lock, dissect_nlm_gen_reply },
{ NLM_CANCEL, "CANCEL",
- NULL, dissect_nlm1_gen_reply },
- { NLM_UNLOCK, "UNLOCK", /* OK */
- dissect_nlm1_unlock_call, dissect_nlm1_gen_reply },
+ dissect_nlm1_cancel, dissect_nlm_gen_reply },
+ { NLM_UNLOCK, "UNLOCK",
+ dissect_nlm1_unlock, dissect_nlm_gen_reply },
{ NLM_GRANTED, "GRANTED",
- NULL, NULL },
+ dissect_nlm1_granted, dissect_nlm_gen_reply },
{ NLM_TEST_MSG, "TEST_MSG",
- NULL, NULL },
- { NLM_LOCK_MSG, "LOCK_MSG", /* OK */
- dissect_nlm1_lock_call, NULL },
+ dissect_nlm1_test, NULL },
+ { NLM_LOCK_MSG, "LOCK_MSG",
+ dissect_nlm1_lock, NULL },
{ NLM_CANCEL_MSG, "CANCEL_MSG",
- NULL, NULL },
- { NLM_UNLOCK_MSG, "UNLOCK_MSG", /* OK */
- dissect_nlm1_unlock_call, NULL },
+ dissect_nlm1_cancel, NULL },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG",
+ dissect_nlm1_unlock, NULL },
{ NLM_GRANTED_MSG, "GRANTED_MSG",
- NULL, dissect_nlm1_gen_reply },
+ dissect_nlm1_granted, NULL },
{ NLM_TEST_RES, "TEST_RES",
- NULL, NULL },
- { NLM_LOCK_RES, "LOCK_RES", /* OK */
- dissect_nlm1_gen_reply, NULL },
- { NLM_CANCEL_RES, "CANCEL_RES", /* OK */
- dissect_nlm1_gen_reply, NULL },
- { NLM_UNLOCK_RES, "UNLOCK_RES", /* OK */
- dissect_nlm1_gen_reply, NULL },
- { NLM_GRANTED_RES, "GRANTED_RES", /* OK */
- dissect_nlm1_gen_reply, NULL },
- { 0, NULL, NULL, NULL }
+ dissect_nlm1_test_res, NULL },
+ { NLM_LOCK_RES, "LOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_CANCEL_RES, "CANCEL_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_UNLOCK_RES, "UNLOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_GRANTED_RES, "GRANTED_RES",
+ dissect_nlm_gen_reply, NULL },
+ { 0, NULL,
+ NULL, NULL }
};
/* end of NLM protocol version 1 */
/* NLM protocol version 2 */
-const vsff nlm2_proc[] = {
- { NLM_NULL, "NULL", NULL, NULL },
- { NLM_TEST, "TEST", NULL, NULL },
- { NLM_LOCK, "LOCK", NULL, NULL },
- { NLM_CANCEL, "CANCEL", NULL, NULL },
- { NLM_UNLOCK, "UNLOCK", NULL, NULL },
- { NLM_GRANTED, "GRANTED", NULL, NULL },
- { NLM_TEST_MSG, "TEST_MSG", NULL, NULL },
- { NLM_LOCK_MSG, "LOCK_MSG", NULL, NULL },
- { NLM_CANCEL_MSG, "CANCEL_MSG", NULL, NULL },
- { NLM_UNLOCK_MSG, "UNLOCK_MSG", NULL, NULL },
- { NLM_GRANTED_MSG, "GRANTED_MSG", NULL, NULL },
- { NLM_TEST_RES, "TEST_RES", NULL, NULL },
- { NLM_LOCK_RES, "LOCK_RES", NULL, NULL },
- { NLM_CANCEL_RES, "CANCEL_RES", NULL, NULL },
- { NLM_UNLOCK_RES, "UNLOCK_RES", NULL, NULL },
- { NLM_GRANTED_RES, "GRANTED_RES", NULL, NULL },
- { 0, NULL, NULL, NULL }
+static const vsff nlm2_proc[] = {
+ { NLM_NULL, "NULL",
+ NULL, NULL },
+ { NLM_TEST, "TEST",
+ dissect_nlm1_test, dissect_nlm1_test_res },
+ { NLM_LOCK, "LOCK",
+ dissect_nlm1_lock, dissect_nlm_gen_reply },
+ { NLM_CANCEL, "CANCEL",
+ dissect_nlm1_cancel, dissect_nlm_gen_reply },
+ { NLM_UNLOCK, "UNLOCK",
+ dissect_nlm1_unlock, dissect_nlm_gen_reply },
+ { NLM_GRANTED, "GRANTED",
+ dissect_nlm1_granted, dissect_nlm_gen_reply },
+ { NLM_TEST_MSG, "TEST_MSG",
+ dissect_nlm1_test, NULL },
+ { NLM_LOCK_MSG, "LOCK_MSG",
+ dissect_nlm1_lock, NULL },
+ { NLM_CANCEL_MSG, "CANCEL_MSG",
+ dissect_nlm1_cancel, NULL },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG",
+ dissect_nlm1_unlock, NULL },
+ { NLM_GRANTED_MSG, "GRANTED_MSG",
+ dissect_nlm1_granted, NULL },
+ { NLM_TEST_RES, "TEST_RES",
+ dissect_nlm1_test_res, NULL },
+ { NLM_LOCK_RES, "LOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_CANCEL_RES, "CANCEL_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_UNLOCK_RES, "UNLOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_GRANTED_RES, "GRANTED_RES",
+ dissect_nlm_gen_reply, NULL },
+ { 0, NULL,
+ NULL, NULL }
};
/* end of NLM protocol version 2 */
/* NLM protocol version 3 */
-const vsff nlm3_proc[] = {
- { NLM_NULL, "NULL", NULL, NULL },
- { NLM_TEST, "TEST", NULL, NULL },
- { NLM_LOCK, "LOCK", NULL, NULL },
- { NLM_CANCEL, "CANCEL", NULL, NULL },
- { NLM_UNLOCK, "UNLOCK", NULL, NULL },
- { NLM_GRANTED, "GRANTED", NULL, NULL },
- { NLM_TEST_MSG, "TEST_MSG", NULL, NULL },
- { NLM_LOCK_MSG, "LOCK_MSG", NULL, NULL },
- { NLM_CANCEL_MSG, "CANCEL_MSG", NULL, NULL },
- { NLM_UNLOCK_MSG, "UNLOCK_MSG", NULL, NULL },
- { NLM_GRANTED_MSG, "GRANTED_MSG", NULL, NULL },
- { NLM_TEST_RES, "TEST_RES", NULL, NULL },
- { NLM_LOCK_RES, "LOCK_RES", NULL, NULL },
- { NLM_CANCEL_RES, "CANCEL_RES", NULL, NULL },
- { NLM_UNLOCK_RES, "UNLOCK_RES", NULL, NULL },
- { NLM_GRANTED_RES, "GRANTED_RES", NULL, NULL },
- { NLM_SHARE, "SHARE", NULL, NULL },
- { NLM_UNSHARE, "UNSHARE", NULL, NULL },
- { NLM_NM_LOCK, "NM_LOCK", NULL, NULL },
- { NLM_FREE_ALL, "FREE_ALL", NULL, NULL },
- { 0, NULL, NULL, NULL }
+static const vsff nlm3_proc[] = {
+ { NLM_NULL, "NULL",
+ NULL, NULL },
+ { NLM_TEST, "TEST",
+ dissect_nlm1_test, dissect_nlm1_test_res },
+ { NLM_LOCK, "LOCK",
+ dissect_nlm1_lock, dissect_nlm_gen_reply },
+ { NLM_CANCEL, "CANCEL",
+ dissect_nlm1_cancel, dissect_nlm_gen_reply },
+ { NLM_UNLOCK, "UNLOCK",
+ dissect_nlm1_unlock, dissect_nlm_gen_reply },
+ { NLM_GRANTED, "GRANTED",
+ dissect_nlm1_granted, dissect_nlm_gen_reply },
+ { NLM_TEST_MSG, "TEST_MSG",
+ dissect_nlm1_test, NULL },
+ { NLM_LOCK_MSG, "LOCK_MSG",
+ dissect_nlm1_lock, NULL },
+ { NLM_CANCEL_MSG, "CANCEL_MSG",
+ dissect_nlm1_cancel, NULL },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG",
+ dissect_nlm1_unlock, NULL },
+ { NLM_GRANTED_MSG, "GRANTED_MSG",
+ dissect_nlm1_granted, NULL },
+ { NLM_TEST_RES, "TEST_RES",
+ dissect_nlm1_test_res, NULL },
+ { NLM_LOCK_RES, "LOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_CANCEL_RES, "CANCEL_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_UNLOCK_RES, "UNLOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_GRANTED_RES, "GRANTED_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_SHARE, "SHARE",
+ dissect_nlm3_share, dissect_nlm3_shareres },
+ { NLM_UNSHARE, "UNSHARE",
+ dissect_nlm3_share, dissect_nlm3_shareres },
+ { NLM_NM_LOCK, "NM_LOCK",
+ dissect_nlm1_lock, dissect_nlm_gen_reply },
+ { NLM_FREE_ALL, "FREE_ALL",
+ dissect_nlm3_freeall, NULL },
+ { 0, NULL,
+ NULL, NULL }
};
/* end of NLM protocol version 3 */
-#if 0
-static int
-dissect_nlm4_test_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-#else
-int
-dissect_nlm4_test_call(const u_char* pd, int offset, frame_data* fd, proto_tree* tree)
-{
- tvbuff_t *tvb = tvb_create_from_top(offset);
- packet_info *pinfo = π
-#endif
- int noffset;
-
- noffset = dissect_rpc_data_tvb(tvb, pinfo, tree, hf_nlm_cookie, 0);
- dissect_rpc_bool_tvb(tvb, pinfo, tree, hf_nlm_exclusive, noffset);
- noffset += 4;
- noffset = dissect_nlm_lock(tvb, pinfo, tree, 4, noffset);
-
- return tvb_raw_offset(tvb) + noffset;
-}
-
-
/* NLM protocol version 4 */
-const vsff nlm4_proc[] = {
- { NLM_NULL, "NULL", NULL, NULL },
- { NLM_TEST, "TEST", dissect_nlm4_test_call, NULL },
- { NLM_LOCK, "LOCK", NULL, NULL },
- { NLM_CANCEL, "CANCEL", NULL, NULL },
- { NLM_UNLOCK, "UNLOCK", NULL, NULL },
- { NLM_GRANTED, "GRANTED", NULL, NULL },
- { NLM_TEST_MSG, "TEST_MSG", NULL, NULL },
- { NLM_LOCK_MSG, "LOCK_MSG", NULL, NULL },
- { NLM_CANCEL_MSG, "CANCEL_MSG", NULL, NULL },
- { NLM_UNLOCK_MSG, "UNLOCK_MSG", NULL, NULL },
- { NLM_GRANTED_MSG, "GRANTED_MSG", NULL, NULL },
- { NLM_TEST_RES, "TEST_RES", NULL, NULL },
- { NLM_LOCK_RES, "LOCK_RES", NULL, NULL },
- { NLM_CANCEL_RES, "CANCEL_RES", NULL, NULL },
- { NLM_UNLOCK_RES, "UNLOCK_RES", NULL, NULL },
- { NLM_GRANTED_RES, "GRANTED_RES", NULL, NULL },
- { NLM_SHARE, "SHARE", NULL, NULL },
- { NLM_UNSHARE, "UNSHARE", NULL, NULL },
- { NLM_NM_LOCK, "NM_LOCK", NULL, NULL },
- { NLM_FREE_ALL, "FREE_ALL", NULL, NULL },
- { 0, NULL, NULL, NULL }
+static const vsff nlm4_proc[] = {
+ { NLM_NULL, "NULL",
+ NULL, NULL },
+ { NLM_TEST, "TEST",
+ dissect_nlm4_test, dissect_nlm4_test_res },
+ { NLM_LOCK, "LOCK",
+ dissect_nlm4_lock, dissect_nlm_gen_reply },
+ { NLM_CANCEL, "CANCEL",
+ dissect_nlm4_cancel, dissect_nlm_gen_reply },
+ { NLM_UNLOCK, "UNLOCK",
+ dissect_nlm4_unlock, dissect_nlm_gen_reply },
+ { NLM_GRANTED, "GRANTED",
+ dissect_nlm4_granted, dissect_nlm_gen_reply },
+ { NLM_TEST_MSG, "TEST_MSG",
+ dissect_nlm4_test, NULL },
+ { NLM_LOCK_MSG, "LOCK_MSG",
+ dissect_nlm4_lock, NULL },
+ { NLM_CANCEL_MSG, "CANCEL_MSG",
+ dissect_nlm4_cancel, NULL },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG",
+ dissect_nlm4_unlock, NULL },
+ { NLM_GRANTED_MSG, "GRANTED_MSG",
+ dissect_nlm4_granted, NULL },
+ { NLM_TEST_RES, "TEST_RES",
+ dissect_nlm4_test_res, NULL },
+ { NLM_LOCK_RES, "LOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_CANCEL_RES, "CANCEL_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_UNLOCK_RES, "UNLOCK_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_GRANTED_RES, "GRANTED_RES",
+ dissect_nlm_gen_reply, NULL },
+ { NLM_SHARE, "SHARE",
+ dissect_nlm4_share, dissect_nlm4_shareres },
+ { NLM_UNSHARE, "UNSHARE",
+ dissect_nlm4_share, dissect_nlm4_shareres },
+ { NLM_NM_LOCK, "NM_LOCK",
+ dissect_nlm4_lock, dissect_nlm_gen_reply },
+ { NLM_FREE_ALL, "FREE_ALL",
+ dissect_nlm4_freeall, NULL },
+ { 0, NULL,
+ NULL, NULL }
};
/* end of NLM protocol version 4 */
{
static hf_register_info hf[] = {
{ &hf_nlm_cookie, {
- "cookie", "nlm.cookie", FT_STRING, BASE_DEC,
- NULL, 0, "cookie" }},
+ "cookie", "nlm.cookie", FT_BYTES, BASE_DEC,
+ NULL, 0, "cookie", HFILL }},
{ &hf_nlm_block, {
"block", "nlm.block", FT_BOOLEAN, BASE_NONE,
- &yesno, 0, "block" }},
+ &yesno, 0, "block", HFILL }},
{ &hf_nlm_exclusive, {
"exclusive", "nlm.exclusive", FT_BOOLEAN, BASE_NONE,
- &yesno, 0, "exclusive" }},
+ &yesno, 0, "exclusive", HFILL }},
{ &hf_nlm_lock, {
"lock", "nlm.lock", FT_NONE, 0,
- NULL, 0, "lock" }},
+ NULL, 0, "lock", HFILL }},
{ &hf_nlm_lock_caller_name, {
"caller_name", "nlm.lock.caller_name", FT_STRING, BASE_NONE,
- NULL, 0, "caller_name" }},
+ NULL, 0, "caller_name", HFILL }},
{ &hf_nlm_lock_owner, {
- "owner", "nlm.lock.owner", FT_STRING, BASE_DEC,
- NULL, 0, "owner" }},
+ "owner", "nlm.lock.owner", FT_BYTES, BASE_DEC,
+ NULL, 0, "owner", HFILL }},
{ &hf_nlm_lock_svid, {
"svid", "nlm.lock.svid", FT_UINT32, BASE_DEC,
- NULL, 0, "svid" }},
+ NULL, 0, "svid", HFILL }},
+ { &hf_nlm_lock_l_offset64, {
+ "l_offset", "nlm.lock.l_offset", FT_UINT64, BASE_DEC,
+ NULL, 0, "l_offset", HFILL }},
{ &hf_nlm_lock_l_offset, {
"l_offset", "nlm.lock.l_offset", FT_UINT32, BASE_DEC,
- NULL, 0, "l_offset" }},
+ NULL, 0, "l_offset", HFILL }},
+ { &hf_nlm_lock_l_len64, {
+ "l_len", "nlm.lock.l_len", FT_UINT64, BASE_DEC,
+ NULL, 0, "l_len", HFILL }},
{ &hf_nlm_lock_l_len, {
"l_len", "nlm.lock.l_len", FT_UINT32, BASE_DEC,
- NULL, 0, "l_len" }},
+ NULL, 0, "l_len", HFILL }},
{ &hf_nlm_reclaim, {
"reclaim", "nlm.reclaim", FT_BOOLEAN, BASE_NONE,
- &yesno, 0, "reclaim" }},
+ &yesno, 0, "reclaim", HFILL }},
{ &hf_nlm_state, {
"state", "nlm.state", FT_UINT32, BASE_DEC,
- VALS(names_nlm_state), 0, "state" }},
+ NULL, 0, "STATD state", HFILL }},
+ { &hf_nlm_stat, {
+ "stat", "nlm.stat", FT_UINT32, BASE_DEC,
+ VALS(names_nlm_stats), 0, "stat", HFILL }},
+ { &hf_nlm_test_stat, {
+ "test_stat", "nlm.test_stat", FT_NONE, 0,
+ NULL, 0, "test_stat", HFILL }},
+ { &hf_nlm_test_stat_stat, {
+ "stat", "nlm.test_stat.stat", FT_UINT32, BASE_DEC,
+ VALS(names_nlm_stats), 0, "stat", HFILL }},
+ { &hf_nlm_holder, {
+ "holder", "nlm.holder", FT_NONE, 0,
+ NULL, 0, "holder", HFILL }},
+ { &hf_nlm_share, {
+ "share", "nlm.share", FT_NONE, 0,
+ NULL, 0, "share", HFILL }},
+ { &hf_nlm_share_mode, {
+ "mode", "nlm.share.mode", FT_UINT32, BASE_DEC,
+ VALS(names_fsh_mode), 0, "mode", HFILL }},
+ { &hf_nlm_share_access, {
+ "access", "nlm.share.access", FT_UINT32, BASE_DEC,
+ VALS(names_fsh_access), 0, "access", HFILL }},
+ { &hf_nlm_share_name, {
+ "name", "nlm.share.name", FT_STRING, BASE_NONE,
+ NULL, 0, "name", HFILL }},
+ { &hf_nlm_sequence, {
+ "sequence", "nlm.sequence", FT_INT32, BASE_DEC,
+ NULL, 0, "sequence", HFILL }},
};
static gint *ett[] = {
&ett_nlm_lock,
};
- proto_nlm = proto_register_protocol("Network Lock Manager Protocol", "nlm");
+ proto_nlm = proto_register_protocol("Network Lock Manager Protocol",
+ "NLM", "nlm");
proto_register_field_array(proto_nlm, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
git.samba.org / obnox / wireshark / wip.git / blobdiff