aboutsummaryrefslogtreecommitdiffstats
path: root/packet-afs.c
diff options
context:
space:
mode:
authorNathan Neulinger <nneul@umr.edu>2000-11-03 17:32:51 +0000
committerNathan Neulinger <nneul@umr.edu>2000-11-03 17:32:51 +0000
commit83547932cfac54f6cae96e6868c6f3a3d191ee5f (patch)
tree24e43e32c02dc09dab0e15d686594140921bc466 /packet-afs.c
parente636484bf2f95a7518150d4edaa6850031c4bf2c (diff)
Split into a separate files. Started adding a bunch more decoding of
structures. Renamed decoding macros to get them more consistent and in line with AFS data types wherever possible. svn path=/trunk/; revision=2553
Diffstat (limited to 'packet-afs.c')
-rw-r--r--packet-afs.c1600
1 files changed, 240 insertions, 1360 deletions
diff --git a/packet-afs.c b/packet-afs.c
index 4902f45ba0..d681cd7345 100644
--- a/packet-afs.c
+++ b/packet-afs.c
@@ -5,8 +5,10 @@
* Ken Hornstein <kenh@cmf.nrl.navy.mil>
* Portions based on information retrieved from the RX definitions
* in Arla, the free AFS client at http://www.stacken.kth.se/project/arla/
+ * Portions based on information/specs retrieved from the OpenAFS sources at
+ * www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs.c,v 1.18 2000/11/02 18:45:15 nneul Exp $
+ * $Id: packet-afs.c,v 1.19 2000/11/03 17:32:51 nneul Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -47,453 +49,13 @@
#include <glib.h>
#include "packet.h"
#include "conversation.h"
-#include "packet-rx.h"
-#include "packet-afs.h"
#include "resolv.h"
-static const value_string fs_req[] = {
- { 130, "fetch-data" },
- { 131, "fetch-acl" },
- { 132, "fetch-status" },
- { 133, "store-data" },
- { 134, "store-acl" },
- { 135, "store-status" },
- { 136, "remove-file" },
- { 137, "create-file" },
- { 138, "rename" },
- { 139, "symlink" },
- { 140, "link" },
- { 141, "makedir" },
- { 142, "rmdir" },
- { 143, "old-set-lock" },
- { 144, "old-extend-lock" },
- { 145, "old-release-lock" },
- { 146, "get-stats" },
- { 147, "give-up-callbacks" },
- { 148, "get-volume-info" },
- { 149, "get-volume-status" },
- { 150, "set-volume-status" },
- { 151, "get-root-volume" },
- { 152, "check-token" },
- { 153, "get-time" },
- { 154, "nget-volume-info" },
- { 155, "bulk-status" },
- { 156, "set-lock" },
- { 157, "extend-lock" },
- { 158, "release-lock" },
- { 159, "xstats-version" },
- { 160, "get-xstats" },
- { 161, "dfs-lookup" },
- { 162, "dfs-flushcps" },
- { 163, "dfs-symlink" },
- { 0, NULL },
-};
-
-static const value_string cb_req[] = {
- { 204, "callback" },
- { 205, "init-callback-state" },
- { 206, "probe" },
- { 207, "get-lock" },
- { 208, "get-ce" },
- { 209, "xstats-version" },
- { 210, "get-xstats" },
- { 211, "init-callback-state2" },
- { 212, "who-are-you" },
- { 213, "init-callback-state3" },
- { 214, "probeuuid" },
- { 215, "get-server-prefs" },
- { 216, "get-cellservdb" },
- { 217, "get-local-cell" },
- { 218, "get-cache-config" },
- { 0, NULL },
-};
-
-static const value_string prot_req[] = {
- { 500, "new-user" },
- { 501, "where-is-it" },
- { 502, "dump-entry" },
- { 503, "add-to-group" },
- { 504, "name-to-id" },
- { 505, "id-to-name" },
- { 506, "delete" },
- { 507, "remove-from-group" },
- { 508, "get-cps" },
- { 509, "new-entry" },
- { 510, "list-max" },
- { 511, "set-max" },
- { 512, "list-entry" },
- { 513, "change-entry" },
- { 514, "list-elements" },
- { 515, "is-member-of" },
- { 516, "set-fld-sentry" },
- { 517, "list-owned" },
- { 518, "get-cps2" },
- { 519, "get-host-cps" },
- { 520, "update-entry" },
- { 521, "list-entries" },
- { 0, NULL },
-};
-
-static const value_string vldb_req[] = {
- { 501, "create-entry" },
- { 502, "delete-entry" },
- { 503, "get-entry-by-id" },
- { 504, "get-entry-by-name" },
- { 505, "get-new-volume-id" },
- { 506, "replace-entry" },
- { 507, "update-entry" },
- { 508, "set-lock" },
- { 509, "release-lock" },
- { 510, "list-entry" },
- { 511, "list-attributes" },
- { 512, "linked-list" },
- { 513, "get-stats" },
- { 514, "probe" },
- { 515, "get-addrs" },
- { 516, "change-addr" },
- { 517, "create-entry-n" },
- { 518, "get-entry-by-id-n" },
- { 519, "get-entry-by-name-n" },
- { 520, "replace-entry-n" },
- { 521, "list-entry-n" },
- { 522, "list-attrib-n" },
- { 523, "linked-list-n" },
- { 524, "update-entry-by-name" },
- { 525, "create-entry-u" },
- { 526, "get-entry-by-id-u" },
- { 527, "get-entry-by-name-u" },
- { 528, "replace-entry-u" },
- { 529, "list-entry-u" },
- { 530, "list-attrib-u" },
- { 531, "linked-list-u" },
- { 532, "regaddr" },
- { 533, "get-addrs-u" },
- { 534, "list-attrib-n2" },
- { 0, NULL },
-};
-
-static const value_string kauth_req[] = {
- { 1, "auth-old" },
- { 21, "authenticate" },
- { 22, "authenticate-v2" },
- { 2, "change-pw" },
- { 3, "get-ticket-old" },
- { 23, "get-ticket" },
- { 4, "set-pw" },
- { 5, "set-fields" },
- { 6, "create-user" },
- { 7, "delete-user" },
- { 8, "get-entry" },
- { 9, "list-entry" },
- { 10, "get-stats" },
- { 11, "debug" },
- { 12, "get-pw" },
- { 13, "get-random-key" },
- { 14, "unlock" },
- { 15, "lock-status" },
- { 0, NULL },
-};
-
-static const value_string vol_req[] = {
- { 100, "create-volume" },
- { 101, "delete-volume" },
- { 102, "restore" },
- { 103, "forward" },
- { 104, "end-trans" },
- { 105, "clone" },
- { 106, "set-flags" },
- { 107, "get-flags" },
- { 108, "trans-create" },
- { 109, "dump" },
- { 110, "get-nth-volume" },
- { 111, "set-forwarding" },
- { 112, "get-name" },
- { 113, "get-status" },
- { 114, "sig-restore" },
- { 115, "list-partitions" },
- { 116, "list-volumes" },
- { 117, "set-id-types" },
- { 118, "monitor" },
- { 119, "partition-info" },
- { 120, "reclone" },
- { 121, "list-one-volume" },
- { 122, "nuke" },
- { 123, "set-date" },
- { 124, "x-list-volumes" },
- { 125, "x-list-one-volume" },
- { 126, "set-info" },
- { 127, "x-list-partitions" },
- { 128, "forward-multiple" },
- { 0, NULL },
-};
-
-static const value_string bos_req[] = {
- { 80, "create-bnode" },
- { 81, "delete-bnode" },
- { 82, "set-status" },
- { 83, "get-status" },
- { 84, "enumerate-instance" },
- { 85, "get-instance-info" },
- { 86, "get-instance-parm" },
- { 87, "add-superuser" },
- { 88, "delete-superuser" },
- { 89, "list-superusers" },
- { 90, "list-keys" },
- { 91, "add-key" },
- { 92, "delete-key" },
- { 93, "set-cell-name" },
- { 94, "get-cell-name" },
- { 95, "get-cell-host" },
- { 96, "add-cell-host" },
- { 97, "delete-cell-host" },
- { 98, "set-t-status" },
- { 99, "shutdown-all" },
- { 100, "restart-all" },
- { 101, "startup-all" },
- { 102, "set-noauth-flag" },
- { 103, "re-bozo" },
- { 104, "restart" },
- { 105, "install" },
- { 106, "uninstall" },
- { 107, "get-dates" },
- { 108, "exec" },
- { 109, "prune" },
- { 110, "set-restart-time" },
- { 111, "get-restart-time" },
- { 112, "get-log" },
- { 113, "wait-all" },
- { 114, "get-instance-strings" },
- { 0, NULL },
-};
-
-static const value_string update_req[] = {
- { 1, "fetch-file" },
- { 2, "fetch-info" },
- { 0, NULL },
-};
-
-static const value_string rmtsys_req[] = {
- { 1, "setpag" },
- { 2, "pioctl" },
- { 0, NULL },
-};
-
-static const value_string backup_req[] = {
- { 100, "perform-dump" },
- { 101, "perform-restore" },
- { 102, "check-dump" },
- { 103, "abort-dump" },
- { 104, "wait-for-dump" },
- { 105, "end-dump" },
- { 106, "get-tm-info" },
- { 107, "label-tape" },
- { 108, "scan-nodes" },
- { 109, "read-label" },
- { 110, "scan-dumps" },
- { 111, "get-tc-info" },
- { 112, "save-database" },
- { 113, "restore-database" },
- { 114, "get-status" },
- { 115, "request-abort" },
- { 116, "end-status" },
- { 117, "scan-status" },
- { 118, "delete-dump" },
- { 0, NULL },
-};
-
-static const value_string ubik_req[] = {
- { 10000, "vote-beacon" },
- { 10001, "vote-debug-old" },
- { 10002, "vote-sdebug-old" },
- { 10003, "vote-getsyncsite" },
- { 10004, "vote-debug" },
- { 10005, "vote-sdebug" },
- { 20000, "disk-begin" },
- { 20001, "disk-commit" },
- { 20002, "disk-lock" },
- { 20003, "disk-write" },
- { 20004, "disk-getversion" },
- { 20005, "disk-getfile" },
- { 20006, "disk-sendfile" },
- { 20007, "disk-abort" },
- { 20008, "disk-releaselocks" },
- { 20009, "disk-truncate" },
- { 20010, "disk-probe" },
- { 20011, "disk-writev" },
- { 20012, "disk-interfaceaddr" },
- { 20013, "disk-setversion" },
- { 0, NULL },
-};
-
-static const value_string cb_types[] = {
- { CB_TYPE_EXCLUSIVE, "exclusive" },
- { CB_TYPE_SHARED, "shared" },
- { CB_TYPE_DROPPED, "dropped" },
- { 0, NULL },
-};
-
-static const value_string afs_errors[] = {
- /* VOL Errors */
- { 363520, "ID Exists"},
- { 363521, "IO Error"},
- { 363522, "Name Exists"},
- { 363523, "Create Failed"},
- { 363524, "Entry Not Found"},
- { 363525, "Empty"},
- { 363526, "Entry Deleted"},
- { 363527, "Bad Name"},
- { 363528, "Bad Index"},
- { 363529, "Bad Volume Type"},
- { 363530, "Bad Partition"},
- { 363531, "Bad Server"},
- { 363532, "Bad Replicate Server"},
- { 363533, "No Replicate Server"},
- { 363534, "Duplicate Replicate Server"},
- { 363535, "ReadWrite Volume Not Found"},
- { 363536, "Bad Reference Count"},
- { 363537, "Size Exceeded"},
- { 363538, "Bad Entry"},
- { 363539, "Bad Volume ID Bump"},
- { 363540, "Already has edit"},
- { 363541, "Entry Locked"},
- { 363542, "Bad Volume Operation"},
- { 363543, "Bad Rel Lock Type"},
- { 363544, "Rerelease"},
- { 363545, "Bad Server"},
- { 363546, "Permission Denied"},
- { 363547, "Out of Memory"},
-
- /* KAUTH Errors */
- { 180480, "Database Inconsistent"},
- { 180481, "Exists"},
- { 180482, "IO"},
- { 180483, "Create Failed"},
- { 180484, "noent"},
- { 180485, "Empty"},
- { 180486, "Bad Name"},
- { 180487, "Bad Index"},
- { 180488, "No auth"},
- { 180489, "Answer too long"},
- { 180490, "Bad Request"},
- { 180491, "Old Interface"},
- { 180492, "Bad Argument"},
- { 180493, "Bad Command"},
- { 180494, "No keys"},
- { 180495, "Read PW"},
- { 180496, "Bad key"},
- { 180497, "Ubik Init"},
- { 180498, "Ubik Call"},
- { 180499, "Bad Protocol"},
- { 180500, "No cells"},
- { 180501, "No cell"},
- { 180502, "Too many ubiks"},
- { 180503, "Too many keys"},
- { 180504, "Bad ticket"},
- { 180505, "Unknown Key"},
- { 180506, "Key Cache Invalid"},
- { 180507, "Bad Server"},
- { 180508, "Bad User"},
- { 180509, "Bad CPW"},
- { 180510, "Bad Create"},
- { 180511, "No ticket"},
- { 180512, "Assoc user"},
- { 180513, "Not special"},
- { 180514, "Clock skew too great"},
- { 180515, "No recursion"},
- { 180516, "RX failed"},
- { 180517, "Null password"},
- { 180518, "Internal error"},
- { 180519, "Password expired"},
- { 180520, "Reused"},
- { 180521, "Too soon"},
- { 180522, "Locked"},
-
- /* PT Errors */
- { 267264, "Exists"},
- { 267265, "ID Exists"},
- { 267266, "No IDs"},
- { 267267, "DB Failed"},
- { 267268, "No such entry"},
- { 267269, "Permission denied"},
- { 267270, "Not group"},
- { 267271, "Not user"},
- { 267272, "Bad name"},
- { 267273, "Bad argument"},
- { 267274, "No more"},
- { 267275, "Bad DB"},
- { 267276, "Group empty"},
- { 267277, "Inconsistent"},
- { 267278, "DB Address"},
- { 267279, "Too many"},
- { 267280, "No memory"},
-
- /* Volume server errors */
- { 1492325120, "Release error"},
- { 1492325121, "No op"},
- { 1492325122, "Read dump error"},
- { 1492325123, "Dump error"},
- { 1492325124, "Attach error"},
- { 1492325125, "Illegal partition"},
- { 1492325126, "Detach error"},
- { 1492325127, "Bad access"},
- { 1492325128, "VLDB error"},
- { 1492325129, "Bad Name"},
- { 1492325130, "Volume moved"},
- { 1492325131, "Bad operation"},
- { 1492325132, "Bad release"},
- { 1492325133, "Volume busy"},
- { 1492325134, "No memory"},
- { 1492325135, "No volume"},
- { 1492325136, "Multiple RW volumes"},
- { 1492325137, "Failed operation"},
-
- /* add more of these errors to decode the errcode responses */
- { 0, NULL },
-};
-
-static const value_string port_types[] = {
- { AFS_PORT_FS, "File Server" },
- { AFS_PORT_CB, "Callback Server" },
- { AFS_PORT_BOS, "BOS Server" },
- { AFS_PORT_PROT, "Protection Server" },
- { AFS_PORT_VLDB, "Volume Location Database Server" },
- { AFS_PORT_KAUTH, "Kerberos Authentication Server" },
- { AFS_PORT_ERROR, "Error Server" },
- { AFS_PORT_VOL, "Volume Server" },
- { AFS_PORT_RMTSYS, "Rmtsys? Server" },
- { AFS_PORT_UPDATE, "Update? Server" },
- { AFS_PORT_BACKUP, "Backup Server" },
- { 0, NULL }
-};
-
-static const value_string port_types_short[] = {
- { AFS_PORT_FS, "FS" },
- { AFS_PORT_CB, "CB" },
- { AFS_PORT_BOS, "BOS" },
- { AFS_PORT_PROT, "PROT" },
- { AFS_PORT_VLDB, "VLDB" },
- { AFS_PORT_KAUTH, "KAUTH" },
- { AFS_PORT_ERROR, "ERR" },
- { AFS_PORT_VOL, "VOL" },
- { AFS_PORT_RMTSYS, "RMT" },
- { AFS_PORT_UPDATE, "UPD" },
- { AFS_PORT_BACKUP, "BKUP" },
- { 0, NULL }
-};
-
-static const value_string ubik_lock_types[] = {
- { 1, "read" },
- { 2, "write" },
- { 3, "wait" },
- { 0, NULL },
-};
+#include "packet-rx.h"
+#include "packet-afs.h"
+#include "packet-afs-defs.h"
+#include "packet-afs-macros.h"
-static const value_string volume_types[] = {
- { 0, "read-write" },
- { 1, "read-only" },
- { 2, "backup" },
- { 0, NULL },
-};
int afs_packet_init_count = 100;
@@ -510,147 +72,7 @@ GHashTable *afs_request_hash = NULL;
GMemChunk *afs_request_keys = NULL;
GMemChunk *afs_request_vals = NULL;
-static int proto_afs = -1;
-static int hf_afs_fs = -1;
-static int hf_afs_cb = -1;
-static int hf_afs_prot = -1;
-static int hf_afs_vldb = -1;
-static int hf_afs_kauth = -1;
-static int hf_afs_vol = -1;
-static int hf_afs_error = -1;
-static int hf_afs_bos = -1;
-static int hf_afs_update = -1;
-static int hf_afs_rmtsys = -1;
-static int hf_afs_ubik = -1;
-static int hf_afs_backup = -1;
-
-static int hf_afs_fs_opcode = -1;
-static int hf_afs_cb_opcode = -1;
-static int hf_afs_prot_opcode = -1;
-static int hf_afs_vldb_opcode = -1;
-static int hf_afs_kauth_opcode = -1;
-static int hf_afs_vol_opcode = -1;
-static int hf_afs_error_opcode = -1;
-static int hf_afs_bos_opcode = -1;
-static int hf_afs_update_opcode = -1;
-static int hf_afs_rmtsys_opcode = -1;
-static int hf_afs_ubik_opcode = -1;
-static int hf_afs_backup_opcode = -1;
-
-static int hf_afs_fs_fid_volume = -1;
-static int hf_afs_fs_fid_vnode = -1;
-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_errcode = -1;
-static int hf_afs_fs_data = -1;
-static int hf_afs_fs_name = -1;
-static int hf_afs_fs_oldname = -1;
-static int hf_afs_fs_newname = -1;
-static int hf_afs_fs_symlink_name = -1;
-static int hf_afs_fs_symlink_content = -1;
-static int hf_afs_fs_volid = -1;
-static int hf_afs_fs_volname = -1;
-static int hf_afs_fs_timestamp = -1;
-
-static int hf_afs_fs_acl_datasize = -1;
-static int hf_afs_fs_acl_count_negative = -1;
-static int hf_afs_fs_acl_count_positive = -1;
-static int hf_afs_fs_acl_entity = -1;
-static int hf_afs_fs_acl_r = -1;
-static int hf_afs_fs_acl_l = -1;
-static int hf_afs_fs_acl_i = -1;
-static int hf_afs_fs_acl_d = -1;
-static int hf_afs_fs_acl_w = -1;
-static int hf_afs_fs_acl_k = -1;
-static int hf_afs_fs_acl_a = -1;
-
-static int hf_afs_fs_callback_version = -1;
-static int hf_afs_fs_callback_expires = -1;
-static int hf_afs_fs_callback_type = -1;
-
-static int hf_afs_bos_errcode = -1;
-static int hf_afs_bos_type = -1;
-static int hf_afs_bos_instance = -1;
-static int hf_afs_bos_status = -1;
-static int hf_afs_bos_num = -1;
-static int hf_afs_bos_size = -1;
-static int hf_afs_bos_flags = -1;
-static int hf_afs_bos_date = -1;
-static int hf_afs_bos_content = -1;
-
-static int hf_afs_vldb_errcode = -1;
-static int hf_afs_vldb_name = -1;
-static int hf_afs_vldb_id = -1;
-static int hf_afs_vldb_type = -1;
-static int hf_afs_vldb_bump = -1;
-static int hf_afs_vldb_index = -1;
-static int hf_afs_vldb_nextindex = -1;
-static int hf_afs_vldb_count = -1;
-static int hf_afs_vldb_numservers = -1;
-static int hf_afs_vldb_server = -1;
-static int hf_afs_vldb_serveruuid = -1;
-static int hf_afs_vldb_partition = -1;
-static int hf_afs_vldb_rovol = -1;
-static int hf_afs_vldb_rwvol = -1;
-static int hf_afs_vldb_bkvol = -1;
-
-static int hf_afs_kauth_errcode = -1;
-static int hf_afs_kauth_princ = -1;
-static int hf_afs_kauth_realm = -1;
-static int hf_afs_kauth_domain = -1;
-static int hf_afs_kauth_kvno = -1;
-static int hf_afs_kauth_name = -1;
-static int hf_afs_kauth_data = -1;
-
-static int hf_afs_vol_errcode = -1;
-static int hf_afs_vol_count = -1;
-static int hf_afs_vol_id = -1;
-static int hf_afs_vol_name = -1;
-
-static int hf_afs_cb_errcode = -1;
-static int hf_afs_cb_callback_version = -1;
-static int hf_afs_cb_callback_type = -1;
-static int hf_afs_cb_callback_expires = -1;
-static int hf_afs_cb_fid_volume = -1;
-static int hf_afs_cb_fid_vnode = -1;
-static int hf_afs_cb_fid_uniqifier = -1;
-
-static int hf_afs_prot_errcode = -1;
-static int hf_afs_prot_name = -1;
-static int hf_afs_prot_id = -1;
-static int hf_afs_prot_count = -1;
-static int hf_afs_prot_oldid = -1;
-static int hf_afs_prot_newid = -1;
-static int hf_afs_prot_pos = -1;
-static int hf_afs_prot_flag = -1;
-static int hf_afs_prot_uid = -1;
-static int hf_afs_prot_gid = -1;
-static int hf_afs_prot_maxuid = -1;
-static int hf_afs_prot_maxgid = -1;
-
-static int hf_afs_backup_errcode = -1;
-
-static int hf_afs_ubik_errcode = -1;
-static int hf_afs_ubik_version_epoch = -1;
-static int hf_afs_ubik_version_counter = -1;
-static int hf_afs_ubik_votestart = -1;
-static int hf_afs_ubik_syncsite = -1;
-static int hf_afs_ubik_site = -1;
-static int hf_afs_ubik_file = -1;
-static int hf_afs_ubik_pos = -1;
-static int hf_afs_ubik_length = -1;
-static int hf_afs_ubik_locktype = -1;
-static int hf_afs_ubik_voteend = -1;
-static int hf_afs_ubik_votetype = -1;
-
-static gint ett_afs = -1;
-static gint ett_afs_op = -1;
-static gint ett_afs_acl = -1;
-static gint ett_afs_fid = -1;
-static gint ett_afs_callback = -1;
-static gint ett_afs_ubikver = -1;
+
/*
* Dissector prototypes
@@ -997,213 +419,6 @@ dissect_afs(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
}
}
-/*
- * Macros for helper dissection routines
- *
- * The macros are here to save on coding. They assume that
- * the current offset is in 'curoffset', and that the offset
- * should be incremented after performing the macro's operation.
- */
-
-/* Get the next available integer, be sure and call TRUNC beforehand */
-#define GETINT() (pntohl(&pd[curoffset]))
-
-/* Check if enough bytes are present, if not, return to caller
- after adding a 'Truncated' message to tree */
-#define TRUNC(bytes) \
- if(!BYTES_ARE_IN_FRAME(curoffset,(bytes))) \
- { proto_tree_add_text(tree, NullTVB,curoffset,END_OF_FRAME,"Truncated"); \
- return; }
-
-/* Output a unsigned integer, stored into field 'field'
- Assumes it is in network byte order, converts to host before using */
-#define UINTOUT(field) \
- TRUNC(sizeof(guint32)) \
- proto_tree_add_uint(tree,field, NullTVB,curoffset,sizeof(guint32), GETINT()); \
- curoffset += 4;
-
-/* Output an IPv4 address, stored into field 'field' */
-#define IPOUT(field) \
- TRUNC(sizeof(gint32)) \
- proto_tree_add_ipv4(tree,field, NullTVB,curoffset,sizeof(gint32),\
- *((int*)&pd[curoffset]));\
- curoffset += 4;
-
-/* Output a UNIX seconds/microseconds timestamp, after converting to a timeval */
-#define BIGDATEOUT(field) \
- { struct timeval tv; \
- TRUNC(2*sizeof(guint32)); \
- tv.tv_sec = GETINT(); \
- tv.tv_usec = GETINT(); \
- proto_tree_add_time(tree,field, NullTVB,curoffset,2*sizeof(guint32),&tv); \
- curoffset += 8; \
- }
-
-/* Output a UNIX seconds-only timestamp, after converting to a timeval */
-#define DATEOUT(field) \
- { struct timeval tv; \
- TRUNC(sizeof(guint32)); \
- tv.tv_sec = GETINT(); \
- tv.tv_usec = 0; \
- proto_tree_add_time(tree,field, NullTVB,curoffset,sizeof(guint32),&tv); \
- curoffset += 4; \
- }
-
-/* Output a callback */
-#define FS_CALLBACKOUT() \
- { proto_tree *save, *ti; \
- ti = proto_tree_add_text(tree, NullTVB, curoffset, 3*4, "Callback"); \
- save = tree; \
- tree = proto_item_add_subtree(ti, ett_afs_callback); \
- TRUNC(3*sizeof(guint32)); \
- UINTOUT(hf_afs_fs_callback_version); \
- BIGDATEOUT(hf_afs_fs_callback_expires); \
- UINTOUT(hf_afs_fs_callback_type); \
- tree = save; \
- }
-
-/* Output a callback */
-#define CB_CALLBACKOUT() \
- { proto_tree *save, *ti; \
- ti = proto_tree_add_text(tree, NullTVB, curoffset, 3*4, "Callback"); \
- save = tree; \
- tree = proto_item_add_subtree(ti, ett_afs_callback); \
- TRUNC(3*sizeof(guint32)); \
- UINTOUT(hf_afs_cb_callback_version); \
- DATEOUT(hf_afs_cb_callback_expires); \
- UINTOUT(hf_afs_cb_callback_type); \
- tree = save; \
- }
-
-
-/* Output a File ID */
-#define FS_FIDOUT(label) \
- { proto_tree *save, *ti; \
- ti = proto_tree_add_text(tree, NullTVB, curoffset, 3*4, \
- "FileID (%s)", label); \
- save = tree; \
- tree = proto_item_add_subtree(ti, ett_afs_fid); \
- UINTOUT(hf_afs_fs_fid_volume); \
- UINTOUT(hf_afs_fs_fid_vnode); \
- UINTOUT(hf_afs_fs_fid_uniqifier); \
- tree = save; \
- }
-
-/* Output a File ID */
-#define CB_FIDOUT(label) \
- { proto_tree *save, *ti; \
- ti = proto_tree_add_text(tree, NullTVB, curoffset, 3*4, \
- "FileID (%s)", label); \
- save = tree; \
- tree = proto_item_add_subtree(ti, ett_afs_fid); \
- UINTOUT(hf_afs_cb_fid_volume); \
- UINTOUT(hf_afs_cb_fid_vnode); \
- UINTOUT(hf_afs_cb_fid_uniqifier); \
- tree = save; \
- }
-
-/* Output a AFS acl */
-#define ACLOUT(who, positive, acl, bytes) \
- { proto_tree *save, *ti; \
- int tmpoffset; \
- int acllen; \
- char tmp[10]; \
- tmp[0] = 0; \
- if ( acl & PRSFS_READ ) strcat(tmp, "r"); \
- if ( acl & PRSFS_LOOKUP ) strcat(tmp, "l"); \
- if ( acl & PRSFS_INSERT ) strcat(tmp, "i"); \
- if ( acl & PRSFS_DELETE ) strcat(tmp, "d"); \
- if ( acl & PRSFS_WRITE ) strcat(tmp, "w"); \
- if ( acl & PRSFS_LOCK ) strcat(tmp, "k"); \
- if ( acl & PRSFS_ADMINISTER ) strcat(tmp, "a"); \
- ti = proto_tree_add_text(tree, NullTVB, curoffset, bytes, \
- "ACL: %s %s%s", \
- who, tmp, positive ? "" : " (negative)"); \
- save = tree; \
- tree = proto_item_add_subtree(ti, ett_afs_acl); \
- proto_tree_add_string(tree,hf_afs_fs_acl_entity, NullTVB,curoffset,strlen(who), who);\
- tmpoffset = curoffset + strlen(who) + 1; \
- acllen = bytes - strlen(who) - 1; \
- proto_tree_add_uint(tree,hf_afs_fs_acl_r, NullTVB,tmpoffset,acllen,acl);\
- proto_tree_add_uint(tree,hf_afs_fs_acl_l, NullTVB,tmpoffset,acllen,acl);\
- proto_tree_add_uint(tree,hf_afs_fs_acl_i, NullTVB,tmpoffset,acllen,acl);\
- proto_tree_add_uint(tree,hf_afs_fs_acl_d, NullTVB,tmpoffset,acllen,acl);\
- proto_tree_add_uint(tree,hf_afs_fs_acl_w, NullTVB,tmpoffset,acllen,acl);\
- proto_tree_add_uint(tree,hf_afs_fs_acl_k, NullTVB,tmpoffset,acllen,acl);\
- proto_tree_add_uint(tree,hf_afs_fs_acl_a, NullTVB,tmpoffset,acllen,acl);\
- tree = save; \
- }
-
-/* Skip a certain number of bytes */
-#define SKIP(bytes) \
- TRUNC(bytes) \
- curoffset += bytes;
-
-/* Raw data - to end of frame */
-#define RAWOUT(field) BYTESOUT(field, offset+END_OF_FRAME-curoffset)
-
-/* Raw data */
-#define BYTESOUT(field, bytes) \
- TRUNC(bytes); \
- proto_tree_add_bytes(tree,field, NullTVB,curoffset,bytes,\
- (void *)&pd[curoffset]); \
- curoffset += bytes;
-
-/* Output a rx style string, up to a maximum length first
- 4 bytes - length, then char data */
-#define STROUT(field) \
- { int i; \
- TRUNC(4); \
- i = pntohl(&pd[curoffset]); \
- curoffset += 4; \
- TRUNC(i); \
- if ( i > 0 ) { \
- proto_tree_add_string(tree, field, NullTVB, curoffset-4, i+4, \
- (void *)&pd[curoffset]); \
- } else { \
- proto_tree_add_string(tree, field, NullTVB, curoffset-4, 4, \
- ""); \
- } \
- curoffset += i; \
- }
-
-/* Output a fixed length vectorized string (each char is a 32 bit int) */
-#define VECOUT(field, length) \
- { char tmp[length+1]; \
- int i,soff; \
- soff = curoffset;\
- TRUNC(length * sizeof(guint32));\
- for (i=0; i<length; i++)\
- {\
- tmp[i] = (char) GETINT();\
- curoffset += sizeof(guint32);\
- }\
- tmp[length] = '\0';\
- proto_tree_add_string(tree, field, NullTVB, soff, length, tmp);\
- }
-
-/* Output a UBIK version code */
-#define UBIK_VERSIONOUT(label) \
- { proto_tree *save, *ti; \
- unsigned int epoch,counter; \
- struct timeval tv; \
- TRUNC(8); \
- epoch = GETINT(); \
- curoffset += 4; \
- counter = GETINT(); \
- curoffset += 4; \
- tv.tv_sec = epoch; \
- tv.tv_usec = 0; \
- ti = proto_tree_add_text(tree, NullTVB, curoffset, 3*4, \
- "UBIK Version (%s): %u.%u", label, epoch, counter ); \
- save = tree; \
- tree = proto_item_add_subtree(ti, ett_afs_ubikver); \
- proto_tree_add_time(tree,hf_afs_ubik_version_epoch, NullTVB,curoffset-8, \
- sizeof(guint32),&tv); \
- proto_tree_add_uint(tree,hf_afs_ubik_version_counter, NullTVB,curoffset-4, \
- sizeof(guint32),counter); \
- tree = save; \
- }
/*
* Here is a helper routine for adding an AFS acl to the proto tree
@@ -1235,7 +450,7 @@ static void dissect_acl(const u_char *pd, int offset, frame_data *fd, proto_tree
TRUNC(sizeof(guint32));
bytes = pntohl(&pd[curoffset]);
- UINTOUT(hf_afs_fs_acl_datasize);
+ OUT_UINT(hf_afs_fs_acl_datasize);
TRUNC(bytes);
@@ -1305,28 +520,42 @@ dissect_fs_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
switch ( opcode )
{
case 130: /* fetch data */
- RAWOUT(hf_afs_fs_data);
+ OUT_FS_AFSFetchStatus("Status");
+ OUT_FS_AFSCallBack();
+ OUT_FS_AFSVolSync();
+ OUT_BYTES_ALL(hf_afs_fs_data);
break;
case 131: /* fetch acl */
dissect_acl(pd,curoffset,fd,tree);
+ OUT_FS_AFSFetchStatus("Status");
+ OUT_FS_AFSVolSync();
+ break;
+ case 132: /* Fetch status */
+ OUT_FS_AFSFetchStatus("Status");
+ OUT_FS_AFSCallBack();
+ OUT_FS_AFSVolSync();
+ /* left off here */
+ case 135: /* Store status */
+ OUT_FS_AFSFetchStatus("Status");
+ OUT_FS_AFSVolSync();
break;
case 137: /* create file */
- FS_FIDOUT("New File");
+ OUT_FS_AFSFid("New File");
break;
case 141: /* make dir */
- FS_FIDOUT("New Directory");
+ OUT_FS_AFSFid("New Directory");
break;
case 151: /* root volume */
- STROUT(hf_afs_fs_volname);
+ OUT_STRING(hf_afs_fs_volname);
break;
case 153: /* get time */
- BIGDATEOUT(hf_afs_fs_timestamp);
+ OUT_TIMESTAMP(hf_afs_fs_timestamp);
break;
}
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_fs_errcode);
+ OUT_UINT(hf_afs_fs_errcode);
}
}
@@ -1342,71 +571,102 @@ dissect_fs_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
case 130: /* Fetch data */
- FS_FIDOUT("Source");
- UINTOUT(hf_afs_fs_offset);
- UINTOUT(hf_afs_fs_length);
+ OUT_FS_AFSFid("Source");
+ OUT_UINT(hf_afs_fs_offset);
+ OUT_UINT(hf_afs_fs_length);
break;
case 131: /* Fetch ACL */
+ OUT_FS_AFSFid("Target");
+ break;
case 132: /* Fetch Status */
- case 135: /* Store Status */
- case 143: /* Old Set Lock */
- case 144: /* Old Extend Lock */
- case 145: /* Old Release Lock */
- case 156: /* Set Lock */
- case 157: /* Extend Lock */
- case 158: /* Release Lock */
- FS_FIDOUT("Target");
+ OUT_FS_AFSFid("Target");
break;
case 133: /* Store Data */
- FS_FIDOUT("Destination");
- SKIP(6*sizeof(guint32));
- UINTOUT(hf_afs_fs_offset);
- UINTOUT(hf_afs_fs_length);
- UINTOUT(hf_afs_fs_flength);
+ OUT_FS_AFSFid("Destination");
+ OUT_FS_AFSStoreStatus("Status");
+ OUT_UINT(hf_afs_fs_offset);
+ OUT_UINT(hf_afs_fs_length);
+ OUT_UINT(hf_afs_fs_flength);
break;
case 134: /* Store ACL */
- FS_FIDOUT("Target");
+ OUT_FS_AFSFid("Target");
dissect_acl(pd,curoffset,fd,tree);
- /* print acl */
+ break;
+ case 135: /* Store Status */
+ OUT_FS_AFSFid("Target");
+ OUT_FS_AFSStoreStatus("Status");
break;
case 136: /* Remove File */
+ OUT_FS_AFSFid("Remove File");
+ OUT_STRING(hf_afs_fs_name);
+ break;
case 137: /* Create File */
- case 141: /* Make dir */
- case 142: /* Remove dir */
- FS_FIDOUT("Target");
- STROUT(hf_afs_fs_name);
+ OUT_FS_AFSFid("Target");
+ OUT_STRING(hf_afs_fs_name);
+ OUT_FS_AFSStoreStatus("Status");
break;
case 138: /* Rename file */
- FS_FIDOUT("Old");
- STROUT(hf_afs_fs_oldname);
- FS_FIDOUT("New");
- STROUT(hf_afs_fs_newname);
+ OUT_FS_AFSFid("Old");
+ OUT_STRING(hf_afs_fs_oldname);
+ OUT_FS_AFSFid("New");
+ OUT_STRING(hf_afs_fs_newname);
break;
case 139: /* Symlink */
- FS_FIDOUT("File");
- STROUT(hf_afs_fs_symlink_name);
- STROUT(hf_afs_fs_symlink_content);
+ OUT_FS_AFSFid("File");
+ OUT_STRING(hf_afs_fs_symlink_name);
+ OUT_STRING(hf_afs_fs_symlink_content);
+ OUT_FS_AFSStoreStatus("Status");
break;
case 140: /* Link */
- FS_FIDOUT("Link From (Old File)");
- STROUT(hf_afs_fs_name);
- FS_FIDOUT("Link To (New File)");
+ OUT_FS_AFSFid("Link From (Old File)");
+ OUT_STRING(hf_afs_fs_name);
+ OUT_FS_AFSFid("Link To (New File)");
+ break;
+ case 141: /* Make dir */
+ OUT_FS_AFSFid("Target");
+ OUT_STRING(hf_afs_fs_name);
+ OUT_FS_AFSStoreStatus("Status");
+ break;
+ case 142: /* Remove dir */
+ OUT_FS_AFSFid("Target");
+ OUT_STRING(hf_afs_fs_name);
+ break;
+ case 143: /* Old Set Lock */
+ OUT_FS_AFSFid("Target");
+ OUT_FS_ViceLockType();
+ OUT_FS_AFSVolSync();
+ break;
+ case 144: /* Old Extend Lock */
+ OUT_FS_AFSFid("Target");
+ OUT_FS_AFSVolSync();
+ break;
+ case 145: /* Old Release Lock */
+ OUT_FS_AFSFid("Target");
+ OUT_FS_AFSVolSync();
+ break;
+ case 146: /* Get statistics */
+ /* no params */
+ break;
+ case 147: /* Give up callbacks */
+ OUT_FS_AFSCBFids();
+ OUT_FS_AFSCBs();
break;
case 148: /* Get vol info */
- STROUT(hf_afs_fs_volname);
+ OUT_STRING(hf_afs_fs_volname);
break;
case 149: /* Get vol stats */
+ OUT_UINT(hf_afs_fs_volid);
+ break;
case 150: /* Set vol stats */
- UINTOUT(hf_afs_fs_volid);
+ OUT_UINT(hf_afs_fs_volid);
break;
case 154: /* new get vol info */
- STROUT(hf_afs_fs_volname);
+ OUT_STRING(hf_afs_fs_volname);
break;
case 155: /* bulk stat */
{
@@ -1417,10 +677,19 @@ dissect_fs_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
curoffset += 1;
for (i=0; i<j; i++)
{
- FS_FIDOUT("Target");
+ OUT_FS_AFSFid("Target");
}
break;
}
+ case 156: /* Set Lock */
+ OUT_FS_AFSFid("Target");
+ break;
+ case 157: /* Extend Lock */
+ OUT_FS_AFSFid("Target");
+ break;
+ case 158: /* Release Lock */
+ OUT_FS_AFSFid("Target");
+ break;
}
}
@@ -1444,13 +713,13 @@ dissect_bos_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tree
switch ( opcode )
{
case 85: /* get instance info */
- STROUT(hf_afs_bos_type);
+ OUT_STRING(hf_afs_bos_type);
break;
}
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_bos_errcode);
+ OUT_UINT(hf_afs_bos_errcode);
}
}
@@ -1466,14 +735,13 @@ dissect_bos_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
-
+ SKIP_OPCODE();
+
switch ( opcode )
{
case 80: /* create b node */
- STROUT(hf_afs_bos_type);
- STROUT(hf_afs_bos_instance);
+ OUT_STRING(hf_afs_bos_type);
+ OUT_STRING(hf_afs_bos_instance);
break;
case 81: /* delete b node */
case 83: /* get status */
@@ -1488,16 +756,16 @@ dissect_bos_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
case 108: /* exec */
case 112: /* get log */
case 114: /* get instance strings */
- STROUT(hf_afs_bos_content);
+ OUT_STRING(hf_afs_bos_content);
break;
case 82: /* set status */
case 98: /* set t status */
- STROUT(hf_afs_bos_content);
- UINTOUT(hf_afs_bos_status);
+ OUT_STRING(hf_afs_bos_content);
+ OUT_UINT(hf_afs_bos_status);
break;
case 86: /* get instance parm */
- STROUT(hf_afs_bos_instance);
- UINTOUT(hf_afs_bos_num);
+ OUT_STRING(hf_afs_bos_instance);
+ OUT_UINT(hf_afs_bos_num);
break;
case 84: /* enumerate instance */
case 89: /* list super users */
@@ -1505,13 +773,13 @@ dissect_bos_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
case 91: /* add key */
case 92: /* delete key */
case 95: /* set cell host */
- UINTOUT(hf_afs_bos_num);
+ OUT_UINT(hf_afs_bos_num);
break;
case 105: /* install */
- STROUT(hf_afs_bos_content);
- UINTOUT(hf_afs_bos_size);
- UINTOUT(hf_afs_bos_flags);
- UINTOUT(hf_afs_bos_date);
+ OUT_STRING(hf_afs_bos_content);
+ OUT_UINT(hf_afs_bos_size);
+ OUT_UINT(hf_afs_bos_flags);
+ OUT_UINT(hf_afs_bos_date);
break;
}
}
@@ -1537,14 +805,14 @@ dissect_vol_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tree
{
case 121:
/* should loop here maybe */
- UINTOUT(hf_afs_vol_count);
+ OUT_UINT(hf_afs_vol_count);
VECOUT(hf_afs_vol_name, 32); /* not sure on */
break;
}
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_vol_errcode);
+ OUT_UINT(hf_afs_vol_errcode);
}
}
@@ -1560,14 +828,13 @@ dissect_vol_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
case 121: /* list one vol */
- UINTOUT(hf_afs_vol_count);
- UINTOUT(hf_afs_vol_id);
+ OUT_UINT(hf_afs_vol_count);
+ OUT_UINT(hf_afs_vol_id);
break;
}
}
@@ -1595,7 +862,7 @@ dissect_kauth_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_kauth_errcode);
+ OUT_UINT(hf_afs_kauth_errcode);
}
}
@@ -1611,8 +878,7 @@ dissect_kauth_request(const u_char *pd, int offset, frame_data *fd, proto_tree *
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
@@ -1626,25 +892,25 @@ dissect_kauth_request(const u_char *pd, int offset, frame_data *fd, proto_tree *
case 8: /* get entry */
case 14: /* unlock */
case 15: /* lock status */
- STROUT(hf_afs_kauth_princ);
- STROUT(hf_afs_kauth_realm);
- RAWOUT(hf_afs_kauth_data);
+ OUT_STRING(hf_afs_kauth_princ);
+ OUT_STRING(hf_afs_kauth_realm);
+ OUT_BYTES_ALL(hf_afs_kauth_data);
break;
case 3: /* getticket-old */
case 23: /* getticket */
- UINTOUT(hf_afs_kauth_kvno);
- STROUT(hf_afs_kauth_domain);
- STROUT(hf_afs_kauth_data);
- STROUT(hf_afs_kauth_princ);
- STROUT(hf_afs_kauth_realm);
+ OUT_UINT(hf_afs_kauth_kvno);
+ OUT_STRING(hf_afs_kauth_domain);
+ OUT_STRING(hf_afs_kauth_data);
+ OUT_STRING(hf_afs_kauth_princ);
+ OUT_STRING(hf_afs_kauth_realm);
break;
case 4: /* set pass */
- STROUT(hf_afs_kauth_princ);
- STROUT(hf_afs_kauth_realm);
- UINTOUT(hf_afs_kauth_kvno);
+ OUT_STRING(hf_afs_kauth_princ);
+ OUT_STRING(hf_afs_kauth_realm);
+ OUT_UINT(hf_afs_kauth_kvno);
break;
case 12: /* get pass */
- STROUT(hf_afs_kauth_name);
+ OUT_STRING(hf_afs_kauth_name);
break;
}
}
@@ -1672,7 +938,7 @@ dissect_cb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_cb_errcode);
+ OUT_UINT(hf_afs_cb_errcode);
}
}
@@ -1688,8 +954,7 @@ dissect_cb_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
@@ -1702,7 +967,7 @@ dissect_cb_request(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
for (i=0; i<j; i++)
{
- CB_FIDOUT("Target");
+ OUT_CB_AFSFid("Target");
}
TRUNC(4);
@@ -1740,11 +1005,11 @@ dissect_prot_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
TRUNC(4);
j = GETINT();
- UINTOUT(hf_afs_prot_count);
+ OUT_UINT(hf_afs_prot_count);
for (i=0; i<j; i++)
{
- UINTOUT(hf_afs_prot_id);
+ OUT_UINT(hf_afs_prot_id);
}
}
break;
@@ -1754,7 +1019,7 @@ dissect_prot_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
TRUNC(4);
j = GETINT();
- UINTOUT(hf_afs_prot_count);
+ OUT_UINT(hf_afs_prot_count);
for (i=0; i<j; i++)
{
@@ -1772,23 +1037,23 @@ dissect_prot_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
TRUNC(4);
j = GETINT();
- UINTOUT(hf_afs_prot_count);
+ OUT_UINT(hf_afs_prot_count);
for (i=0; i<j; i++)
{
- UINTOUT(hf_afs_prot_id);
+ OUT_UINT(hf_afs_prot_id);
}
}
break;
case 510: /* list max */
- UINTOUT(hf_afs_prot_maxuid);
- UINTOUT(hf_afs_prot_maxgid);
+ OUT_UINT(hf_afs_prot_maxuid);
+ OUT_UINT(hf_afs_prot_maxgid);
break;
}
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_prot_errcode);
+ OUT_UINT(hf_afs_prot_errcode);
}
}
@@ -1804,15 +1069,14 @@ dissect_prot_request(const u_char *pd, int offset, frame_data *fd, proto_tree *t
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
case 500: /* new user */
- STROUT(hf_afs_prot_name);
- UINTOUT(hf_afs_prot_id);
- UINTOUT(hf_afs_prot_oldid);
+ OUT_STRING(hf_afs_prot_name);
+ OUT_UINT(hf_afs_prot_id);
+ OUT_UINT(hf_afs_prot_oldid);
break;
case 501: /* where is it */
case 506: /* delete */
@@ -1821,16 +1085,16 @@ dissect_prot_request(const u_char *pd, int offset, frame_data *fd, proto_tree *t
case 514: /* list elements */
case 517: /* list owned */
case 519: /* get host cps */
- UINTOUT(hf_afs_prot_id);
+ OUT_UINT(hf_afs_prot_id);
break;
case 502: /* dump entry */
- UINTOUT(hf_afs_prot_pos);
+ OUT_UINT(hf_afs_prot_pos);
break;
case 503: /* add to group */
case 507: /* remove from group */
case 515: /* is a member of? */
- UINTOUT(hf_afs_prot_uid);
- UINTOUT(hf_afs_prot_gid);
+ OUT_UINT(hf_afs_prot_uid);
+ OUT_UINT(hf_afs_prot_gid);
break;
case 504: /* name to id */
{
@@ -1838,7 +1102,7 @@ dissect_prot_request(const u_char *pd, int offset, frame_data *fd, proto_tree *t
TRUNC(4);
j = GETINT();
- UINTOUT(hf_afs_prot_count);
+ OUT_UINT(hf_afs_prot_count);
for (i=0; i<j; i++)
{
@@ -1852,32 +1116,32 @@ dissect_prot_request(const u_char *pd, int offset, frame_data *fd, proto_tree *t
TRUNC(4);
j = GETINT();
- UINTOUT(hf_afs_prot_count);
+ OUT_UINT(hf_afs_prot_count);
for (i=0; i<j; i++)
{
- UINTOUT(hf_afs_prot_id);
+ OUT_UINT(hf_afs_prot_id);
}
}
break;
case 509: /* new entry */
- STROUT(hf_afs_prot_name);
- UINTOUT(hf_afs_prot_flag);
- UINTOUT(hf_afs_prot_oldid);
+ OUT_STRING(hf_afs_prot_name);
+ OUT_UINT(hf_afs_prot_flag);
+ OUT_UINT(hf_afs_prot_oldid);
break;
case 511: /* set max */
- UINTOUT(hf_afs_prot_id);
- UINTOUT(hf_afs_prot_flag);
+ OUT_UINT(hf_afs_prot_id);
+ OUT_UINT(hf_afs_prot_flag);
break;
case 513: /* change entry */
- UINTOUT(hf_afs_prot_id);
- STROUT(hf_afs_prot_name);
- UINTOUT(hf_afs_prot_oldid);
- UINTOUT(hf_afs_prot_newid);
+ OUT_UINT(hf_afs_prot_id);
+ OUT_STRING(hf_afs_prot_name);
+ OUT_UINT(hf_afs_prot_oldid);
+ OUT_UINT(hf_afs_prot_newid);
break;
case 520: /* update entry */
- UINTOUT(hf_afs_prot_id);
- STROUT(hf_afs_prot_name);
+ OUT_UINT(hf_afs_prot_id);
+ OUT_STRING(hf_afs_prot_name);
break;
}
}
@@ -1902,8 +1166,8 @@ dissect_vldb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
switch ( opcode )
{
case 510: /* list entry */
- UINTOUT(hf_afs_vldb_count);
- UINTOUT(hf_afs_vldb_nextindex);
+ OUT_UINT(hf_afs_vldb_count);
+ OUT_UINT(hf_afs_vldb_nextindex);
break;
case 503: /* get entry by id */
case 504: /* get entry by name */
@@ -1912,12 +1176,12 @@ dissect_vldb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
VECOUT(hf_afs_vldb_name, VLNAMEMAX);
TRUNC(4);
nservers = GETINT();
- UINTOUT(hf_afs_vldb_numservers);
+ OUT_UINT(hf_afs_vldb_numservers);
for (i=0; i<8; i++)
{
if ( i<nservers )
{
- IPOUT(hf_afs_vldb_server);
+ OUT_IP(hf_afs_vldb_server);
}
else
{
@@ -1939,18 +1203,18 @@ dissect_vldb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
SKIP(4);
}
SKIP(8 * sizeof(guint32));
- UINTOUT(hf_afs_vldb_rwvol);
- UINTOUT(hf_afs_vldb_rovol);
- UINTOUT(hf_afs_vldb_bkvol);
+ OUT_UINT(hf_afs_vldb_rwvol);
+ OUT_UINT(hf_afs_vldb_rovol);
+ OUT_UINT(hf_afs_vldb_bkvol);
}
break;
case 505: /* get new volume id */
- UINTOUT(hf_afs_vldb_id);
+ OUT_UINT(hf_afs_vldb_id);
break;
case 521: /* list entry */
case 529: /* list entry U */
- UINTOUT(hf_afs_vldb_count);
- UINTOUT(hf_afs_vldb_nextindex);
+ OUT_UINT(hf_afs_vldb_count);
+ OUT_UINT(hf_afs_vldb_nextindex);
break;
case 518: /* get entry by id n */
case 519: /* get entry by name N */
@@ -1959,12 +1223,12 @@ dissect_vldb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
VECOUT(hf_afs_vldb_name, VLNAMEMAX);
TRUNC(4);
nservers = GETINT();
- UINTOUT(hf_afs_vldb_numservers);
+ OUT_UINT(hf_afs_vldb_numservers);
for (i=0; i<13; i++)
{
if ( i<nservers )
{
- IPOUT(hf_afs_vldb_server);
+ OUT_IP(hf_afs_vldb_server);
}
else
{
@@ -1986,9 +1250,9 @@ dissect_vldb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
SKIP(4);
}
SKIP(13 * sizeof(guint32));
- UINTOUT(hf_afs_vldb_rwvol);
- UINTOUT(hf_afs_vldb_rovol);
- UINTOUT(hf_afs_vldb_bkvol);
+ OUT_UINT(hf_afs_vldb_rwvol);
+ OUT_UINT(hf_afs_vldb_rovol);
+ OUT_UINT(hf_afs_vldb_bkvol);
}
break;
case 526: /* get entry by id u */
@@ -1998,12 +1262,12 @@ dissect_vldb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
VECOUT(hf_afs_vldb_name, VLNAMEMAX);
TRUNC(4);
nservers = GETINT();
- UINTOUT(hf_afs_vldb_numservers);
+ OUT_UINT(hf_afs_vldb_numservers);
for (i=0; i<13; i++)
{
if ( i<nservers )
{
- BYTESOUT(hf_afs_vldb_serveruuid, 11*sizeof(guint32));
+ OUT_BYTES(hf_afs_vldb_serveruuid, 11*sizeof(guint32));
}
else
{
@@ -2025,16 +1289,16 @@ dissect_vldb_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
SKIP(4);
}
SKIP(13 * sizeof(guint32));
- UINTOUT(hf_afs_vldb_rwvol);
- UINTOUT(hf_afs_vldb_rovol);
- UINTOUT(hf_afs_vldb_bkvol);
+ OUT_UINT(hf_afs_vldb_rwvol);
+ OUT_UINT(hf_afs_vldb_rovol);
+ OUT_UINT(hf_afs_vldb_bkvol);
}
break;
}
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_vldb_errcode);
+ OUT_UINT(hf_afs_vldb_errcode);
}
}
@@ -2050,8 +1314,7 @@ dissect_vldb_request(const u_char *pd, int offset, frame_data *fd, proto_tree *t
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
@@ -2065,27 +1328,27 @@ dissect_vldb_request(const u_char *pd, int offset, frame_data *fd, proto_tree *t
case 508: /* set lock */
case 509: /* release lock */
case 518: /* get entry by id */
- UINTOUT(hf_afs_vldb_id);
- UINTOUT(hf_afs_vldb_type);
+ OUT_UINT(hf_afs_vldb_id);
+ OUT_UINT(hf_afs_vldb_type);
break;
case 504: /* get entry by name */
case 519: /* get entry by name N */
case 524: /* update entry by name */
case 527: /* get entry by name U */
- STROUT(hf_afs_vldb_name);
+ OUT_STRING(hf_afs_vldb_name);
break;
case 505: /* get new vol id */
- UINTOUT(hf_afs_vldb_bump);
+ OUT_UINT(hf_afs_vldb_bump);
break;
case 506: /* replace entry */
case 520: /* replace entry N */
- UINTOUT(hf_afs_vldb_id);
- UINTOUT(hf_afs_vldb_type);
+ OUT_UINT(hf_afs_vldb_id);
+ OUT_UINT(hf_afs_vldb_type);
VECOUT(hf_afs_vldb_name, VLNAMEMAX);
break;
case 510: /* list entry */
case 521: /* list entry N */
- UINTOUT(hf_afs_vldb_index);
+ OUT_UINT(hf_afs_vldb_index);
break;
}
}
@@ -2113,7 +1376,7 @@ dissect_ubik_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
proto_tree_add_boolean(tree,hf_afs_ubik_votetype, NullTVB,0,0,0);
break;
case 20004: /* get version */
- UBIK_VERSIONOUT("DB Version");
+ OUT_UBIKVERSION("DB Version");
break;
}
}
@@ -2123,10 +1386,10 @@ dissect_ubik_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
{
case 10000:
proto_tree_add_boolean(tree,hf_afs_ubik_votetype, NullTVB,0,0,1);
- DATEOUT(hf_afs_ubik_voteend);
+ OUT_DATE(hf_afs_ubik_voteend);
break;
default:
- UINTOUT(hf_afs_ubik_errcode);
+ OUT_UINT(hf_afs_ubik_errcode);
break;
}
}
@@ -2144,56 +1407,55 @@ dissect_ubik_request(const u_char *pd, int offset, frame_data *fd, proto_tree *t
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
case 10000: /* beacon */
- UINTOUT(hf_afs_ubik_syncsite);
- DATEOUT(hf_afs_ubik_votestart);
- UBIK_VERSIONOUT("DB Version");
- UBIK_VERSIONOUT("TID");
+ OUT_UINT(hf_afs_ubik_syncsite);
+ OUT_DATE(hf_afs_ubik_votestart);
+ OUT_UBIKVERSION("DB Version");
+ OUT_UBIKVERSION("TID");
break;
case 10003: /* get sync site */
- IPOUT(hf_afs_ubik_site);
+ OUT_IP(hf_afs_ubik_site);
break;
case 20000: /* begin */
case 20001: /* commit */
case 20007: /* abort */
case 20008: /* release locks */
case 20010: /* writev */
- UBIK_VERSIONOUT("TID");
+ OUT_UBIKVERSION("TID");
break;
case 20002: /* lock */
- UBIK_VERSIONOUT("TID");
- UINTOUT(hf_afs_ubik_file);
- UINTOUT(hf_afs_ubik_pos);
- UINTOUT(hf_afs_ubik_length);
- UINTOUT(hf_afs_ubik_locktype);
+ OUT_UBIKVERSION("TID");
+ OUT_UINT(hf_afs_ubik_file);
+ OUT_UINT(hf_afs_ubik_pos);
+ OUT_UINT(hf_afs_ubik_length);
+ OUT_UINT(hf_afs_ubik_locktype);
break;
case 20003: /* write */
- UBIK_VERSIONOUT("TID");
- UINTOUT(hf_afs_ubik_file);
- UINTOUT(hf_afs_ubik_pos);
+ OUT_UBIKVERSION("TID");
+ OUT_UINT(hf_afs_ubik_file);
+ OUT_UINT(hf_afs_ubik_pos);
break;
case 20005: /* get file */
- UINTOUT(hf_afs_ubik_file);
+ OUT_UINT(hf_afs_ubik_file);
break;
case 20006: /* send file */
- UINTOUT(hf_afs_ubik_file);
- UINTOUT(hf_afs_ubik_length);
- UBIK_VERSIONOUT("DB Version");
+ OUT_UINT(hf_afs_ubik_file);
+ OUT_UINT(hf_afs_ubik_length);
+ OUT_UBIKVERSION("DB Version");
break;
case 20009: /* truncate */
- UBIK_VERSIONOUT("TID");
- UINTOUT(hf_afs_ubik_file);
- UINTOUT(hf_afs_ubik_length);
+ OUT_UBIKVERSION("TID");
+ OUT_UINT(hf_afs_ubik_file);
+ OUT_UINT(hf_afs_ubik_length);
break;
case 20012: /* set version */
- UBIK_VERSIONOUT("TID");
- UBIK_VERSIONOUT("Old DB Version");
- UBIK_VERSIONOUT("New DB Version");
+ OUT_UBIKVERSION("TID");
+ OUT_UBIKVERSION("Old DB Version");
+ OUT_UBIKVERSION("New DB Version");
break;
}
}
@@ -2221,7 +1483,7 @@ dissect_backup_reply(const u_char *pd, int offset, frame_data *fd, proto_tree *t
}
else if ( rxh->type == RX_PACKET_TYPE_ABORT )
{
- UINTOUT(hf_afs_backup_errcode);
+ OUT_UINT(hf_afs_backup_errcode);
}
}
@@ -2237,8 +1499,7 @@ dissect_backup_request(const u_char *pd, int offset, frame_data *fd, proto_tree
doffset = offset + sizeof(struct rx_header);
curoffset = doffset;
- /* skip opcode */
- SKIP(sizeof(guint32));
+ SKIP_OPCODE();
switch ( opcode )
{
@@ -2253,393 +1514,7 @@ void
proto_register_afs(void)
{
static hf_register_info hf[] = {
-
- { &hf_afs_fs, {
- "File Server", "afs.fs", FT_BOOLEAN, BASE_NONE,
- 0, 0, "File Server" }},
- { &hf_afs_cb, {
- "Callback", "afs.cb", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Callback" }},
- { &hf_afs_prot, {
- "Protection", "afs.prot", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Protection" }},
- { &hf_afs_vldb, {
- "VLDB", "afs.vldb", FT_BOOLEAN, BASE_NONE,
- 0, 0, "VLDB" }},
- { &hf_afs_kauth, {
- "Kauth", "afs.kauth", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Kauth" }},
- { &hf_afs_vol, {
- "Volume Server", "afs.vol", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Volume Server" }},
- { &hf_afs_error, {
- "Error", "afs.error", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Error" }},
- { &hf_afs_bos, {
- "BOS", "afs.bos", FT_BOOLEAN, BASE_NONE,
- 0, 0, "BOS" }},
- { &hf_afs_update, {
- "Update", "afs.update", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Update" }},
- { &hf_afs_rmtsys, {
- "Rmtsys", "afs.rmtsys", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Rmtsys" }},
- { &hf_afs_ubik, {
- "Ubik", "afs.ubik", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Ubik" }},
- { &hf_afs_backup, {
- "Backup", "afs.backup", FT_BOOLEAN, BASE_NONE,
- 0, 0, "Backup" }},
-
- { &hf_afs_fs_opcode, {
- "Operation", "afs.fs.opcode", FT_UINT32, BASE_DEC,
- VALS(fs_req), 0, "Operation" }},
- { &hf_afs_cb_opcode, {
- "Operation", "afs.cb.opcode", FT_UINT32, BASE_DEC,
- VALS(cb_req), 0, "Operation" }},
- { &hf_afs_prot_opcode, {
- "Operation", "afs.prot.opcode", FT_UINT32, BASE_DEC,
- VALS(prot_req), 0, "Operation" }},
- { &hf_afs_vldb_opcode, {
- "Operation", "afs.vldb.opcode", FT_UINT32, BASE_DEC,
- VALS(vldb_req), 0, "Operation" }},
- { &hf_afs_kauth_opcode, {
- "Operation", "afs.kauth.opcode", FT_UINT32, BASE_DEC,
- VALS(kauth_req), 0, "Operation" }},
- { &hf_afs_vol_opcode, {
- "Operation", "afs.vol.opcode", FT_UINT32, BASE_DEC,
- VALS(vol_req), 0, "Operation" }},
- { &hf_afs_bos_opcode, {
- "Operation", "afs.bos.opcode", FT_UINT32, BASE_DEC,
- VALS(bos_req), 0, "Operation" }},
- { &hf_afs_update_opcode, {
- "Operation", "afs.update.opcode", FT_UINT32, BASE_DEC,
- VALS(update_req), 0, "Operation" }},
- { &hf_afs_rmtsys_opcode, {
- "Operation", "afs.rmtsys.opcode", FT_UINT32, BASE_DEC,
- VALS(rmtsys_req), 0, "Operation" }},
- { &hf_afs_error_opcode, {
- "Operation", "afs.error.opcode", FT_UINT32, BASE_DEC,
- 0, 0, "Operation" }},
- { &hf_afs_backup_opcode, {
- "Operation", "afs.backup.opcode", FT_UINT32, BASE_DEC,
- VALS(backup_req), 0, "Operation" }},
- { &hf_afs_ubik_opcode, {
- "Operation", "afs.ubik.opcode", FT_UINT32, BASE_DEC,
- VALS(ubik_req), 0, "Operation" }},
-
-
- /* File Server Fields */
- { &hf_afs_fs_fid_volume, {
- "FileID (Volume)", "afs.fs.fid.volume", FT_UINT32, BASE_DEC,
- 0, 0, "File ID (Volume)" }},
- { &hf_afs_fs_fid_vnode, {
- "FileID (VNode)", "afs.fs.fid.vnode", FT_UINT32, BASE_DEC,
- 0, 0, "File ID (VNode)" }},
- { &hf_afs_fs_fid_uniqifier, {
- "FileID (Uniqifier)", "afs.fs.fid.uniq", FT_UINT32, BASE_DEC,
- 0, 0, "File ID (Uniqifier)" }},
- { &hf_afs_fs_offset, {
- "Offset", "afs.fs.offset", FT_UINT32, BASE_DEC,
- 0, 0, "Offset" }},
- { &hf_afs_fs_length, {
- "Length", "afs.fs.length", FT_UINT32, BASE_DEC,
- 0, 0, "Length" }},
- { &hf_afs_fs_flength, {
- "FLength", "afs.fs.flength", FT_UINT32, BASE_DEC,
- 0, 0, "FLength" }},
- { &hf_afs_fs_errcode, {
- "Error Code", "afs.fs.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_fs_data, {
- "Data", "afs.fs.data", FT_BYTES, BASE_HEX,
- 0, 0, "Data" }},
- { &hf_afs_fs_oldname, {
- "Old Name", "afs.fs.oldname", FT_STRING, BASE_HEX,
- 0, 0, "Old Name" }},
- { &hf_afs_fs_newname, {
- "New Name", "afs.fs.newname", FT_STRING, BASE_HEX,
- 0, 0, "New Name" }},
- { &hf_afs_fs_name, {
- "Name", "afs.fs.name", FT_STRING, BASE_HEX,
- 0, 0, "Name" }},
- { &hf_afs_fs_symlink_name, {
- "Symlink Name", "afs.fs.symlink.name", FT_STRING, BASE_HEX,
- 0, 0, "Symlink Name" }},
- { &hf_afs_fs_symlink_content, {
- "Symlink Content", "afs.fs.symlink.content", FT_STRING, BASE_HEX,
- 0, 0, "Symlink Content" }},
- { &hf_afs_fs_volid, {
- "Volume ID", "afs.fs.volid", FT_UINT32, BASE_DEC,
- 0, 0, "Volume ID" }},
- { &hf_afs_fs_volname, {
- "Volume Name", "afs.fs.volname", FT_STRING, BASE_HEX,
- 0, 0, "Volume Name" }},
- { &hf_afs_fs_timestamp, {
- "Timestamp", "afs.fs.timestamp", FT_ABSOLUTE_TIME, BASE_DEC,
- 0, 0, "Timestamp" }},
-
- { &hf_afs_fs_acl_count_positive, {
- "ACL Count (Positive)", "afs.fs.acl.count.positive", FT_UINT32, BASE_DEC,
- 0, 0, "Number of Positive ACLs" }},
- { &hf_afs_fs_acl_count_negative, {
- "ACL Count (Negative)", "afs.fs.acl.count.negative", FT_UINT32, BASE_DEC,
- 0, 0, "Number of Negative ACLs" }},
- { &hf_afs_fs_acl_datasize, {
- "ACL Size", "afs.fs.acl.datasize", FT_UINT32, BASE_DEC,
- 0, 0, "ACL Data Size" }},
- { &hf_afs_fs_acl_entity, {
- "Entity (User/Group)", "afs.fs.acl.entity", FT_STRING, BASE_HEX,
- 0, 0, "ACL Entity (User/Group)" }},
- { &hf_afs_fs_acl_r, {
- "_R_ead", "afs.fs.acl.r", FT_UINT8, BASE_BIN,
- 0, PRSFS_READ, "Read" }},
- { &hf_afs_fs_acl_l, {
- "_L_ookup", "afs.fs.acl.l", FT_UINT8, BASE_BIN,
- 0, PRSFS_LOOKUP, "Lookup" }},
- { &hf_afs_fs_acl_i, {
- "_I_nsert", "afs.fs.acl.i", FT_UINT8, BASE_BIN,
- 0, PRSFS_INSERT, "Insert" }},
- { &hf_afs_fs_acl_d, {
- "_D_elete", "afs.fs.acl.d", FT_UINT8, BASE_BIN,
- 0, PRSFS_DELETE, "Delete" }},
- { &hf_afs_fs_acl_w, {
- "_W_rite", "afs.fs.acl.w", FT_UINT8, BASE_BIN,
- 0, PRSFS_WRITE, "Write" }},
- { &hf_afs_fs_acl_k, {
- "_L_ock", "afs.fs.acl.k", FT_UINT8, BASE_BIN,
- 0, PRSFS_LOCK, "Lock" }},
- { &hf_afs_fs_acl_a, {
- "_A_dminister", "afs.fs.acl.a", FT_UINT8, BASE_BIN,
- 0, PRSFS_ADMINISTER, "Administer" }},
-
- { &hf_afs_fs_callback_version, {
- "Version", "afs.fs.callback.version", FT_UINT32, BASE_DEC,
- 0, 0, "Version" }},
- { &hf_afs_fs_callback_expires, {
- "Expires", "afs.fs.callback.expires", FT_ABSOLUTE_TIME, BASE_DEC,
- 0, 0, "Expires" }},
- { &hf_afs_fs_callback_type, {
- "Type", "afs.fs.callback.type", FT_UINT32, BASE_DEC,
- VALS(cb_types), 0, "Type" }},
-
- /* BOS Server Fields */
- { &hf_afs_bos_errcode, {
- "Error Code", "afs.bos.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_bos_type, {
- "Type", "afs.bos.type", FT_STRING, BASE_HEX,
- 0, 0, "Type" }},
- { &hf_afs_bos_content, {
- "Content", "afs.bos.content", FT_STRING, BASE_HEX,
- 0, 0, "Content" }},
- { &hf_afs_bos_instance, {
- "Instance", "afs.bos.instance", FT_STRING, BASE_HEX,
- 0, 0, "Instance" }},
- { &hf_afs_bos_status, {
- "Status", "afs.bos.status", FT_INT32, BASE_DEC,
- 0, 0, "Status" }},
- { &hf_afs_bos_num, {
- "Number", "afs.bos.number", FT_UINT32, BASE_DEC,
- 0, 0, "Number" }},
- { &hf_afs_bos_size, {
- "Size", "afs.bos.size", FT_UINT32, BASE_DEC,
- 0, 0, "Size" }},
- { &hf_afs_bos_flags, {
- "Flags", "afs.bos.flags", FT_UINT32, BASE_DEC,
- 0, 0, "Flags" }},
- { &hf_afs_bos_date, {
- "Date", "afs.bos.date", FT_UINT32, BASE_DEC,
- 0, 0, "Date" }},
-
- /* KAUTH Server Fields */
- { &hf_afs_kauth_errcode, {
- "Error Code", "afs.kauth.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_kauth_princ, {
- "Principal", "afs.kauth.princ", FT_STRING, BASE_HEX,
- 0, 0, "Principal" }},
- { &hf_afs_kauth_realm, {
- "Realm", "afs.kauth.realm", FT_STRING, BASE_HEX,
- 0, 0, "Realm" }},
- { &hf_afs_kauth_domain, {
- "Domain", "afs.kauth.domain", FT_STRING, BASE_HEX,
- 0, 0, "Domain" }},
- { &hf_afs_kauth_name, {
- "Name", "afs.kauth.name", FT_STRING, BASE_HEX,
- 0, 0, "Name" }},
- { &hf_afs_kauth_data, {
- "Data", "afs.kauth.data", FT_BYTES, BASE_HEX,
- 0, 0, "Data" }},
- { &hf_afs_kauth_kvno, {
- "Key Version Number", "afs.kauth.kvno", FT_UINT32, BASE_DEC,
- 0, 0, "Key Version Number" }},
-
- /* VOL Server Fields */
- { &hf_afs_vol_errcode, {
- "Error Code", "afs.vol.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_vol_id, {
- "Volume ID", "afs.vol.id", FT_UINT32, BASE_DEC,
- 0, 0, "Volume ID" }},
- { &hf_afs_vol_count, {
- "Volume Count", "afs.vol.count", FT_UINT32, BASE_DEC,
- 0, 0, "Volume Count" }},
- { &hf_afs_vol_name, {
- "Volume Name", "afs.vol.name", FT_STRING, BASE_HEX,
- 0, 0, "Volume Name" }},
-
- /* VLDB Server Fields */
- { &hf_afs_vldb_errcode, {
- "Error Code", "afs.vldb.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_vldb_type, {
- "Volume Type", "afs.vldb.type", FT_UINT32, BASE_DEC,
- VALS(volume_types), 0, "Volume Type" }},
- { &hf_afs_vldb_id, {
- "Volume ID", "afs.vldb.id", FT_UINT32, BASE_DEC,
- 0, 0, "Volume ID" }},
- { &hf_afs_vldb_bump, {
- "Bumped Volume ID", "afs.vldb.bump", FT_UINT32, BASE_DEC,
- 0, 0, "Bumped Volume ID" }},
- { &hf_afs_vldb_index, {
- "Volume Index", "afs.vldb.index", FT_UINT32, BASE_DEC,
- 0, 0, "Volume Index" }},
- { &hf_afs_vldb_count, {
- "Volume Count", "afs.vldb.count", FT_UINT32, BASE_DEC,
- 0, 0, "Volume Count" }},
- { &hf_afs_vldb_numservers, {
- "Number of Servers", "afs.vldb.numservers", FT_UINT32, BASE_DEC,
- 0, 0, "Number of Servers" }},
- { &hf_afs_vldb_nextindex, {
- "Next Volume Index", "afs.vldb.nextindex", FT_UINT32, BASE_DEC,
- 0, 0, "Next Volume Index" }},
- { &hf_afs_vldb_rovol, {
- "Read-Only Volume ID", "afs.vldb.rovol", FT_UINT32, BASE_DEC,
- 0, 0, "Read-Only Volume ID" }},
- { &hf_afs_vldb_rwvol, {
- "Read-Write Volume ID", "afs.vldb.rwvol", FT_UINT32, BASE_DEC,
- 0, 0, "Read-Only Volume ID" }},
- { &hf_afs_vldb_bkvol, {
- "Backup Volume ID", "afs.vldb.bkvol", FT_UINT32, BASE_DEC,
- 0, 0, "Read-Only Volume ID" }},
- { &hf_afs_vldb_name, {
- "Volume Name", "afs.vldb.name", FT_STRING, BASE_HEX,
- 0, 0, "Volume Name" }},
- { &hf_afs_vldb_partition, {
- "Partition", "afs.vldb.partition", FT_STRING, BASE_HEX,
- 0, 0, "Partition" }},
- { &hf_afs_vldb_server, {
- "Server", "afs.vldb.server", FT_IPv4, BASE_HEX,
- 0, 0, "Server" }},
- { &hf_afs_vldb_serveruuid, {
- "Server UUID", "afs.vldb.serveruuid", FT_BYTES, BASE_HEX,
- 0, 0, "Server UUID" }},
-
- /* BACKUP Server Fields */
- { &hf_afs_backup_errcode, {
- "Error Code", "afs.backup.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
-
- /* CB Server Fields */
- { &hf_afs_cb_errcode, {
- "Error Code", "afs.cb.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_cb_callback_version, {
- "Version", "afs.cb.callback.version", FT_UINT32, BASE_DEC,
- 0, 0, "Version" }},
- { &hf_afs_cb_callback_expires, {
- "Expires", "afs.cb.callback.expires", FT_ABSOLUTE_TIME, BASE_DEC,
- 0, 0, "Expires" }},
- { &hf_afs_cb_callback_type, {
- "Type", "afs.cb.callback.type", FT_UINT32, BASE_DEC,
- VALS(cb_types), 0, "Type" }},
- { &hf_afs_cb_fid_volume, {
- "FileID (Volume)", "afs.cb.fid.volume", FT_UINT32, BASE_DEC,
- 0, 0, "File ID (Volume)" }},
- { &hf_afs_cb_fid_vnode, {
- "FileID (VNode)", "afs.cb.fid.vnode", FT_UINT32, BASE_DEC,
- 0, 0, "File ID (VNode)" }},
- { &hf_afs_cb_fid_uniqifier, {
- "FileID (Uniqifier)", "afs.cb.fid.uniq", FT_UINT32, BASE_DEC,
- 0, 0, "File ID (Uniqifier)" }},
-
- /* PROT Server Fields */
- { &hf_afs_prot_errcode, {
- "Error Code", "afs.prot.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_prot_name, {
- "Name", "afs.prot.name", FT_STRING, BASE_HEX,
- 0, 0, "Name" }},
- { &hf_afs_prot_id, {
- "ID", "afs.prot.id", FT_UINT32, BASE_DEC,
- 0, 0, "ID" }},
- { &hf_afs_prot_oldid, {
- "Old ID", "afs.prot.oldid", FT_UINT32, BASE_DEC,
- 0, 0, "Old ID" }},
- { &hf_afs_prot_newid, {
- "New ID", "afs.prot.newid", FT_UINT32, BASE_DEC,
- 0, 0, "New ID" }},
- { &hf_afs_prot_gid, {
- "Group ID", "afs.prot.gid", FT_UINT32, BASE_DEC,
- 0, 0, "Group ID" }},
- { &hf_afs_prot_uid, {
- "User ID", "afs.prot.uid", FT_UINT32, BASE_DEC,
- 0, 0, "User ID" }},
- { &hf_afs_prot_count, {
- "Count", "afs.prot.count", FT_UINT32, BASE_DEC,
- 0, 0, "Count" }},
- { &hf_afs_prot_maxgid, {
- "Maximum Group ID", "afs.prot.maxgid", FT_UINT32, BASE_DEC,
- 0, 0, "Maximum Group ID" }},
- { &hf_afs_prot_maxuid, {
- "Maximum User ID", "afs.prot.maxuid", FT_UINT32, BASE_DEC,
- 0, 0, "Maximum User ID" }},
- { &hf_afs_prot_pos, {
- "Position", "afs.prot.pos", FT_UINT32, BASE_DEC,
- 0, 0, "Position" }},
- { &hf_afs_prot_flag, {
- "Flag", "afs.prot.flag", FT_UINT32, BASE_HEX,
- 0, 0, "Flag" }},
-
- /* UBIK Fields */
- { &hf_afs_ubik_errcode, {
- "Error Code", "afs.ubik.errcode", FT_UINT32, BASE_DEC,
- VALS(afs_errors), 0, "Error Code" }},
- { &hf_afs_ubik_version_epoch, {
- "Epoch", "afs.ubik.version.epoch", FT_ABSOLUTE_TIME, BASE_DEC,
- 0, 0, "Epoch" }},
- { &hf_afs_ubik_votestart, {
- "Vote Started", "afs.ubik.votestart", FT_ABSOLUTE_TIME, BASE_DEC,
- 0, 0, "Vote Started" }},
- { &hf_afs_ubik_voteend, {
- "Vote Ends", "afs.ubik.voteend", FT_ABSOLUTE_TIME, BASE_DEC,
- 0, 0, "Vote Ends" }},
- { &hf_afs_ubik_version_counter, {
- "Counter", "afs.ubik.version.counter", FT_UINT32, BASE_DEC,
- 0, 0, "Counter" }},
- { &hf_afs_ubik_file, {
- "File", "afs.ubik.file", FT_UINT32, BASE_DEC,
- 0, 0, "File" }},
- { &hf_afs_ubik_pos, {
- "Position", "afs.ubik.position", FT_UINT32, BASE_DEC,
- 0, 0, "Position" }},
- { &hf_afs_ubik_length, {
- "Length", "afs.ubik.length", FT_UINT32, BASE_DEC,
- 0, 0, "Length" }},
- { &hf_afs_ubik_locktype, {
- "Lock Type", "afs.ubik.locktype", FT_UINT32, BASE_DEC,
- VALS(ubik_lock_types), 0, "Lock Type" }},
- { &hf_afs_ubik_votetype, {
- "Vote Type", "afs.ubik.votetype", FT_BOOLEAN, BASE_HEX,
- 0, 0, "Vote Type" }},
- { &hf_afs_ubik_syncsite, {
- "Syncsite", "afs.ubik.syncsite", FT_BOOLEAN, BASE_HEX,
- 0, 0, "Syncsite" }},
- { &hf_afs_ubik_site, {
- "Site", "afs.ubik.site", FT_IPv4, BASE_HEX,
- 0, 0, "Site" }},
-
+#include "packet-afs-register-info.h"
};
static gint *ett[] = {
&ett_afs,
@@ -2648,6 +1523,11 @@ proto_register_afs(void)
&ett_afs_fid,
&ett_afs_callback,
&ett_afs_ubikver,
+ &ett_afs_status,
+ &ett_afs_status_mask,
+ &ett_afs_volsync,
+ &ett_afs_volumeinfo,
+ &ett_afs_vicestat,
};
proto_afs = proto_register_protocol("Andrew File System (AFS)", "afs");