add initial support for newer opcodes

svn path=/trunk/; revision=10855

5 files changed, 63 insertions, 6 deletions

diff --git a/packet-afs-defs.h b/packet-afs-defs.h
index 8275da12fe..69e88fcef9 100644
--- a/packet-afs-defs.h
+++ b/packet-afs-defs.h
@@ -8,7 +8,7 @@
  * Portions based on information/specs retrieved from the OpenAFS sources at
  *   www.openafs.org, Copyright IBM.
  *
- * $Id: packet-afs-defs.h,v 1.13 2003/03/05 09:52:22 sahlberg Exp $
+ * $Id: packet-afs-defs.h,v 1.14 2004/05/11 14:21:48 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -68,6 +68,11 @@ static const value_string fs_req[] = {
 	{ 162,		"dfs-flushcps" },
 	{ 163,		"dfs-symlink" },
 	{ 220,		"residency" },
+	{ 65536, 	"inline-bulk-status" },
+	{ 65537, 	"fetch-data-64" },
+	{ 65538, 	"store-data-64" },
+	{ 65539, 	"give-up-all-callbacks" },
+	{ 65540, 	"get-capabilities" },
 	{ 0,		NULL },
 };
 
@@ -87,6 +92,9 @@ static const value_string cb_req[] = {
 	{ 216,		"get-cellservdb" },
 	{ 217,		"get-local-cell" },
 	{ 218,		"get-cache-config" },
+	{ 65536,	"get-ce-64" },
+	{ 65537,	"get-cell-by-num" },
+	{ 65538,	"get-capabilities" },
 	{ 0,		NULL },
 };
 
@@ -206,6 +214,8 @@ static const value_string vol_req[] = {
 	{ 126,		"set-info" },
 	{ 127,		"x-list-partitions" },
 	{ 128,		"forward-multiple" },
+	{ 65536,	"convert-ro" },
+	{ 65537,	"getsize" },
 	{ 0,		NULL },
 };
 
@@ -530,6 +540,9 @@ static int hf_afs_fs_fid_uniqifier = -1;
 static int hf_afs_fs_offset = -1;
 static int hf_afs_fs_length = -1;
 static int hf_afs_fs_flength = -1;
+static int hf_afs_fs_offset64 = -1;
+static int hf_afs_fs_length64 = -1;
+static int hf_afs_fs_flength64 = -1;
 static int hf_afs_fs_errcode = -1;
 static int hf_afs_fs_data = -1;
 static int hf_afs_fs_name = -1;
diff --git a/packet-afs-macros.h b/packet-afs-macros.h
index 2c06a39ce1..5b66b41b10 100644
--- a/packet-afs-macros.h
+++ b/packet-afs-macros.h
@@ -8,7 +8,7 @@
  * Portions based on information/specs retrieved from the OpenAFS sources at
  *   www.openafs.org, Copyright IBM.
  *
- * $Id: packet-afs-macros.h,v 1.23 2004/01/19 18:36:32 jmayer Exp $
+ * $Id: packet-afs-macros.h,v 1.24 2004/05/11 14:21:48 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -55,6 +55,18 @@
 	offset += 4;
 
 /* Output a unsigned integer, stored into field 'field'
+   Assumes it is in network byte order, converts to host before using */
+#define OUT_UINT64(field) \
+	proto_tree_add_item(tree, field, tvb, offset, 8, FALSE); \
+	offset += 8;
+
+/* Output a unsigned integer, stored into field 'field'
+   Assumes it is in network byte order, converts to host before using */
+#define OUT_INT64(field) \
+	proto_tree_add_item(tree, field, tvb, offset, 8, FALSE); \
+	offset += 8;
+
+/* Output a unsigned integer, stored into field 'field'
    Assumes it is in network byte order, converts to host before using,
    Note - does not increment offset, so can be used repeatedly for bitfields */
 #define DISP_UINT(field) \
diff --git a/packet-afs-register-info.h b/packet-afs-register-info.h
index 1208190023..eb736117f4 100644
--- a/packet-afs-register-info.h
+++ b/packet-afs-register-info.h
@@ -8,7 +8,7 @@
  * Portions based on information/specs retrieved from the OpenAFS sources at
  *   www.openafs.org, Copyright IBM.
  *
- * $Id: packet-afs-register-info.h,v 1.19 2003/10/06 20:46:50 guy Exp $
+ * $Id: packet-afs-register-info.h,v 1.20 2004/05/11 14:21:48 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -113,6 +113,13 @@
 	FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
 { &hf_afs_fs_flength, { "FLength", "afs.fs.flength",
 	FT_UINT32, BASE_DEC, 0, 0, "FLength", HFILL }},
+{ &hf_afs_fs_offset64, { "Offset64", "afs.fs.offset64",
+	FT_UINT64, BASE_DEC,
+	0, 0, "Offset64", HFILL }},
+{ &hf_afs_fs_length64, { "Length64", "afs.fs.length64",
+	FT_UINT64, BASE_DEC, 0, 0, "Length64", HFILL }},
+{ &hf_afs_fs_flength64, { "FLength64", "afs.fs.flength64",
+	FT_UINT64, BASE_DEC, 0, 0, "FLength64", HFILL }},
 { &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode",
 	FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
 { &hf_afs_fs_data, { "Data", "afs.fs.data",
diff --git a/packet-afs.c b/packet-afs.c
index 6a4ea04040..1f2c114435 100644
--- a/packet-afs.c
+++ b/packet-afs.c
@@ -8,7 +8,7 @@
  * Portions based on information/specs retrieved from the OpenAFS sources at
  *   www.openafs.org, Copyright IBM.
  *
- * $Id: packet-afs.c,v 1.56 2004/01/19 18:36:32 jmayer Exp $
+ * $Id: packet-afs.c,v 1.57 2004/05/11 14:21:48 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -799,6 +799,31 @@ dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int o
 			OUT_RXString(hf_afs_fs_symlink_content);
 			OUT_FS_AFSStoreStatus("Symlink Status");
 			break;
+		case 220: /* residencycmd */
+			OUT_FS_AFSFid("Target");
+			/* need residency inputs here */
+			break;
+		case 65536: /* inline bulk status */
+			OUT_FS_AFSCBFids();
+			break;
+		case 65537: /* fetch-data-64 */
+			OUT_FS_AFSFid("Target");
+			OUT_INT64(hf_afs_fs_offset64);
+			OUT_INT64(hf_afs_fs_length64);
+			/* need more here */
+			break;
+		case 65538: /* store-data-64 */
+			OUT_FS_AFSFid("Target");
+			OUT_FS_AFSStoreStatus("Status");
+			OUT_INT64(hf_afs_fs_offset64);
+			OUT_INT64(hf_afs_fs_length64);
+			OUT_INT64(hf_afs_fs_flength64);
+			/* need residency inputs here */
+			break;
+		case 65539: /* give up all cbs */
+			break;
+		case 65540: /* get capabilities */
+			break;
 	}
 }
 
diff --git a/packet-afs.h b/packet-afs.h
index ac73739f1b..4ea7f73543 100644
--- a/packet-afs.h
+++ b/packet-afs.h
@@ -1,7 +1,7 @@
 /* packet-afs.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet-afs.h,v 1.7 2001/05/27 05:00:17 guy Exp $
+ * $Id: packet-afs.h,v 1.8 2004/05/11 14:21:48 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -64,7 +64,7 @@
 #define CB_TYPE_DROPPED 3
 
 #define OPCODE_LOW 		0
-#define OPCODE_HIGH     550 /* arbitrary, is just a fuzzy check for encrypted traffic */
+#define OPCODE_HIGH     66000 /* arbitrary, is just a fuzzy check for encrypted traffic */
 #define VOTE_LOW        10000
 #define VOTE_HIGH       10007
 #define DISK_LOW        20000