diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-01-27 14:54:09 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-01-27 14:54:09 +0000 |
| commit | 4e1c7318cb46657e9dc0aba44174299d6e7c5c58 (patch) | |
| tree | af901d190d1e2782101a7fca5d1c99fdfe6f4fd3 /wiretap | |
| parent | a5d3ee40369fa8049e69680f202ab035a1e2a93c (diff) | |
Added token-ring support to netmon.c
svn path=/trunk/; revision=176
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/ChangeLog | 3 | ||||
| -rw-r--r-- | wiretap/README | 7 | ||||
| -rw-r--r-- | wiretap/netmon.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/wiretap/ChangeLog b/wiretap/ChangeLog index b8b8c40b6d..f7a9bf4a8a 100644 --- a/wiretap/ChangeLog +++ b/wiretap/ChangeLog @@ -1,3 +1,6 @@ +January 27, 1999 + Added token-ring support in netmon.c + January 19, 1999 Changed number of arguments of wtap_open_offline(). diff --git a/wiretap/README b/wiretap/README index 29a93ddd01..bca62afb69 100644 --- a/wiretap/README +++ b/wiretap/README @@ -1,4 +1,4 @@ -$Id: README,v 1.7 1999/01/21 05:07:44 gram Exp $ +$Id: README,v 1.8 1999/01/27 14:54:09 gram Exp $ Wiretap is a library that is being developed as a future replacement for libpcap, the current standard Unix library for packet capturing. Libpcap is @@ -62,8 +62,9 @@ knowledge base for "Trace File Format". Network Monitor --------------- -MicroSoft's Network Monitor file format is supported, at least under ethernet. -I've promised to send Guy a token-ring netmon file. soon.... +MicroSoft's Network Monitor file format is supported, at least under ethernet +and token-ring. If you have capture files of other datalink types, please send +them to Guy Harris <guy@netapp.com>. "snoop" ------- diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 3bf70575bc..f6cf8b57fa 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -1,6 +1,6 @@ /* netmon.c * - * $Id: netmon.c,v 1.1 1999/01/18 21:34:54 gram Exp $ + * $Id: netmon.c,v 1.2 1999/01/27 14:54:09 gram Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -81,7 +81,9 @@ int netmon_open(wtap *wth) struct netmon_hdr hdr; static const int netmon_encap[] = { WTAP_ENCAP_NONE, - WTAP_ENCAP_ETHERNET + WTAP_ENCAP_ETHERNET, + WTAP_ENCAP_TR + }; #define NUM_NETMON_ENCAPS (sizeof netmon_encap / sizeof netmon_encap[0]) struct tm tm; |