Removed trailing whitespaces from .h and .c files using the
[obnox/wireshark/wip.git] / packet-afs.c
index dda21efef7c97d25e7b5543dd072aabc1e167fa1..d19ad71d046be5a06d89e853a99ff29c86992f10 100644 (file)
@@ -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.31 2001/05/27 05:00:17 guy Exp $
+ * $Id: packet-afs.c,v 1.48 2002/08/02 23:35:46 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 
 #include <stdio.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include <string.h>
 #include <glib.h>
-#include "packet.h"
-#include "conversation.h"
-#include "resolv.h"
+#include <epan/packet.h>
+#include <epan/conversation.h>
+#include <epan/resolv.h>
 
 #include "packet-rx.h"
 #include "packet-afs.h"
 #include "packet-afs-defs.h"
 #include "packet-afs-macros.h"
 
-#define GETSTR tvb_get_ptr(tvb,offset,tvb_length_remaining(tvb,offset))
+#define GETSTR tvb_get_ptr(tvb,offset,tvb_ensure_length_remaining(tvb,offset))
 
 #define VALID_OPCODE(opcode) ((opcode >= OPCODE_LOW && opcode <= OPCODE_HIGH) || \
                (opcode >= VOTE_LOW && opcode <= VOTE_HIGH) || \
                (opcode >= DISK_LOW && opcode <= DISK_HIGH))
 
-int afs_packet_init_count = 100;
+static int afs_packet_init_count = 100;
 
 struct afs_request_key {
   guint32 conversation, callnumber;
@@ -73,52 +65,52 @@ struct afs_request_val {
   guint32 opcode;
 };
 
-GHashTable *afs_request_hash = NULL;
-GMemChunk *afs_request_keys = NULL;
-GMemChunk *afs_request_vals = NULL;
+static GHashTable *afs_request_hash = NULL;
+static GMemChunk *afs_request_keys = NULL;
+static GMemChunk *afs_request_vals = NULL;
 
 
 
 /*
  * Dissector prototypes
  */
-static int dissect_acl(tvbuff_t *tvb, packet_info *pinfo, 
+static int dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset);
-static void dissect_fs_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_bos_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_bos_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_bos_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_bos_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_vol_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_vol_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_vol_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_vol_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_kauth_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_kauth_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_kauth_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_kauth_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_cb_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_cb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_cb_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_cb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_prot_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_prot_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_prot_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_prot_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_vldb_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_vldb_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_vldb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_ubik_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_ubik_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_ubik_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_ubik_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_backup_reply(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_backup_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
-static void dissect_backup_request(tvbuff_t *tvb, packet_info *pinfo, 
+static void dissect_backup_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 
        proto_tree *tree, int offset, int opcode);
 
 /*
@@ -184,6 +176,7 @@ afs_init_protocol(void)
 static void
 dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
+       struct rxinfo *rxinfo = pinfo->private_data;
        int reply = 0;
        conversation_t *conversation;
        struct afs_request_key request_key, *new_request_key;
@@ -192,17 +185,17 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        int port, node, typenode, opcode;
        value_string const *vals;
        int offset = 0;
-       void (*dissector)(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode);
+       void (*dissector)(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode);
 
 
-       if (check_col(pinfo->fd, COL_PROTOCOL)) {
-               col_set_str(pinfo->fd, COL_PROTOCOL, "AFS (RX)");
+       if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFS (RX)");
        }
-       if (check_col(pinfo->fd, COL_INFO)) {
-               col_clear(pinfo->fd, COL_INFO);
+       if (check_col(pinfo->cinfo, COL_INFO)) {
+               col_clear(pinfo->cinfo, COL_INFO);
        }
 
-       reply = (pinfo->ps.rx.flags & RX_CLIENT_INITIATED) == 0;
+       reply = (rxinfo->flags & RX_CLIENT_INITIATED) == 0;
        port = ((reply == 0) ? pinfo->destport : pinfo->srcport );
 
        /*
@@ -223,12 +216,12 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        if (conversation == NULL) {
                /* It's not part of any conversation - create a new one. */
                conversation = conversation_new(&pinfo->src, &pinfo->dst, 
-                       pinfo->ptype, pinfo->srcport, pinfo->destport, NULL, 0);
+                       pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
        }
 
        request_key.conversation = conversation->index; 
-       request_key.service = pinfo->ps.rx.serviceid;
-       request_key.callnumber = pinfo->ps.rx.callnumber;
+       request_key.service = rxinfo->serviceid;
+       request_key.callnumber = rxinfo->callnumber;
 
        request_val = (struct afs_request_val *) g_hash_table_lookup(
                afs_request_hash, &request_key);
@@ -333,35 +326,35 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        if ( VALID_OPCODE(opcode) ) {
                if ( vals ) {
-                       if (check_col(pinfo->fd, COL_INFO))
-                               col_add_fstr(pinfo->fd, COL_INFO, "%s%s %s: %s (%d)",
+                       if (check_col(pinfo->cinfo, COL_INFO))
+                               col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s %s: %s (%d)",
                                typenode == hf_afs_ubik ? "UBIK-" : "",
                                val_to_str(port, port_types_short, "Unknown(%d)"),
                                reply ? "Reply" : "Request",
                                val_to_str(opcode, vals, "Unknown(%d)"), opcode);
                } else {
-                       if (check_col(pinfo->fd, COL_INFO))
-                               col_add_fstr(pinfo->fd, COL_INFO, "%s%s %s: Unknown(%d)",
+                       if (check_col(pinfo->cinfo, COL_INFO))
+                               col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s %s: Unknown(%d)",
                                typenode == hf_afs_ubik ? "UBIK-" : "",
                                val_to_str(port, port_types_short, "Unknown(%d)"),
                                reply ? "Reply" : "Request",
                                opcode);
                }
        } else {
-               if (check_col(pinfo->fd, COL_INFO))
-                       col_add_fstr(pinfo->fd, COL_INFO, "Encrypted %s %s",
+               if (check_col(pinfo->cinfo, COL_INFO))
+                       col_add_fstr(pinfo->cinfo, COL_INFO, "Encrypted %s %s",
                        val_to_str(port, port_types_short, "Unknown(%d)"),
                        reply ? "Reply" : "Request"
                        );
        }
 
        if (tree) {
-               ti = proto_tree_add_item(tree, proto_afs, tvb, offset, 
-                               tvb_length_remaining(tvb, offset), FALSE);
+               ti = proto_tree_add_item(tree, proto_afs, tvb, offset, -1,
+                               FALSE);
                afs_tree = proto_item_add_subtree(ti, ett_afs);
 
                proto_tree_add_text(afs_tree, tvb,
-                       offset, tvb_length_remaining(tvb, offset),
+                       offset, -1,
                        "Service: %s%s%s %s",
                        VALID_OPCODE(opcode) ? "" : "Encrypted ",
                        typenode == hf_afs_ubik ? "UBIK - " : "",
@@ -372,8 +365,14 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                        /* until we do cache, can't handle replies */
                        ti = NULL;
                        if ( !reply && node != 0 ) {
-                               ti = proto_tree_add_uint(afs_tree,
-                                       node, tvb, offset, 4, opcode);
+                               if ( rxinfo->seq == 1 )
+                               {
+                                       ti = proto_tree_add_uint(afs_tree,
+                                               node, tvb, offset, 4, opcode);
+                               } else {
+                                       ti = proto_tree_add_uint(afs_tree,
+                                               node, tvb, offset, 0, opcode);
+                               }
                        } else if ( reply && node != 0 ) {
                                /* the opcode isn't in this packet */
                                ti = proto_tree_add_uint(afs_tree,
@@ -393,7 +392,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        
                        /* Process the packet according to what service it is */
                        if ( dissector ) {
-                               (*dissector)(tvb, pinfo, afs_op_tree, offset, opcode);
+                               (*dissector)(tvb, rxinfo, afs_op_tree, offset, opcode);
                        }
                }
        }
@@ -401,7 +400,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        /* if it's the last packet, and it's a reply, remove opcode
                from hash */
        /* ignoring for now, I'm not sure how the chunk deallocation works */
-       if ( pinfo->ps.rx.flags & RX_LAST_PACKET && reply ){
+       if ( rxinfo->flags & RX_LAST_PACKET && reply ){
 
        }
 }
@@ -422,12 +421,21 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  * ASCII strings containing the UID/PTS record and and a ascii number
  * representing a logical OR of all the ACL permission bits
  */
-/* FIXME: sscanf is probably quite dangerous if we run outside the packet. */
+/*
+ * XXX - FIXME:
+ *
+ *     sscanf is probably quite dangerous if we run outside the packet.
+ *
+ *     "GETSTR" doesn't guarantee that the resulting string is
+ *     null-terminated.
+ *
+ * Should this just scan the string itself, rather than using "sscanf()"?
+ */
 static int 
-dissect_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
+dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset)
 {
        int old_offset;
-       guint32 bytes;
+       gint32 bytes;
        int i, n, pos, neg, acl;
        char user[128]; /* Be sure to adjust sscanf()s below if length is changed... */
 
@@ -485,15 +493,15 @@ dissect_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
  */
 
 static void
-dissect_fs_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
                        case 130: /* fetch data */
                                /* only on first packet */
-                               if ( pinfo->ps.rx.seq == 1 )
+                               if ( rxinfo->seq == 1 )
                                {
                                        OUT_FS_AFSFetchStatus("Status");
                                        OUT_FS_AFSCallBack();
@@ -502,7 +510,7 @@ dissect_fs_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
                                OUT_BYTES_ALL(hf_afs_fs_data);
                                break;
                        case 131: /* fetch acl */
-                               offset = dissect_acl(tvb, pinfo, tree, offset);
+                               offset = dissect_acl(tvb, rxinfo, tree, offset);
                                OUT_FS_AFSFetchStatus("Status");
                                OUT_FS_AFSVolSync();
                                break;
@@ -558,18 +566,19 @@ dissect_fs_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
                                break;
                        case 149: /* get volume status */
                                OUT_FS_AFSFetchVolumeStatus();
-                               OUT_STRING(hf_afs_fs_volname);
-                               OUT_STRING(hf_afs_fs_offlinemsg);
-                               OUT_STRING(hf_afs_fs_motd);
+                               OUT_RXString(hf_afs_fs_volname);
+                               OUT_RXString(hf_afs_fs_offlinemsg);
+                               OUT_RXString(hf_afs_fs_motd);
                                break;
                        case 151: /* root volume */
-                               OUT_STRING(hf_afs_fs_volname);
+                               OUT_RXString(hf_afs_fs_volname);
                                break;
                        case 153: /* get time */
                                OUT_TIMESTAMP(hf_afs_fs_timestamp);
                                break;
                        case 155: /* bulk status */
                                OUT_FS_AFSBulkStats();
+                               SKIP(4); 
                                OUT_FS_AFSCBs();
                                OUT_FS_AFSVolSync();
                                break;
@@ -592,16 +601,20 @@ dissect_fs_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
                                break;
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_fs_errcode);
        }
 }
 
 static void
-dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_fs_request(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       offset += 4;  /* skip the opcode */
+       /* skip the opcode if this is the first packet in the stream */
+       if ( rxinfo->seq == 1 )
+       {
+               offset += 4;  /* skip the opcode */
+       }
 
        switch ( opcode )
        {
@@ -617,15 +630,19 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        OUT_FS_AFSFid("Target");
                        break;
                case 133: /* Store Data */
-                       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);
+                       if ( rxinfo->seq == 1 )
+                       {
+                               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);
+                       }
+                       OUT_BYTES_ALL(hf_afs_fs_data);
                        break;
                case 134: /* Store ACL */
                        OUT_FS_AFSFid("Target");
-                       offset = dissect_acl(tvb, pinfo, tree, offset);
+                       offset = dissect_acl(tvb, rxinfo, tree, offset);
                        break;
                case 135: /* Store Status */
                        OUT_FS_AFSFid("Target");
@@ -633,38 +650,38 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        break;
                case 136: /* Remove File */
                        OUT_FS_AFSFid("Remove File");
-                       OUT_STRING(hf_afs_fs_name);
+                       OUT_RXString(hf_afs_fs_name);
                        break;
                case 137: /* Create File */
                        OUT_FS_AFSFid("Target");
-                       OUT_STRING(hf_afs_fs_name);
+                       OUT_RXString(hf_afs_fs_name);
                        OUT_FS_AFSStoreStatus("Status");
                        break;
                case 138: /* Rename file */
                        OUT_FS_AFSFid("Old");
-                       OUT_STRING(hf_afs_fs_oldname);
+                       OUT_RXString(hf_afs_fs_oldname);
                        OUT_FS_AFSFid("New");
-                       OUT_STRING(hf_afs_fs_newname);
+                       OUT_RXString(hf_afs_fs_newname);
                        break;
                case 139: /* Symlink */
                        OUT_FS_AFSFid("File");
-                       OUT_STRING(hf_afs_fs_symlink_name);
-                       OUT_STRING(hf_afs_fs_symlink_content);
+                       OUT_RXString(hf_afs_fs_symlink_name);
+                       OUT_RXString(hf_afs_fs_symlink_content);
                        OUT_FS_AFSStoreStatus("Status");
                        break;
                case 140: /* Link */
                        OUT_FS_AFSFid("Link To (New File)");
-                       OUT_STRING(hf_afs_fs_name);
+                       OUT_RXString(hf_afs_fs_name);
                        OUT_FS_AFSFid("Link From (Old File)");
                        break;
                case 141: /* Make dir */
                        OUT_FS_AFSFid("Target");
-                       OUT_STRING(hf_afs_fs_name);
+                       OUT_RXString(hf_afs_fs_name);
                        OUT_FS_AFSStoreStatus("Status");
                        break;
                case 142: /* Remove dir */
                        OUT_FS_AFSFid("Target");
-                       OUT_STRING(hf_afs_fs_name);
+                       OUT_RXString(hf_afs_fs_name);
                        break;
                case 143: /* Old Set Lock */
                        OUT_FS_AFSFid("Target");
@@ -687,7 +704,7 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        OUT_FS_AFSCBs();
                        break;
                case 148: /* Get vol info */
-                       OUT_STRING(hf_afs_fs_volname);
+                       OUT_RXString(hf_afs_fs_volname);
                        break;
                case 149: /* Get vol stats */
                        OUT_UINT(hf_afs_fs_volid);
@@ -695,9 +712,9 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                case 150: /* Set vol stats */
                        OUT_UINT(hf_afs_fs_volid);
                        OUT_FS_AFSStoreVolumeStatus();
-                       OUT_STRING(hf_afs_fs_volname);
-                       OUT_STRING(hf_afs_fs_offlinemsg);
-                       OUT_STRING(hf_afs_fs_motd);
+                       OUT_RXString(hf_afs_fs_volname);
+                       OUT_RXString(hf_afs_fs_offlinemsg);
+                       OUT_RXString(hf_afs_fs_motd);
                        break;
                case 151: /* get root volume */
                        /* no params */
@@ -710,7 +727,7 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        /* no params */
                        break;
                case 154: /* new get vol info */
-                       OUT_STRING(hf_afs_fs_volname);
+                       OUT_RXString(hf_afs_fs_volname);
                        break;
                case 155: /* bulk stat */
                        OUT_FS_AFSCBFids();
@@ -734,7 +751,7 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        break;
                case 161: /* lookup */
                        OUT_FS_AFSFid("Target");
-                       OUT_STRING(hf_afs_fs_name);
+                       OUT_RXString(hf_afs_fs_name);
                        break;
                case 162: /* flush cps */
                        OUT_FS_ViceIds();
@@ -743,8 +760,8 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        break;
                case 163: /* dfs symlink */
                        OUT_FS_AFSFid("Target");
-                       OUT_STRING(hf_afs_fs_symlink_name);
-                       OUT_STRING(hf_afs_fs_symlink_content);
+                       OUT_RXString(hf_afs_fs_symlink_name);
+                       OUT_RXString(hf_afs_fs_symlink_content);
                        OUT_FS_AFSStoreStatus("Symlink Status");
                        break;
        }
@@ -754,9 +771,9 @@ dissect_fs_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
  * BOS Helpers
  */
 static void
-dissect_bos_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_bos_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
@@ -771,17 +788,17 @@ dissect_bos_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offse
                                break;
                        case 83: /* get status */
                                OUT_INT(hf_afs_bos_status);
-                               OUT_STRING(hf_afs_bos_statusdesc);
+                               OUT_RXString(hf_afs_bos_statusdesc);
                                break;
                        case 84: /* enumerate instance */
-                               OUT_STRING(hf_afs_bos_instance);
+                               OUT_RXString(hf_afs_bos_instance);
                                break;
                        case 85: /* get instance info */
-                               OUT_STRING(hf_afs_bos_type);
+                               OUT_RXString(hf_afs_bos_type);
                                OUT_BOS_STATUS();
                                break;
                        case 86: /* get instance parm */
-                               OUT_STRING(hf_afs_bos_parm);
+                               OUT_RXString(hf_afs_bos_parm);
                                break;
                        case 87: /* add siperuser */
                                /* no output */
@@ -790,7 +807,7 @@ dissect_bos_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offse
                                /* no output */
                                break;
                        case 89: /* list superusers */
-                               OUT_STRING(hf_afs_bos_user);
+                               OUT_RXString(hf_afs_bos_user);
                                break;
                        case 90: /* list keys */
                                OUT_UINT(hf_afs_bos_kvno);
@@ -807,10 +824,10 @@ dissect_bos_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offse
                                /* no output */
                                break;
                        case 94: /* get cell name */
-                               OUT_STRING(hf_afs_bos_cell);
+                               OUT_RXString(hf_afs_bos_cell);
                                break;
                        case 95: /* get cell host */
-                               OUT_STRING(hf_afs_bos_host);
+                               OUT_RXString(hf_afs_bos_host);
                                break;
                        case 96: /* add cell host */
                                /* no output */
@@ -870,61 +887,61 @@ dissect_bos_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offse
                                /* no output */
                                break;
                        case 114: /* get instance strings */
-                               OUT_STRING(hf_afs_bos_error);
-                               OUT_STRING(hf_afs_bos_spare1);
-                               OUT_STRING(hf_afs_bos_spare2);
-                               OUT_STRING(hf_afs_bos_spare3);
+                               OUT_RXString(hf_afs_bos_error);
+                               OUT_RXString(hf_afs_bos_spare1);
+                               OUT_RXString(hf_afs_bos_spare2);
+                               OUT_RXString(hf_afs_bos_spare3);
                                break;
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_bos_errcode);
        }
 }
 
 static void
-dissect_bos_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_bos_request(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
        switch ( opcode )
        {
                case 80: /* create b node */
-                       OUT_STRING(hf_afs_bos_type);
-                       OUT_STRING(hf_afs_bos_instance);
-                       OUT_STRING(hf_afs_bos_parm);
-                       OUT_STRING(hf_afs_bos_parm);
-                       OUT_STRING(hf_afs_bos_parm);
-                       OUT_STRING(hf_afs_bos_parm);
-                       OUT_STRING(hf_afs_bos_parm);
-                       OUT_STRING(hf_afs_bos_parm);
+                       OUT_RXString(hf_afs_bos_type);
+                       OUT_RXString(hf_afs_bos_instance);
+                       OUT_RXString(hf_afs_bos_parm);
+                       OUT_RXString(hf_afs_bos_parm);
+                       OUT_RXString(hf_afs_bos_parm);
+                       OUT_RXString(hf_afs_bos_parm);
+                       OUT_RXString(hf_afs_bos_parm);
+                       OUT_RXString(hf_afs_bos_parm);
                        break;
                case 81: /* delete b node */
-                       OUT_STRING(hf_afs_bos_instance);
+                       OUT_RXString(hf_afs_bos_instance);
                        break;
                case 82: /* set status */
-                       OUT_STRING(hf_afs_bos_instance);
+                       OUT_RXString(hf_afs_bos_instance);
                        OUT_UINT(hf_afs_bos_status);
                        break;
                case 83: /* get status */
-                       OUT_STRING(hf_afs_bos_instance);
+                       OUT_RXString(hf_afs_bos_instance);
                        break;
                case 84: /* enumerate instance */
                        OUT_UINT(hf_afs_bos_num);
                        break;
                case 85: /* get instance info */
-                       OUT_STRING(hf_afs_bos_instance);
+                       OUT_RXString(hf_afs_bos_instance);
                        break;
                case 86: /* get instance parm */
-                       OUT_STRING(hf_afs_bos_instance);
+                       OUT_RXString(hf_afs_bos_instance);
                        OUT_UINT(hf_afs_bos_num);
                        break;
                case 87: /* add super user */
-                       OUT_STRING(hf_afs_bos_user);
+                       OUT_RXString(hf_afs_bos_user);
                        break;
                case 88: /* delete super user */
-                       OUT_STRING(hf_afs_bos_user);
+                       OUT_RXString(hf_afs_bos_user);
                        break;
                case 89: /* list super users */
                        OUT_UINT(hf_afs_bos_num);
@@ -940,19 +957,19 @@ dissect_bos_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
                        OUT_UINT(hf_afs_bos_num);
                        break;
                case 93: /* set cell name */
-                       OUT_STRING(hf_afs_bos_content);
+                       OUT_RXString(hf_afs_bos_content);
                        break;
                case 95: /* set cell host */
                        OUT_UINT(hf_afs_bos_num);
                        break;
                case 96: /* add cell host */
-                       OUT_STRING(hf_afs_bos_content);
+                       OUT_RXString(hf_afs_bos_content);
                        break;
                case 97: /* delete cell host */
-                       OUT_STRING(hf_afs_bos_content);
+                       OUT_RXString(hf_afs_bos_content);
                        break;
                case 98: /* set t status */
-                       OUT_STRING(hf_afs_bos_content);
+                       OUT_RXString(hf_afs_bos_content);
                        OUT_UINT(hf_afs_bos_status);
                        break;
                case 99: /* shutdown all */
@@ -971,22 +988,22 @@ dissect_bos_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
                        /* no params */
                        break;
                case 104: /* restart */
-                       OUT_STRING(hf_afs_bos_instance);
+                       OUT_RXString(hf_afs_bos_instance);
                        break;
                case 105: /* install */
-                       OUT_STRING(hf_afs_bos_path);
+                       OUT_RXString(hf_afs_bos_path);
                        OUT_UINT(hf_afs_bos_size);
                        OUT_UINT(hf_afs_bos_flags);
                        OUT_UINT(hf_afs_bos_date);
                        break;
                case 106: /* uninstall */
-                       OUT_STRING(hf_afs_bos_path);
+                       OUT_RXString(hf_afs_bos_path);
                        break;
                case 107: /* get dates */
-                       OUT_STRING(hf_afs_bos_path);
+                       OUT_RXString(hf_afs_bos_path);
                        break;
                case 108: /* exec */
-                       OUT_STRING(hf_afs_bos_cmd);
+                       OUT_RXString(hf_afs_bos_cmd);
                        break;
                case 109: /* prune */
                        OUT_UINT(hf_afs_bos_flags);
@@ -999,13 +1016,13 @@ dissect_bos_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
                        OUT_UINT(hf_afs_bos_num);
                        break;
                case 112: /* get log */
-                       OUT_STRING(hf_afs_bos_file);
+                       OUT_RXString(hf_afs_bos_file);
                        break;
                case 113: /* wait all */
                        /* no params */
                        break;
                case 114: /* get instance strings */
-                       OUT_STRING(hf_afs_bos_content);
+                       OUT_RXString(hf_afs_bos_content);
                        break;
        }
 }
@@ -1014,27 +1031,27 @@ dissect_bos_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
  * VOL Helpers
  */
 static void
-dissect_vol_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_vol_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
                        case 121:
                                /* should loop here maybe */
                                OUT_UINT(hf_afs_vol_count);
-                               VECOUT(hf_afs_vol_name, 32); /* not sure on  */
+                               OUT_RXStringV(hf_afs_vol_name, 32); /* not sure on  */
                                break;
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_vol_errcode);
        }
 }
 
 static void
-dissect_vol_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_vol_request(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
@@ -1051,22 +1068,22 @@ dissect_vol_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
  * KAUTH Helpers
  */
 static void
-dissect_kauth_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_kauth_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_kauth_errcode);
        }
 }
 
 static void
-dissect_kauth_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_kauth_request(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
@@ -1082,25 +1099,25 @@ dissect_kauth_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o
                case 8: /* get entry */
                case 14: /* unlock */
                case 15: /* lock status */
-                       OUT_STRING(hf_afs_kauth_princ);
-                       OUT_STRING(hf_afs_kauth_realm);
+                       OUT_RXString(hf_afs_kauth_princ);
+                       OUT_RXString(hf_afs_kauth_realm);
                        OUT_BYTES_ALL(hf_afs_kauth_data);
                        break;
                case 3: /* getticket-old */
                case 23: /* getticket */
                        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);
+                       OUT_RXString(hf_afs_kauth_domain);
+                       OUT_BYTES_ALL(hf_afs_kauth_data);
+                       OUT_RXString(hf_afs_kauth_princ);
+                       OUT_RXString(hf_afs_kauth_realm);
                        break;
                case 4: /* set pass */
-                       OUT_STRING(hf_afs_kauth_princ);
-                       OUT_STRING(hf_afs_kauth_realm);
+                       OUT_RXString(hf_afs_kauth_princ);
+                       OUT_RXString(hf_afs_kauth_realm);
                        OUT_UINT(hf_afs_kauth_kvno);
                        break;
                case 12: /* get pass */
-                       OUT_STRING(hf_afs_kauth_name);
+                       OUT_RXString(hf_afs_kauth_name);
                        break;
        }
 }
@@ -1109,22 +1126,22 @@ dissect_kauth_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o
  * CB Helpers
  */
 static void
-dissect_cb_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_cb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_cb_errcode);
        }
 }
 
 static void
-dissect_cb_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_cb_request(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
@@ -1156,9 +1173,9 @@ dissect_cb_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
  * PROT Helpers
  */
 static void
-dissect_prot_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_prot_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
@@ -1184,7 +1201,7 @@ dissect_prot_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
 
                                        for (i=0; i<j; i++)
                                        {
-                                               VECOUT(hf_afs_prot_name, PRNAMEMAX);
+                                               OUT_RXStringV(hf_afs_prot_name, PRNAMEMAX);
                                        }
                                }
                                break;
@@ -1211,21 +1228,21 @@ dissect_prot_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                                break;
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_prot_errcode);
        }
 }
 
 static void
-dissect_prot_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_prot_request(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
        switch ( opcode )
        {
                case 500: /* new user */
-                       OUT_STRING(hf_afs_prot_name);
+                       OUT_RXString(hf_afs_prot_name);
                        OUT_UINT(hf_afs_prot_id);
                        OUT_UINT(hf_afs_prot_oldid);
                        break;
@@ -1256,7 +1273,7 @@ dissect_prot_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
 
                                for (i=0; i<j; i++)
                                {
-                                       VECOUT(hf_afs_prot_name,PRNAMEMAX);
+                                       OUT_RXStringV(hf_afs_prot_name,PRNAMEMAX);
                                }
                        }
                        break;
@@ -1274,7 +1291,7 @@ dissect_prot_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
                        }
                        break;
                case 509: /* new entry */
-                       OUT_STRING(hf_afs_prot_name);
+                       OUT_RXString(hf_afs_prot_name);
                        OUT_UINT(hf_afs_prot_flag);
                        OUT_UINT(hf_afs_prot_oldid);
                        break;
@@ -1284,13 +1301,13 @@ dissect_prot_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
                        break;
                case 513: /* change entry */
                        OUT_UINT(hf_afs_prot_id);
-                       OUT_STRING(hf_afs_prot_name);
+                       OUT_RXString(hf_afs_prot_name);
                        OUT_UINT(hf_afs_prot_oldid);
                        OUT_UINT(hf_afs_prot_newid);
                        break;
                case 520: /* update entry */
                        OUT_UINT(hf_afs_prot_id);
-                       OUT_STRING(hf_afs_prot_name);
+                       OUT_RXString(hf_afs_prot_name);
                        break;
        }
 }
@@ -1299,9 +1316,9 @@ dissect_prot_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
  * VLDB Helpers
  */
 static void
-dissect_vldb_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
@@ -1313,7 +1330,8 @@ dissect_vldb_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        case 504: /* get entry by name */
                                {
                                        int nservers,i,j;
-                                       VECOUT(hf_afs_vldb_name, VLNAMEMAX);
+                                       OUT_RXStringV(hf_afs_vldb_name, VLNAMEMAX);
+                                       SKIP(4);
                                        nservers = tvb_get_ntohl(tvb, offset);
                                        OUT_UINT(hf_afs_vldb_numservers);
                                        for (i=0; i<8; i++)
@@ -1344,6 +1362,8 @@ dissect_vldb_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                                        OUT_UINT(hf_afs_vldb_rwvol);
                                        OUT_UINT(hf_afs_vldb_rovol);
                                        OUT_UINT(hf_afs_vldb_bkvol);
+                                       OUT_UINT(hf_afs_vldb_clonevol);
+                                       OUT_VLDB_Flags();
                                }
                                break;
                        case 505: /* get new volume id */
@@ -1358,7 +1378,7 @@ dissect_vldb_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        case 519: /* get entry by name N */
                                {
                                        int nservers,i,j;
-                                       VECOUT(hf_afs_vldb_name, VLNAMEMAX);
+                                       OUT_RXStringV(hf_afs_vldb_name, VLNAMEMAX);
                                        nservers = tvb_get_ntohl(tvb, offset);
                                        OUT_UINT(hf_afs_vldb_numservers);
                                        for (i=0; i<13; i++)
@@ -1395,18 +1415,29 @@ dissect_vldb_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                        case 527: /* get entry by name u */
                                {
                                        int nservers,i,j;
-                                       VECOUT(hf_afs_vldb_name, VLNAMEMAX);
+                                       OUT_RXStringV(hf_afs_vldb_name, VLNAMEMAX);
                                        nservers = tvb_get_ntohl(tvb, offset);
                                        OUT_UINT(hf_afs_vldb_numservers);
                                        for (i=0; i<13; i++)
                                        {
                                                if ( i<nservers )
                                                {
-                                                       OUT_BYTES(hf_afs_vldb_serveruuid, 11*sizeof(guint32));
+                                                       OUT_UUID(hf_afs_vldb_serveruuid);
                                                }
                                                else
                                                {
-                                                       SKIP(11*sizeof(guint32));
+                                                       SKIP_UUID();
+                                               }
+                                       }
+                                       for (i=0; i<13; i++)
+                                       {
+                                               if ( i<nservers )
+                                               {
+                                                       OUT_UINT(hf_afs_vldb_serveruniq);
+                                               }
+                                               else
+                                               {
+                                                       SKIP(sizeof(guint32));
                                                }
                                        }
                                        for (i=0; i<13; i++)
@@ -1422,22 +1453,43 @@ dissect_vldb_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
                                                }
                                                SKIP(4);
                                        }
-                                       SKIP(13 * sizeof(guint32));
+                                       for (i=0; i<13; i++)
+                                       {
+                                               if ( i<nservers )
+                                               {
+                                                       OUT_UINT(hf_afs_vldb_serverflags);
+                                               }
+                                               else
+                                               {
+                                                       SKIP(sizeof(guint32));
+                                               }
+                                       }
                                        OUT_UINT(hf_afs_vldb_rwvol);
                                        OUT_UINT(hf_afs_vldb_rovol);
                                        OUT_UINT(hf_afs_vldb_bkvol);
+                                       OUT_UINT(hf_afs_vldb_clonevol);
+                                       OUT_UINT(hf_afs_vldb_flags);
+                                       OUT_UINT(hf_afs_vldb_spare1);
+                                       OUT_UINT(hf_afs_vldb_spare2);
+                                       OUT_UINT(hf_afs_vldb_spare3);
+                                       OUT_UINT(hf_afs_vldb_spare4);
+                                       OUT_UINT(hf_afs_vldb_spare5);
+                                       OUT_UINT(hf_afs_vldb_spare6);
+                                       OUT_UINT(hf_afs_vldb_spare7);
+                                       OUT_UINT(hf_afs_vldb_spare8);
+                                       OUT_UINT(hf_afs_vldb_spare9);
                                }
                                break;
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_vldb_errcode);
        }
 }
 
 static void
-dissect_vldb_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_vldb_request(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
@@ -1445,7 +1497,7 @@ dissect_vldb_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
        {
                case 501: /* create new volume */
                case 517: /* create entry N */
-                       VECOUT(hf_afs_vldb_name, VLNAMEMAX);
+                       OUT_RXStringV(hf_afs_vldb_name, VLNAMEMAX);
                        break;
                case 502: /* delete entry */
                case 503: /* get entry by id */
@@ -1460,7 +1512,7 @@ dissect_vldb_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
                case 519: /* get entry by name N */
                case 524: /* update entry by name */
                case 527: /* get entry by name U */
-                       OUT_STRING(hf_afs_vldb_name);
+                       OUT_RXString(hf_afs_vldb_name);
                        break;
                case 505: /* get new vol id */
                        OUT_UINT(hf_afs_vldb_bump);
@@ -1469,12 +1521,17 @@ dissect_vldb_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
                case 520: /* replace entry N */
                        OUT_UINT(hf_afs_vldb_id);
                        OUT_UINT(hf_afs_vldb_type);
-                       VECOUT(hf_afs_vldb_name, VLNAMEMAX);
+                       OUT_RXStringV(hf_afs_vldb_name, VLNAMEMAX);
                        break;
                case 510: /* list entry */
                case 521: /* list entry N */
                        OUT_UINT(hf_afs_vldb_index);
                        break;
+               case 532: /* regaddr */
+                       OUT_UUID(hf_afs_vldb_serveruuid);
+                       OUT_UINT(hf_afs_vldb_spare1);
+                       OUT_VLDB_BulkAddr();
+                       break;
        }
 }
 
@@ -1482,7 +1539,7 @@ dissect_vldb_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
  * UBIK Helpers
  */
 static void
-dissect_ubik_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_ubik_reply(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        switch ( opcode )
        {
@@ -1528,7 +1585,7 @@ dissect_ubik_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs
 }
 
 static void
-dissect_ubik_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_ubik_request(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
@@ -1607,22 +1664,22 @@ dissect_ubik_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
  * BACKUP Helpers
  */
 static void
-dissect_backup_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_backup_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode)
 {
-       if ( pinfo->ps.rx.type == RX_PACKET_TYPE_DATA )
+       if ( rxinfo->type == RX_PACKET_TYPE_DATA )
        {
                switch ( opcode )
                {
                }
        }
-       else if ( pinfo->ps.rx.type == RX_PACKET_TYPE_ABORT )
+       else if ( rxinfo->type == RX_PACKET_TYPE_ABORT )
        {
                OUT_UINT(hf_afs_backup_errcode);
        }
 }
 
 static void
-dissect_backup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int opcode)
+dissect_backup_request(tvbuff_t *tvb _U_, struct rxinfo *rxinfo _U_, proto_tree *tree _U_, int offset, int opcode)
 {
        offset += 4;  /* skip the opcode */
 
@@ -1653,6 +1710,7 @@ proto_register_afs(void)
                &ett_afs_volsync,
                &ett_afs_volumeinfo,
                &ett_afs_vicestat,
+               &ett_afs_vldb_flags,
        };
 
        proto_afs = proto_register_protocol("Andrew File System (AFS)",