aboutsummaryrefslogtreecommitdiffstats
path: root/packet-rpc.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-01-12 10:24:47 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-01-12 10:24:47 +0000
commiteaa1cf2ea26f6d669a41559667f93504236cc7cb (patch)
tree0912cc4ec72ee4b73a251e1d04cdedf309d35d23 /packet-rpc.c
parent8d23398cc4b3173bd4ea867c387ebdf94935f26c (diff)
From Ronnie Sahlberg: file handle to file name resolution in NFS and
related protocols. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4533 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-rpc.c')
-rw-r--r--packet-rpc.c30
1 files changed, 9 insertions, 21 deletions
diff --git a/packet-rpc.c b/packet-rpc.c
index f8da93d0a3..a7abcf52b7 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
* Routines for rpc dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
*
- * $Id: packet-rpc.c,v 1.80 2002/01/10 08:06:25 guy Exp $
+ * $Id: packet-rpc.c,v 1.81 2002/01/12 10:24:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -383,26 +383,6 @@ typedef struct _rpc_call_info_key {
static GMemChunk *rpc_call_info_key_chunk;
-typedef enum {
- FLAVOR_UNKNOWN, /* authentication flavor unknown */
- FLAVOR_NOT_GSSAPI, /* flavor isn't GSSAPI */
- FLAVOR_GSSAPI_NO_INFO, /* flavor is GSSAPI, procedure & service unknown */
- FLAVOR_GSSAPI /* flavor is GSSAPI, procedure & service known */
-} flavor_t;
-
-typedef struct _rpc_call_info_value {
- guint32 req_num; /* frame number of first request seen */
- guint32 rep_num; /* frame number of first reply seen */
- guint32 prog;
- guint32 vers;
- guint32 proc;
- flavor_t flavor;
- guint32 gss_proc;
- guint32 gss_svc;
- rpc_proc_info_value* proc_info;
- nstime_t req_time;
-} rpc_call_info_value;
-
static GMemChunk *rpc_call_info_value_chunk;
static GHashTable *rpc_calls;
@@ -1523,6 +1503,9 @@ dissect_rpc_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
conversation, so it's probably not an RPC reply. */
return FALSE;
}
+ /* pass rpc_info to subdissectors */
+ rpc_call->request=FALSE;
+ pinfo->private_data=rpc_call;
break;
default:
@@ -1758,6 +1741,7 @@ dissect_rpc_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
rpc_call->prog = prog;
rpc_call->vers = vers;
rpc_call->proc = proc;
+ rpc_call->xid = xid;
rpc_call->flavor = flavor;
rpc_call->gss_proc = gss_proc;
rpc_call->gss_svc = gss_svc;
@@ -1775,6 +1759,10 @@ dissect_rpc_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset = dissect_rpc_cred(tvb, pinfo, rpc_tree, offset);
offset = dissect_rpc_verf(tvb, pinfo, rpc_tree, offset, msg_type);
+ /* pass rpc_info to subdissectors */
+ rpc_call->request=TRUE;
+ pinfo->private_data=rpc_call;
+
/* go to the next dissector */
break; /* end of RPC call */