aboutsummaryrefslogtreecommitdiffstats
path: root/packet-rpc.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-08-21 21:10:10 +0000
committerGuy Harris <guy@alum.mit.edu>2002-08-21 21:10:10 +0000
commitec975908e21dff2b59247fb756dec695ae5c61ba (patch)
treeb40d5ab89c50c8d6da520dda5614dbb68e0d0007 /packet-rpc.c
parent5d4d48242a10a42dd242e7fa82cded1904e5871d (diff)
Make a common routine for dissecting GSS-API tokens, and call it for
GSS-API tokens in RPCSEC_GSS_INIT and RPCSEC_GSS_CONTINUE_INIT arguments and results. svn path=/trunk/; revision=6051
Diffstat (limited to 'packet-rpc.c')
-rw-r--r--packet-rpc.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/packet-rpc.c b/packet-rpc.c
index 2c3e8389be..2b533f73b8 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.99 2002/08/21 21:05:08 guy Exp $
+ * $Id: packet-rpc.c,v 1.100 2002/08/21 21:10:10 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1003,7 +1003,7 @@ dissect_rpc_verf(tvbuff_t* tvb, proto_tree* tree, int offset, int msg_type)
}
static int
-dissect_rpc_authgss_initarg(tvbuff_t* tvb, proto_tree* tree, int offset)
+dissect_rpc_authgss_token(tvbuff_t* tvb, proto_tree* tree, int offset)
{
/*
* XXX - should this use the GSS-API token dissector?
@@ -1017,6 +1017,12 @@ dissect_rpc_authgss_initarg(tvbuff_t* tvb, proto_tree* tree, int offset)
}
static int
+dissect_rpc_authgss_initarg(tvbuff_t* tvb, proto_tree* tree, int offset)
+{
+ return dissect_rpc_authgss_token(tvb, tree, offset);
+}
+
+static int
dissect_rpc_authgss_initres(tvbuff_t* tvb, proto_tree* tree, int offset)
{
int major, minor, window;
@@ -1042,8 +1048,7 @@ dissect_rpc_authgss_initres(tvbuff_t* tvb, proto_tree* tree, int offset)
offset+0, 4, window);
offset += 4;
- offset = dissect_rpc_data(tvb, tree, hf_rpc_authgss_token,
- offset);
+ offset = dissect_rpc_authgss_token(tvb, tree, offset);
return offset;
}