diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-09-21 04:41:37 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-09-21 04:41:37 +0000 |
| commit | c312f69abcbd44c8ca982f16d086c5bef05783f7 (patch) | |
| tree | a96809a3c62e1475a013044d5a312bfc58622083 /capture.c | |
| parent | 66752e74e9cd57d06556d6d2f093514e1102b634 (diff) | |
Make sure to pass the sent/received direction from pppdump.c in
pseudo_header.
Use generic "p2p_phdr" instead of "lapd_phdr". Modify toshiba.c and
packet-lapd.c to take that into account.
Add frame.p2p_dir, a filterable field, 0=sent, 1=recvd
Make p2p_dir available in packe_info, as I think it will be needed
in VJ COMP and UNCOMP dissection.
Rename WTAP_ENCAP_TR to WTAP_ENCAP_TOKEN_RING.
Mention pppd-log support in man page.
Mention atmsnoop in README.
svn path=/trunk/; revision=2455
Diffstat (limited to 'capture.c')
| -rw-r--r-- | capture.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.126 2000/09/17 03:20:03 guy Exp $ + * $Id: capture.c,v 1.127 2000/09/21 04:41:06 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -988,7 +988,7 @@ pipe_dispatch(int fd, loop_data *ld, struct pcap_hdr *hdr) case WTAP_ENCAP_FDDI_BITSWAPPED: capture_fddi(pd, &ld->counts); break; - case WTAP_ENCAP_TR: + case WTAP_ENCAP_TOKEN_RING: capture_tr(pd, 0, &ld->counts); break; case WTAP_ENCAP_NULL: @@ -1578,7 +1578,7 @@ capture_pcap_cb(u_char *user, const struct pcap_pkthdr *phdr, case WTAP_ENCAP_FDDI_BITSWAPPED: capture_fddi(pd, &ld->counts); break; - case WTAP_ENCAP_TR: + case WTAP_ENCAP_TOKEN_RING: capture_tr(pd, 0, &ld->counts); break; case WTAP_ENCAP_NULL: |