aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ascend.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2000-05-25 07:42:26 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2000-05-25 07:42:26 +0000
commit40c5ed378fe8c500efe36717b4ef7fe9c30102f4 (patch)
treea6a26b30c3725ce60138c644de65403f85e9b6b1 /packet-ascend.c
parent2a0cd3825428646d640b6ea27660bb5f4d05589b (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. svn path=/trunk/; revision=1998
Diffstat (limited to 'packet-ascend.c')
-rw-r--r--packet-ascend.c7
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);