* 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.
+ * www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs.c,v 1.32 2001/06/18 01:49:16 guy Exp $
+ * $Id: packet-afs.c,v 1.54 2003/03/05 09:52:22 sahlberg 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;
struct afs_request_val {
guint32 opcode;
+ guint req_num;
+ guint rep_num;
+ nstime_t req_time;
};
-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);
/*
static gint
afs_equal(gconstpointer v, gconstpointer w)
{
- struct afs_request_key *v1 = (struct afs_request_key *)v;
- struct afs_request_key *v2 = (struct afs_request_key *)w;
+ const struct afs_request_key *v1 = (const struct afs_request_key *)v;
+ const struct afs_request_key *v2 = (const struct afs_request_key *)w;
if (v1 -> conversation == v2 -> conversation &&
v1 -> service == v2 -> service &&
static guint
afs_hash (gconstpointer v)
{
- struct afs_request_key *key = (struct afs_request_key *)v;
+ const struct afs_request_key *key = (const struct afs_request_key *)v;
guint val;
val = key -> conversation + key -> service + key -> callnumber;
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;
- struct afs_request_val *request_val;
+ struct afs_request_val *request_val=NULL;
proto_tree *afs_tree, *afs_op_tree, *ti;
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);
+ nstime_t ns;
+ 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 );
/*
pinfo->srcport, pinfo->destport, 0);
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);
+ conversation = conversation_new(&pinfo->src, &pinfo->dst,
+ 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.conversation = conversation->index;
+ 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);
/* only allocate a new hash element when it's a request */
opcode = 0;
- if ( !request_val && !reply) {
- new_request_key = g_mem_chunk_alloc(afs_request_keys);
- *new_request_key = request_key;
-
- request_val = g_mem_chunk_alloc(afs_request_vals);
- request_val -> opcode = tvb_get_ntohl(tvb, offset);
-
- g_hash_table_insert(afs_request_hash, new_request_key,
- request_val);
+ if(!pinfo->fd->flags.visited){
+ if ( !request_val && !reply) {
+ new_request_key = g_mem_chunk_alloc(afs_request_keys);
+ *new_request_key = request_key;
+
+ request_val = g_mem_chunk_alloc(afs_request_vals);
+ request_val -> opcode = tvb_get_ntohl(tvb, offset);
+ request_val -> req_num = pinfo->fd->num;
+ request_val -> rep_num = 0;
+ request_val -> req_time.secs=pinfo->fd->abs_secs;
+ request_val -> req_time.nsecs=pinfo->fd->abs_usecs*1000;
+
+ g_hash_table_insert(afs_request_hash, new_request_key,
+ request_val);
+ }
+ if( request_val && reply ) {
+ request_val -> rep_num = pinfo->fd->num;
+ }
}
if ( request_val ) {
opcode = request_val->opcode;
}
+
node = 0;
typenode = 0;
vals = NULL;
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 - " : "",
val_to_str(port, port_types, "Unknown(%d)"),
reply ? "Reply" : "Request");
+ if( request_val && !reply && request_val->rep_num) {
+ proto_tree_add_uint_format(afs_tree, hf_afs_repframe,
+ tvb, 0, 0, request_val->rep_num,
+ "The reply to this request is in frame %u",
+ request_val->rep_num);
+ }
+ if( request_val && reply && request_val->rep_num) {
+ proto_tree_add_uint_format(afs_tree, hf_afs_reqframe,
+ tvb, 0, 0, request_val->req_num,
+ "This is a reply to a request in frame %u",
+ request_val->req_num);
+ ns.secs= pinfo->fd->abs_secs-request_val->req_time.secs;
+ ns.nsecs=pinfo->fd->abs_usecs*1000-request_val->req_time.nsecs;
+ if(ns.nsecs<0){
+ ns.nsecs+=1000000000;
+ ns.secs--;
+ }
+ proto_tree_add_time(afs_tree, hf_afs_time, tvb, offset, 0,
+ &ns);
+ }
+
+
if ( VALID_OPCODE(opcode) ) {
/* 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,
ti = proto_tree_add_text(afs_tree, tvb,
offset, 0, "Operation: Unknown");
}
-
+
/* Add the subtree for this particular service */
afs_op_tree = proto_item_add_subtree(ti, ett_afs_op);
-
+
+
if ( typenode != 0 ) {
/* indicate the type of request */
proto_tree_add_boolean_hidden(afs_tree, typenode, tvb, offset, 0, 1);
}
-
+
/* 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);
}
}
}
/* 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 ){
}
}
* 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. */
-static int
-dissect_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
+/*
+ * 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, struct rxinfo *rxinfo _U_, proto_tree *tree, int offset)
{
int old_offset;
gint32 bytes;
OUT_UINT(hf_afs_fs_acl_datasize);
- if (sscanf((char *) GETSTR, "%d %n", &pos, &n) != 1) {
- /* does not matter what we return, if this fails,
+ if (sscanf(GETSTR, "%d %n", &pos, &n) != 1) {
+ /* does not matter what we return, if this fails,
* we cant dissect anything else in the packet either.
*/
return offset;
}
- proto_tree_add_uint(tree, hf_afs_fs_acl_count_positive, tvb,
+ proto_tree_add_uint(tree, hf_afs_fs_acl_count_positive, tvb,
offset, n, pos);
offset += n;
- if (sscanf((char *) GETSTR, "%d %n", &neg, &n) != 1) {
+ if (sscanf(GETSTR, "%d %n", &neg, &n) != 1) {
return offset;
}
- proto_tree_add_uint(tree, hf_afs_fs_acl_count_negative, tvb,
+ proto_tree_add_uint(tree, hf_afs_fs_acl_count_negative, tvb,
offset, n, neg);
offset += n;
* This wacky order preserves the order used by the "fs" command
*/
for (i = 0; i < pos; i++) {
- if (sscanf((char *) GETSTR,
- "%127s %d %n", user, &acl, &n) != 2) {
+ if (sscanf(GETSTR, "%127s %d %n", user, &acl, &n) != 2) {
return offset;
}
ACLOUT(user,1,acl,n);
offset += n;
}
for (i = 0; i < neg; i++) {
- if (sscanf((char *) GETSTR,
- "%127s %d %n", user, &acl, &n) != 2) {
+ if (sscanf(GETSTR, "%127s %d %n", user, &acl, &n) != 2) {
return offset;
}
ACLOUT(user,0,acl,n);
*/
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();
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;
OUT_FS_AFSFetchStatus("Status");
OUT_FS_AFSCallBack();
OUT_FS_AFSVolSync();
- break;
+ break;
case 133: /* Store data */
case 134: /* Store ACL */
case 135: /* Store status */
case 145: /* old release lock */
case 147: /* give up callbacks */
case 150: /* set volume status */
- case 152: /* check token */
+ case 152: /* check token */
/* nothing returned */
break;
case 146: /* get statistics */
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;
break;
case 160: /* get xstats */
OUT_UINT(hf_afs_fs_xstats_version);
- OUT_DATE(hf_afs_fs_xstats_timestamp);
+ OUT_TIMESECS(hf_afs_fs_xstats_timestamp);
OUT_FS_AFS_CollData();
break;
case 162: /* flush cps */
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 )
{
break;
case 131: /* Fetch ACL */
OUT_FS_AFSFid("Target");
- break;
+ break;
case 132: /* Fetch Status */
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");
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");
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);
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 */
/* 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();
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();
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;
}
* 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 )
{
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 */
/* 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);
/* 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 */
/* no output */
break;
case 107: /* get dates */
- OUT_DATE(hf_afs_bos_newtime);
- OUT_DATE(hf_afs_bos_baktime);
- OUT_DATE(hf_afs_bos_oldtime);
+ OUT_TIMESECS(hf_afs_bos_newtime);
+ OUT_TIMESECS(hf_afs_bos_baktime);
+ OUT_TIMESECS(hf_afs_bos_oldtime);
break;
case 108: /* exec */
/* no output */
/* 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_UINT(hf_afs_bos_status);
+ OUT_RXString(hf_afs_bos_instance);
+ OUT_INT(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);
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_UINT(hf_afs_bos_status);
+ OUT_RXString(hf_afs_bos_content);
+ OUT_INT(hf_afs_bos_status);
break;
case 99: /* shutdown all */
/* no params */
/* 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);
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;
}
}
* 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 */
* 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 */
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_KAUTH_GetTicket();
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;
}
}
* 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 */
* 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 )
{
for (i=0; i<j; i++)
{
- VECOUT(hf_afs_prot_name, PRNAMEMAX);
+ OUT_RXStringV(hf_afs_prot_name, PRNAMEMAX);
}
}
break;
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;
for (i=0; i<j; i++)
{
- VECOUT(hf_afs_prot_name,PRNAMEMAX);
+ OUT_RXStringV(hf_afs_prot_name,PRNAMEMAX);
}
}
break;
}
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;
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;
}
}
* 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 )
{
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++)
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 */
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++)
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_UUID();
+ }
+ }
+ for (i=0; i<13; i++)
+ {
+ if ( i<nservers )
+ {
+ OUT_UINT(hf_afs_vldb_serveruniq);
}
else
{
- SKIP(11*sizeof(guint32));
+ SKIP(sizeof(guint32));
}
}
for (i=0; i<13; i++)
}
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 */
{
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 */
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);
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;
}
}
* 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 )
{
}
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 */
{
case 10000: /* vote-beacon */
OUT_UINT(hf_afs_ubik_state);
- OUT_DATE(hf_afs_ubik_votestart);
+ OUT_TIMESECS(hf_afs_ubik_votestart);
OUT_UBIKVERSION("DB Version");
OUT_UBIKVERSION("TID");
break;
* 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 */
&ett_afs_volsync,
&ett_afs_volumeinfo,
&ett_afs_vicestat,
+ &ett_afs_vldb_flags,
};
proto_afs = proto_register_protocol("Andrew File System (AFS)",
git.samba.org / obnox / wireshark / wip.git / blobdiff