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 /capture.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 'capture.c')
-rw-r--r-- | capture.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.104 2000/05/19 22:37:57 guy Exp $ + * $Id: capture.c,v 1.105 2000/05/25 07:42:23 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -987,7 +987,7 @@ capture_pcap_cb(u_char *user, const struct pcap_pkthdr *phdr, capture_null(pd, &ld->counts); break; case WTAP_ENCAP_PPP: - capture_ppp(pd, &ld->counts); + capture_ppp(pd, 0, &ld->counts); break; case WTAP_ENCAP_RAW_IP: capture_raw(pd, &ld->counts); |