diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-02 01:15:13 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-02 01:15:13 +0000 |
| commit | f6934a4ae1cfa48c6b5aa09fe68cbd538fdc06ad (patch) | |
| tree | cefd7da09b10bdb41c9e8f7e2ae293a0a4e56b06 /epan/dissectors/packet-rpc.c | |
| parent | 2f78757f42923341d019d97dc5daae96189fb9dc (diff) | |
Remove rpc_defrag.h
Move the #defines to packet-rpc.h and pull the functions into packet-rpc.c since they aren't used by any dissectors.
svn path=/trunk/; revision=53040
Diffstat (limited to 'epan/dissectors/packet-rpc.c')
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 1c160c9232..e8edba979a 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -43,7 +43,6 @@ #include "packet-rpc.h" #include "packet-tcp.h" -#include <epan/dissectors/rpc_defrag.h> #include "packet-nfs.h" /* @@ -298,7 +297,12 @@ GHashTable *rpc_progs = NULL; /* Hash table with info on RPC procedure numbers */ GHashTable *rpc_procs = NULL; +typedef gboolean (*rec_dissector_t)(tvbuff_t *, packet_info *, proto_tree *, + tvbuff_t *, fragment_head *, gboolean, guint32, gboolean); + static void dissect_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +static void show_rpc_fraginfo(tvbuff_t *tvb, tvbuff_t *frag_tvb, proto_tree *tree, + guint32 rpc_rm, fragment_head *ipfd_head, packet_info *pinfo); /***********************************/ /* Hash array with procedure names */ @@ -3080,7 +3084,7 @@ call_message_dissector(tvbuff_t *tvb, tvbuff_t *rec_tvb, packet_info *pinfo, return rpc_succeeded; } -int +static int dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, rec_dissector_t dissector, gboolean is_heur, int proto, int ett, gboolean defragment, gboolean first_pdu, struct tcpinfo *tcpinfo) |