diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-07 22:18:32 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-07 22:18:32 +0000 |
| commit | 9bdb0a0656ba156441df889f46226c98963be80d (patch) | |
| tree | 22297aac3c79a9864464f56be1c9d995354b5bd0 /packet-fr.c | |
| parent | 17c8adb017fd3fa2ace900e2c7120837ef55b1e5 (diff) | |
Fix the Frame Relay dissector to call subdissectors regardless of
whether a full protocol tree dissection is being done or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2843 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-fr.c')
| -rw-r--r-- | packet-fr.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/packet-fr.c b/packet-fr.c index c64b1d5251..96019ecacd 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.1 2001/01/07 22:08:31 guy Exp $ + * $Id: packet-fr.c,v 1.2 2001/01/07 22:18:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -84,26 +84,25 @@ static void dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(fr_tree, hf_fr_becn, tvb, 1, 1, fr_header); proto_tree_add_boolean(fr_tree, hf_fr_de, tvb, 1, 1, fr_header); proto_tree_add_uint(fr_tree, hf_fr_proto,tvb, 2, 2, fr_proto ); + } - next_tvb = tvb_new_subset(tvb,4, -1 , -1); + next_tvb = tvb_new_subset(tvb, 4, -1, -1); - switch (fr_proto){ -/* case 0x0703: - dissect_lmi(next_tvb,pinfo,tree); - break; + switch (fr_proto){ +/* case 0x0703: + dissect_lmi(next_tvb,pinfo,tree); + break; this is not yet implemented */ - case 0x0800: - dissect_ip(next_tvb,pinfo,tree); - break; - case 0x8137: - dissect_ipx(next_tvb,pinfo,tree); - break; - default: - dissect_data(next_tvb,0,pinfo,tree); - break; - } - + case 0x0800: + dissect_ip(next_tvb,pinfo,tree); + break; + case 0x8137: + dissect_ipx(next_tvb,pinfo,tree); + break; + default: + dissect_data(next_tvb,0,pinfo,tree); + break; } return; } |