diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-25 07:42:26 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-25 07:42:26 +0000 |
| commit | 40c5ed378fe8c500efe36717b4ef7fe9c30102f4 (patch) | |
| tree | a6a26b30c3725ce60138c644de65403f85e9b6b1 /packet-null.c | |
| parent | 2a0cd3825428646d640b6ea27660bb5f4d05589b (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-null.c')
| -rw-r--r-- | packet-null.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packet-null.c b/packet-null.c index 9c26f51294..ac910d9105 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,7 +1,7 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c,v 1.23 2000/05/19 05:18:26 guy Exp $ + * $Id: packet-null.c,v 1.24 2000/05/25 07:42:24 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -179,7 +179,7 @@ capture_null( const u_char *pd, packet_counts *ld ) /* * Hand it to PPP. */ - capture_ppp(pd, ld); + capture_ppp(pd, 0, ld); } else { /* * Treat it as a normal DLT_NULL header. @@ -236,8 +236,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Hand it to PPP. */ - tvb_compat(tvb, &next_pd, &next_offset); - dissect_ppp(next_pd, next_offset, pinfo->fd, tree); + dissect_ppp(tvb, pinfo, tree); } else { /* load the top pane info. This should be overwritten by |