* 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.43 2002/02/08 22:36:21 nneul 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 <epan/packet.h>
(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, struct rxinfo *rxinfo,
+static int dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo,
proto_tree *tree, int offset);
-static void dissect_fs_reply(tvbuff_t *tvb, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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, struct rxinfo *rxinfo,
+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;
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;
+ nstime_t ns;
+
void (*dissector)(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode);
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,
+ conversation = conversation_new(&pinfo->src, &pinfo->dst,
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
}
- request_key.conversation = conversation->index;
+ request_key.conversation = conversation->index;
request_key.service = rxinfo->serviceid;
request_key.callnumber = rxinfo->callnumber;
/* 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;
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;
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, rxinfo, afs_op_tree, offset, opcode);
* 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, struct rxinfo *rxinfo, 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);
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 155: /* bulk status */
OUT_FS_AFSBulkStats();
- SKIP(4);
+ 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;
case 131: /* Fetch ACL */
OUT_FS_AFSFid("Target");
- break;
+ break;
case 132: /* Fetch Status */
OUT_FS_AFSFid("Target");
break;
/* 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 */
}
static void
-dissect_bos_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 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 */
break;
case 82: /* set status */
OUT_RXString(hf_afs_bos_instance);
- OUT_UINT(hf_afs_bos_status);
+ OUT_INT(hf_afs_bos_status);
break;
case 83: /* get status */
OUT_RXString(hf_afs_bos_instance);
break;
case 98: /* set t status */
OUT_RXString(hf_afs_bos_content);
- OUT_UINT(hf_afs_bos_status);
+ OUT_INT(hf_afs_bos_status);
break;
case 99: /* shutdown all */
/* no params */
}
static void
-dissect_vol_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 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 */
}
static void
-dissect_kauth_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 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 */
break;
case 3: /* getticket-old */
case 23: /* getticket */
- OUT_UINT(hf_afs_kauth_kvno);
- OUT_RXString(hf_afs_kauth_domain);
- OUT_RXString(hf_afs_kauth_data);
- OUT_RXString(hf_afs_kauth_princ);
- OUT_RXString(hf_afs_kauth_realm);
+ OUT_KAUTH_GetTicket();
break;
case 4: /* set pass */
OUT_RXString(hf_afs_kauth_princ);
}
static void
-dissect_cb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 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 */
}
static void
-dissect_prot_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 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 */
}
static void
-dissect_vldb_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 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 */
* UBIK Helpers
*/
static void
-dissect_ubik_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, 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, struct rxinfo *rxinfo, 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;
}
static void
-dissect_backup_request(tvbuff_t *tvb, struct rxinfo *rxinfo, 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 */
git.samba.org / obnox / wireshark / wip.git / blobdiff