diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-02-09 06:49:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-02-09 06:49:29 +0000 |
| commit | f190eff05613c061629baab462a28cb0be98ed71 (patch) | |
| tree | 170c3bd3fce47ebb4e946009b5669c3baa133b84 /packet-rpc.h | |
| parent | a6216089a8774cbe2644d99c1220bbdb0f25c242 (diff) | |
Make a "dissect_rpc_indir_call()" routine to dissect arguments to a
specified program/version/procedure, and a "rpc_proc_name()" routine to
return the name of a specified program/version/procedure, and make the
callit dissector use those, rather than doing the work itself.
Un-export various routines and declarations that can again be private to
the RPC dissector.
svn path=/trunk/; revision=3007
Diffstat (limited to 'packet-rpc.h')
| -rw-r--r-- | packet-rpc.h | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/packet-rpc.h b/packet-rpc.h index 1f3db02932..d873b78a84 100644 --- a/packet-rpc.h +++ b/packet-rpc.h @@ -1,6 +1,6 @@ /* packet-rpc.h * - * $Id: packet-rpc.h,v 1.24 2001/02/06 06:46:10 guy Exp $ + * $Id: packet-rpc.h,v 1.25 2001/02/09 06:49:29 guy Exp $ * * (c) 1999 Uwe Girlich * @@ -88,41 +88,13 @@ typedef struct _vsff { dissect_function_t *dissect_reply; } vsff; -/* - * These are used by the CALLIT handler for the portmapper dissector. - */ -typedef struct _rpc_proc_info_key { - guint32 prog; - guint32 vers; - guint32 proc; -} rpc_proc_info_key; - -typedef struct _rpc_proc_info_value { - gchar *name; - gboolean is_old_dissector; - union { - old_dissect_function_t *old; - dissect_function_t *new; - } dissect_call; - union { - old_dissect_function_t *old; - dissect_function_t *new; - } dissect_reply; -} rpc_proc_info_value; - -/* Hash table with info on RPC procedure numbers */ -GHashTable *rpc_procs; - extern const value_string rpc_auth_flavor[]; extern void old_rpc_init_proc_table(guint prog, guint vers, const old_vsff *proc_table); extern void rpc_init_proc_table(guint prog, guint vers, const vsff *proc_table); extern void rpc_init_prog(int proto, guint32 prog, int ett); extern char *rpc_prog_name(guint32 prog); -extern int call_dissect_function(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, int offset, - old_dissect_function_t *old_dissect_function, - dissect_function_t* dissect_function, const char *progname); +extern char *rpc_proc_name(guint32 prog, guint32 vers, guint32 proc); extern unsigned int rpc_roundup(unsigned int a); extern int dissect_rpc_bool(const u_char *pd, int offset, frame_data *fd, @@ -150,6 +122,8 @@ extern int dissect_rpc_uint64(const u_char *pd, int offset, frame_data *fd, extern int dissect_rpc_uint64_tvb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int hfindex, int offset); +extern int dissect_rpc_indir_call(tvbuff_t *tvb, packet_info *pinfo, + proto_tree *tree, int offset, guint32 prog, guint32 vers, guint32 proc); #endif /* packet-rpc.h */ |