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 /wiretap/netmon.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 'wiretap/netmon.c')
| -rw-r--r-- | wiretap/netmon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 337c4a8c34..7a56d7b3a4 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -1,6 +1,6 @@ /* netmon.c * - * $Id: netmon.c,v 1.33 2000/09/07 05:34:12 gram Exp $ + * $Id: netmon.c,v 1.34 2000/09/21 04:41:32 gram Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -108,7 +108,7 @@ int netmon_open(wtap *wth, int *err) static const int netmon_encap[] = { WTAP_ENCAP_UNKNOWN, WTAP_ENCAP_ETHERNET, - WTAP_ENCAP_TR, + WTAP_ENCAP_TOKEN_RING, WTAP_ENCAP_FDDI_BITSWAPPED, WTAP_ENCAP_UNKNOWN, /* WAN */ WTAP_ENCAP_UNKNOWN, /* LocalTalk */ @@ -412,7 +412,7 @@ netmon_close(wtap *wth) static const int wtap_encap[] = { -1, /* WTAP_ENCAP_UNKNOWN -> unsupported */ 1, /* WTAP_ENCAP_ETHERNET -> NDIS Ethernet */ - 2, /* WTAP_ENCAP_TR -> NDIS Token Ring */ + 2, /* WTAP_ENCAP_TOKEN_RING -> NDIS Token Ring */ -1, /* WTAP_ENCAP_SLIP -> unsupported */ -1, /* WTAP_ENCAP_PPP -> unsupported */ 3, /* WTAP_ENCAP_FDDI -> NDIS FDDI */ |