aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/netmon.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>1999-12-15 01:34:17 +0000
committerGuy Harris <guy@alum.mit.edu>1999-12-15 01:34:17 +0000
commitcc4e9f698b88f2f03e8143a5888a58b4e5e6c0f8 (patch)
tree84ef8247e978d69a92e44ecf01b820bd2f8632f3 /wiretap/netmon.c
parent12610535b4fcb5aaf2835bd4edbf97a4e9f23452 (diff)
One field in the NetXRay header appears to be the number of frames in
the capture; set it to that when writing the capture. Support Token Ring and FDDI captures (as per the network type in the file header appearing to be either the NDIS network type, or the NDIS network type minus 1 - I forget whether Ethernet has an NDIS type of 0 or 1). Don't write the file header twice, keeping a static copy of it around, as Wiretap code isn't supposed to keep any static data around; instead, write it only when we're done writing out all the records (as we do on Network Monitor captures). Compute the time stamps when writing the file. Give Windows Sniffer 1.1-format a short name, so "editcap" doesn't dump core or print "(null)" in its usage message. WTAP_ENCAP_NULL isn't supported by NetMon; don't write it. svn path=/trunk/; revision=1336
Diffstat (limited to 'wiretap/netmon.c')
-rw-r--r--wiretap/netmon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 2242c23450..1f0939fddb 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1,6 +1,6 @@
/* netmon.c
*
- * $Id: netmon.c,v 1.21 1999/12/04 09:38:38 guy Exp $
+ * $Id: netmon.c,v 1.22 1999/12/15 01:34:17 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@@ -384,7 +384,7 @@ static const int wtap_encap[] = {
-1, /* WTAP_ENCAP_LINUX_ATM_CLIP -> unsupported */
-1, /* WTAP_ENCAP_LAPB -> unsupported*/
-1, /* WTAP_ENCAP_ATM_SNIFFER -> unsupported */
- 0 /* WTAP_ENCAP_NULL -> DLT_NULL */
+ -1 /* WTAP_ENCAP_NULL -> unsupported */
};
#define NUM_WTAP_ENCAPS (sizeof wtap_encap / sizeof wtap_encap[0])