diff options
| author | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-05-25 07:42:26 +0000 |
|---|---|---|
| committer | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-05-25 07:42:26 +0000 |
| commit | 6513429730709ee279498d674b1a222361f4e51c (patch) | |
| tree | a6a26b30c3725ce60138c644de65403f85e9b6b1 /packet-ascend.c | |
| parent | 243fe77f8af9f692b12f476485c924550cc93780 (diff) | |
Convert dissect_ppp() and friends to use tvbuffs.
(the ip_tcp_options stuff is still non-tvbuff until I convert ip and tcp).
Add preliminary fix for Linux ISDN ippp devices (similar watch was posted
to ethereal-users, but did not use tvbuffs).
Change packet-raw.c to call capture_ppp()/dissect_ppp() in the case
where the frame starts with FF:03. We had been calling
capture_ip()/dissect_ip() at byte offset 4, but I think this is for
historical reasons of packet-raw.c and packet-ip.c existing before
packet-ppp.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1998 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-ascend.c')
| -rw-r--r-- | packet-ascend.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/packet-ascend.c b/packet-ascend.c index 2bd557aa4b..c4561532ba 100644 --- a/packet-ascend.c +++ b/packet-ascend.c @@ -1,7 +1,7 @@ /* packet-ascend.c * Routines for decoding Lucent/Ascend packet traces * - * $Id: packet-ascend.c,v 1.14 2000/05/19 23:06:08 gram Exp $ + * $Id: packet-ascend.c,v 1.15 2000/05/25 07:42:24 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -57,8 +57,6 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *fh_tree; proto_item *ti; - const guint8 *pd; - int offset; union wtap_pseudo_header *pseudo_header = pinfo->pseudo_header; pinfo->current_proto = "Lucent/Ascend"; @@ -100,8 +98,7 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pseudo_header->ascend.type) { case ASCEND_PFX_WDS_X: case ASCEND_PFX_WDS_R: - tvb_compat(tvb, &pd, &offset); - dissect_ppp(pd, offset, pinfo->fd, tree); + dissect_ppp(tvb, pinfo, tree); break; case ASCEND_PFX_WDD: dissect_eth(tvb, pinfo, tree); |