diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 22:04:18 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 22:04:18 +0000 |
| commit | 0c39c03bf544a6968d896818561fd591fdc659e7 (patch) | |
| tree | 853ffae2bc0ebc521cbbb8167d96ef24911aea71 /packet-atm.c | |
| parent | a74c39f9b1656fc7781e7b7e98f8604ec3e36524 (diff) | |
| download | wireshark-0c39c03bf544a6968d896818561fd591fdc659e7.tar.gz wireshark-0c39c03bf544a6968d896818561fd591fdc659e7.tar.bz2 wireshark-0c39c03bf544a6968d896818561fd591fdc659e7.zip | |
Convert LLC dissector to use tvbuffs.
Non-tvbuff dissectors create a tvbuff when calling dissect_llc()
Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi")
Changed short text to be: [Short Frame: %s] where %s is current_proto.
svn path=/trunk/; revision=1943
Diffstat (limited to 'packet-atm.c')
| -rw-r--r-- | packet-atm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packet-atm.c b/packet-atm.c index c0a111c86c..60f7f91715 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,7 +1,7 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c,v 1.14 2000/05/11 08:14:56 gram Exp $ + * $Id: packet-atm.c,v 1.15 2000/05/11 22:04:15 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -549,6 +549,7 @@ dissect_atm(const u_char *pd, frame_data *fd, proto_tree *tree) proto_item *ti; guint aal_type; guint hl_type; + tvbuff_t* next_tvb; aal_type = fd->pseudo_header.ngsniffer_atm.AppTrafType & ATT_AALTYPE; hl_type = fd->pseudo_header.ngsniffer_atm.AppTrafType & ATT_HLTYPE; @@ -712,7 +713,8 @@ dissect_atm(const u_char *pd, frame_data *fd, proto_tree *tree) /* Dissect as WTAP_ENCAP_ATM_RFC1483 */ /* The ATM iptrace capture that we have hows LLC at this point, * so that's what I'm calling */ - dissect_llc(pd, offset, fd, tree); + next_tvb = tvb_new_subset(pi.compat_top_tvb, offset, -1); + dissect_llc(next_tvb, &pi, tree); break; case ATT_HL_LANE: |