diff options
| author | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-26 01:03:35 +0000 |
|---|---|---|
| committer | Ed Warnicke <hagbard@physics.rutgers.edu> | 2001-11-26 01:03:35 +0000 |
| commit | c97f7034a8c2bd2381e79de1d15119367482da8a (patch) | |
| tree | 99b3ffaa70424aad23a94ec9681dcce1582652f9 /packet-fr.c | |
| parent | cbf6148b227aa0700689d05f7f50994a62752d41 (diff) | |
Moved from using dissect_data to using call_dissector()
svn path=/trunk/; revision=4266
Diffstat (limited to 'packet-fr.c')
| -rw-r--r-- | packet-fr.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packet-fr.c b/packet-fr.c index d79628f6b1..115ad78bc0 100644 --- a/packet-fr.c +++ b/packet-fr.c @@ -3,7 +3,7 @@ * * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-fr.c,v 1.18 2001/06/18 02:17:46 guy Exp $ + * $Id: packet-fr.c,v 1.19 2001/11/26 01:03:35 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -92,6 +92,8 @@ static gint hf_fr_pid = -1; static gint hf_fr_snaptype = -1; static gint hf_fr_chdlctype = -1; +static dissector_handle_t data_handle; + static const true_false_string cmd_string = { "Command", "Response" @@ -349,7 +351,7 @@ static void dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo, next_tvb = tvb_new_subset(tvb,offset,-1,-1); if (!dissector_try_port(fr_subdissector_table,fr_nlpid, next_tvb, pinfo, tree)) - dissect_data(next_tvb, 0, pinfo, tree); + call_dissector(data_handle,next_tvb, pinfo, tree); break; } } @@ -357,12 +359,12 @@ static void dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo, static void dissect_lapf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_text(tree, tvb, 0, 0, "Frame relay lapf not yet implemented"); - dissect_data(tvb_new_subset(tvb,0,-1,-1),0,pinfo,tree); + call_dissector(data_handle,tvb_new_subset(tvb,0,-1,-1),pinfo,tree); } static void dissect_fr_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_text(tree, tvb, 0, 0, "Frame relay xid not yet implemented"); - dissect_data(tvb_new_subset(tvb,0,-1,-1),0,pinfo,tree); + call_dissector(data_handle,tvb_new_subset(tvb,0,-1,-1),pinfo,tree); } /* Register the protocol with Ethereal */ @@ -426,4 +428,5 @@ void proto_reg_handoff_fr(void) { dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, dissect_fr, proto_fr); dissector_add("gre.proto", GRE_FR, dissect_fr, proto_fr); + data_handle = find_dissector("data"); } |