Merge remote-tracking branch 'goog/tcpdump'
* goog/tcpdump: (1872 commits)
Remove old version. Getting ready for new libpcap 1.5
Remove commas from clauses in a comma-separated list.
Fix typo.
Describe all NFLOG TLV types and define structures for some of them.
Check caplen in the NFLOG TLV loop.
Have nflog_tlv_t include only the TLV header.
Byte-swap the T and L in TLVs as necessary when reading an NFLOG file.
Don't support D-Bus sniffing on OS X.
Add post-1.5.2 bug fixes.
Tag some changes with a bug identifier.
Add items for 1.5.1 and 1.5.2.
Formatting tweak.
Count *ring buffer blocks*, not *packets* to be filtered in userland.
Add a PACKET_COUNT_IS_UNLIMITED() to test for a packet count <= 0.
Use HAVE_TPACKET3 rather than TPACKET_V3 to test for TPACKET_V3 support.
Fix builds on systems without TPACKET_V3.
tweak manpages formatting
Fix pcap_loop() with a count of 0 and TPACKET_V3.
Discourage the use of a zero timeout.
We can't use TPACKET_V3 in immediate mode, so fall back on TPACKET_V2.
...
Change-Id: I2aa9bd87673c56aee439e1154b96a14026ca7985
diff --git a/savefile.c b/savefile.c
index e5a5403..73e3ea9 100644
--- a/savefile.c
+++ b/savefile.c
@@ -30,13 +30,27 @@
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.30 2007/08/14 20:57:49 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.183 2008-12-23 20:13:29 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#ifdef WIN32
+#include <pcap-stdinc.h>
+#else /* WIN32 */
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#elif HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#include <sys/types.h>
+#endif /* WIN32 */
+
#include <errno.h>
#include <memory.h>
#include <stdio.h>
@@ -44,61 +58,14 @@
#include <string.h>
#include "pcap-int.h"
+#include "pcap/usb.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
-/*
- * Standard libpcap format.
- */
-#define TCPDUMP_MAGIC 0xa1b2c3d4
-
-/*
- * Alexey Kuznetzov's modified libpcap format.
- */
-#define KUZNETZOV_TCPDUMP_MAGIC 0xa1b2cd34
-
-/*
- * Reserved for Francisco Mesquita <francisco.mesquita@radiomovel.pt>
- * for another modified format.
- */
-#define FMESQUITA_TCPDUMP_MAGIC 0xa1b234cd
-
-/*
- * Navtel Communcations' format, with nanosecond timestamps,
- * as per a request from Dumas Hwang <dumas.hwang@navtelcom.com>.
- */
-#define NAVTEL_TCPDUMP_MAGIC 0xa12b3c4d
-
-/*
- * Normal libpcap format, except for seconds/nanoseconds timestamps,
- * as per a request by Ulf Lamping <ulf.lamping@web.de>
- */
-#define NSEC_TCPDUMP_MAGIC 0xa1b23c4d
-
-/*
- * We use the "receiver-makes-right" approach to byte order,
- * because time is at a premium when we are writing the file.
- * In other words, the pcap_file_header and pcap_pkthdr,
- * records are written in host byte order.
- * Note that the bytes of packet data are written out in the order in
- * which they were received, so multi-byte fields in packets are not
- * written in host byte order, they're written in whatever order the
- * sending machine put them in.
- *
- * ntoh[ls] aren't sufficient because we might need to swap on a big-endian
- * machine (if the file was written in little-end order).
- */
-#define SWAPLONG(y) \
-((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
-#define SWAPSHORT(y) \
- ( (((y)&0xff)<<8) | ((u_short)((y)&0xff00)>>8) )
-
-#define SFERR_TRUNC 1
-#define SFERR_BADVERSION 2
-#define SFERR_BADF 3
-#define SFERR_EOF 4 /* not really an error, just a status */
+#include "sf-pcap.h"
+#include "sf-pcap-ng.h"
/*
* Setting O_BINARY on DOS/Windows is a bit tricky
@@ -113,774 +80,6 @@
#endif
#endif
-/*
- * We don't write DLT_* values to the capture file header, because
- * they're not the same on all platforms.
- *
- * Unfortunately, the various flavors of BSD have not always used the same
- * numerical values for the same data types, and various patches to
- * libpcap for non-BSD OSes have added their own DLT_* codes for link
- * layer encapsulation types seen on those OSes, and those codes have had,
- * in some cases, values that were also used, on other platforms, for other
- * link layer encapsulation types.
- *
- * This means that capture files of a type whose numerical DLT_* code
- * means different things on different BSDs, or with different versions
- * of libpcap, can't always be read on systems other than those like
- * the one running on the machine on which the capture was made.
- *
- * Instead, we define here a set of LINKTYPE_* codes, and map DLT_* codes
- * to LINKTYPE_* codes when writing a savefile header, and map LINKTYPE_*
- * codes to DLT_* codes when reading a savefile header.
- *
- * For those DLT_* codes that have, as far as we know, the same values on
- * all platforms (DLT_NULL through DLT_FDDI), we define LINKTYPE_xxx as
- * DLT_xxx; that way, captures of those types can still be read by
- * versions of libpcap that map LINKTYPE_* values to DLT_* values, and
- * captures of those types written by versions of libpcap that map DLT_
- * values to LINKTYPE_ values can still be read by older versions
- * of libpcap.
- *
- * The other LINKTYPE_* codes are given values starting at 100, in the
- * hopes that no DLT_* code will be given one of those values.
- *
- * In order to ensure that a given LINKTYPE_* code's value will refer to
- * the same encapsulation type on all platforms, you should not allocate
- * a new LINKTYPE_* value without consulting "tcpdump-workers@tcpdump.org".
- * The tcpdump developers will allocate a value for you, and will not
- * subsequently allocate it to anybody else; that value will be added to
- * the "pcap.h" in the tcpdump.org CVS repository, so that a future
- * libpcap release will include it.
- *
- * You should, if possible, also contribute patches to libpcap and tcpdump
- * to handle the new encapsulation type, so that they can also be checked
- * into the tcpdump.org CVS repository and so that they will appear in
- * future libpcap and tcpdump releases.
- *
- * Do *NOT* assume that any values after the largest value in this file
- * are available; you might not have the most up-to-date version of this
- * file, and new values after that one might have been assigned. Also,
- * do *NOT* use any values below 100 - those might already have been
- * taken by one (or more!) organizations.
- */
-#define LINKTYPE_NULL DLT_NULL
-#define LINKTYPE_ETHERNET DLT_EN10MB /* also for 100Mb and up */
-#define LINKTYPE_EXP_ETHERNET DLT_EN3MB /* 3Mb experimental Ethernet */
-#define LINKTYPE_AX25 DLT_AX25
-#define LINKTYPE_PRONET DLT_PRONET
-#define LINKTYPE_CHAOS DLT_CHAOS
-#define LINKTYPE_TOKEN_RING DLT_IEEE802 /* DLT_IEEE802 is used for Token Ring */
-#define LINKTYPE_ARCNET DLT_ARCNET /* BSD-style headers */
-#define LINKTYPE_SLIP DLT_SLIP
-#define LINKTYPE_PPP DLT_PPP
-#define LINKTYPE_FDDI DLT_FDDI
-
-/*
- * LINKTYPE_PPP is for use when there might, or might not, be an RFC 1662
- * PPP in HDLC-like framing header (with 0xff 0x03 before the PPP protocol
- * field) at the beginning of the packet.
- *
- * This is for use when there is always such a header; the address field
- * might be 0xff, for regular PPP, or it might be an address field for Cisco
- * point-to-point with HDLC framing as per section 4.3.1 of RFC 1547 ("Cisco
- * HDLC"). This is, for example, what you get with NetBSD's DLT_PPP_SERIAL.
- *
- * We give it the same value as NetBSD's DLT_PPP_SERIAL, in the hopes that
- * nobody else will choose a DLT_ value of 50, and so that DLT_PPP_SERIAL
- * captures will be written out with a link type that NetBSD's tcpdump
- * can read.
- */
-#define LINKTYPE_PPP_HDLC 50 /* PPP in HDLC-like framing */
-
-#define LINKTYPE_PPP_ETHER 51 /* NetBSD PPP-over-Ethernet */
-
-#define LINKTYPE_SYMANTEC_FIREWALL 99 /* Symantec Enterprise Firewall */
-
-#define LINKTYPE_ATM_RFC1483 100 /* LLC/SNAP-encapsulated ATM */
-#define LINKTYPE_RAW 101 /* raw IP */
-#define LINKTYPE_SLIP_BSDOS 102 /* BSD/OS SLIP BPF header */
-#define LINKTYPE_PPP_BSDOS 103 /* BSD/OS PPP BPF header */
-#define LINKTYPE_C_HDLC 104 /* Cisco HDLC */
-#define LINKTYPE_IEEE802_11 105 /* IEEE 802.11 (wireless) */
-#define LINKTYPE_ATM_CLIP 106 /* Linux Classical IP over ATM */
-#define LINKTYPE_FRELAY 107 /* Frame Relay */
-#define LINKTYPE_LOOP 108 /* OpenBSD loopback */
-#define LINKTYPE_ENC 109 /* OpenBSD IPSEC enc */
-
-/*
- * These three types are reserved for future use.
- */
-#define LINKTYPE_LANE8023 110 /* ATM LANE + 802.3 */
-#define LINKTYPE_HIPPI 111 /* NetBSD HIPPI */
-#define LINKTYPE_HDLC 112 /* NetBSD HDLC framing */
-
-#define LINKTYPE_LINUX_SLL 113 /* Linux cooked socket capture */
-#define LINKTYPE_LTALK 114 /* Apple LocalTalk hardware */
-#define LINKTYPE_ECONET 115 /* Acorn Econet */
-
-/*
- * Reserved for use with OpenBSD ipfilter.
- */
-#define LINKTYPE_IPFILTER 116
-
-#define LINKTYPE_PFLOG 117 /* OpenBSD DLT_PFLOG */
-#define LINKTYPE_CISCO_IOS 118 /* For Cisco-internal use */
-#define LINKTYPE_PRISM_HEADER 119 /* 802.11+Prism II monitor mode */
-#define LINKTYPE_AIRONET_HEADER 120 /* FreeBSD Aironet driver stuff */
-
-/*
- * Reserved for Siemens HiPath HDLC.
- */
-#define LINKTYPE_HHDLC 121
-
-#define LINKTYPE_IP_OVER_FC 122 /* RFC 2625 IP-over-Fibre Channel */
-#define LINKTYPE_SUNATM 123 /* Solaris+SunATM */
-
-/*
- * Reserved as per request from Kent Dahlgren <kent@praesum.com>
- * for private use.
- */
-#define LINKTYPE_RIO 124 /* RapidIO */
-#define LINKTYPE_PCI_EXP 125 /* PCI Express */
-#define LINKTYPE_AURORA 126 /* Xilinx Aurora link layer */
-
-#define LINKTYPE_IEEE802_11_RADIO 127 /* 802.11 plus BSD radio header */
-
-/*
- * Reserved for the TZSP encapsulation, as per request from
- * Chris Waters <chris.waters@networkchemistry.com>
- * TZSP is a generic encapsulation for any other link type,
- * which includes a means to include meta-information
- * with the packet, e.g. signal strength and channel
- * for 802.11 packets.
- */
-#define LINKTYPE_TZSP 128 /* Tazmen Sniffer Protocol */
-
-#define LINKTYPE_ARCNET_LINUX 129 /* Linux-style headers */
-
-/*
- * Juniper-private data link types, as per request from
- * Hannes Gredler <hannes@juniper.net>. The corresponding
- * DLT_s are used for passing on chassis-internal
- * metainformation such as QOS profiles, etc..
- */
-#define LINKTYPE_JUNIPER_MLPPP 130
-#define LINKTYPE_JUNIPER_MLFR 131
-#define LINKTYPE_JUNIPER_ES 132
-#define LINKTYPE_JUNIPER_GGSN 133
-#define LINKTYPE_JUNIPER_MFR 134
-#define LINKTYPE_JUNIPER_ATM2 135
-#define LINKTYPE_JUNIPER_SERVICES 136
-#define LINKTYPE_JUNIPER_ATM1 137
-
-#define LINKTYPE_APPLE_IP_OVER_IEEE1394 138 /* Apple IP-over-IEEE 1394 cooked header */
-
-#define LINKTYPE_MTP2_WITH_PHDR 139
-#define LINKTYPE_MTP2 140
-#define LINKTYPE_MTP3 141
-#define LINKTYPE_SCCP 142
-
-#define LINKTYPE_DOCSIS 143 /* DOCSIS MAC frames */
-
-#define LINKTYPE_LINUX_IRDA 144 /* Linux-IrDA */
-
-/*
- * Reserved for IBM SP switch and IBM Next Federation switch.
- */
-#define LINKTYPE_IBM_SP 145
-#define LINKTYPE_IBM_SN 146
-
-/*
- * Reserved for private use. If you have some link-layer header type
- * that you want to use within your organization, with the capture files
- * using that link-layer header type not ever be sent outside your
- * organization, you can use these values.
- *
- * No libpcap release will use these for any purpose, nor will any
- * tcpdump release use them, either.
- *
- * Do *NOT* use these in capture files that you expect anybody not using
- * your private versions of capture-file-reading tools to read; in
- * particular, do *NOT* use them in products, otherwise you may find that
- * people won't be able to use tcpdump, or snort, or Ethereal, or... to
- * read capture files from your firewall/intrusion detection/traffic
- * monitoring/etc. appliance, or whatever product uses that LINKTYPE_ value,
- * and you may also find that the developers of those applications will
- * not accept patches to let them read those files.
- *
- * Also, do not use them if somebody might send you a capture using them
- * for *their* private type and tools using them for *your* private type
- * would have to read them.
- *
- * Instead, in those cases, ask "tcpdump-workers@tcpdump.org" for a new DLT_
- * and LINKTYPE_ value, as per the comment in pcap-bpf.h, and use the type
- * you're given.
- */
-#define LINKTYPE_USER0 147
-#define LINKTYPE_USER1 148
-#define LINKTYPE_USER2 149
-#define LINKTYPE_USER3 150
-#define LINKTYPE_USER4 151
-#define LINKTYPE_USER5 152
-#define LINKTYPE_USER6 153
-#define LINKTYPE_USER7 154
-#define LINKTYPE_USER8 155
-#define LINKTYPE_USER9 156
-#define LINKTYPE_USER10 157
-#define LINKTYPE_USER11 158
-#define LINKTYPE_USER12 159
-#define LINKTYPE_USER13 160
-#define LINKTYPE_USER14 161
-#define LINKTYPE_USER15 162
-
-/*
- * For future use with 802.11 captures - defined by AbsoluteValue
- * Systems to store a number of bits of link-layer information
- * including radio information:
- *
- * http://www.shaftnet.org/~pizza/software/capturefrm.txt
- *
- * but could and arguably should also be used by non-AVS Linux
- * 802.11 drivers; that may happen in the future.
- */
-#define LINKTYPE_IEEE802_11_RADIO_AVS 163 /* 802.11 plus AVS radio header */
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>. The corresponding
- * DLT_s are used for passing on chassis-internal
- * metainformation such as QOS profiles, etc..
- */
-#define LINKTYPE_JUNIPER_MONITOR 164
-
-/*
- * Reserved for BACnet MS/TP.
- */
-#define LINKTYPE_BACNET_MS_TP 165
-
-/*
- * Another PPP variant as per request from Karsten Keil <kkeil@suse.de>.
- *
- * This is used in some OSes to allow a kernel socket filter to distinguish
- * between incoming and outgoing packets, on a socket intended to
- * supply pppd with outgoing packets so it can do dial-on-demand and
- * hangup-on-lack-of-demand; incoming packets are filtered out so they
- * don't cause pppd to hold the connection up (you don't want random
- * input packets such as port scans, packets from old lost connections,
- * etc. to force the connection to stay up).
- *
- * The first byte of the PPP header (0xff03) is modified to accomodate
- * the direction - 0x00 = IN, 0x01 = OUT.
- */
-#define LINKTYPE_PPP_PPPD 166
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>. The DLT_s are used
- * for passing on chassis-internal metainformation such as
- * QOS profiles, cookies, etc..
- */
-#define LINKTYPE_JUNIPER_PPPOE 167
-#define LINKTYPE_JUNIPER_PPPOE_ATM 168
-
-#define LINKTYPE_GPRS_LLC 169 /* GPRS LLC */
-#define LINKTYPE_GPF_T 170 /* GPF-T (ITU-T G.7041/Y.1303) */
-#define LINKTYPE_GPF_F 171 /* GPF-T (ITU-T G.7041/Y.1303) */
-
-/*
- * Requested by Oolan Zimmer <oz@gcom.com> for use in Gcom's T1/E1 line
- * monitoring equipment.
- */
-#define LINKTYPE_GCOM_T1E1 172
-#define LINKTYPE_GCOM_SERIAL 173
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>. The DLT_ is used
- * for internal communication to Physical Interface Cards (PIC)
- */
-#define LINKTYPE_JUNIPER_PIC_PEER 174
-
-/*
- * Link types requested by Gregor Maier <gregor@endace.com> of Endace
- * Measurement Systems. They add an ERF header (see
- * http://www.endace.com/support/EndaceRecordFormat.pdf) in front of
- * the link-layer header.
- */
-#define LINKTYPE_ERF_ETH 175 /* Ethernet */
-#define LINKTYPE_ERF_POS 176 /* Packet-over-SONET */
-
-/*
- * Requested by Daniele Orlandi <daniele@orlandi.com> for raw LAPD
- * for vISDN (http://www.orlandi.com/visdn/). Its link-layer header
- * includes additional information before the LAPD header, so it's
- * not necessarily a generic LAPD header.
- */
-#define LINKTYPE_LINUX_LAPD 177
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- * The Link Types are used for prepending meta-information
- * like interface index, interface name
- * before standard Ethernet, PPP, Frelay & C-HDLC Frames
- */
-#define LINKTYPE_JUNIPER_ETHER 178
-#define LINKTYPE_JUNIPER_PPP 179
-#define LINKTYPE_JUNIPER_FRELAY 180
-#define LINKTYPE_JUNIPER_CHDLC 181
-
-/*
- * Multi Link Frame Relay (FRF.16)
- */
-#define LINKTYPE_MFR 182
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- * The DLT_ is used for internal communication with a
- * voice Adapter Card (PIC)
- */
-#define LINKTYPE_JUNIPER_VP 183
-
-/*
- * Arinc 429 frames.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Every frame contains a 32bit A429 label.
- * More documentation on Arinc 429 can be found at
- * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
- */
-#define LINKTYPE_A429 184
-
-/*
- * Arinc 653 Interpartition Communication messages.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Please refer to the A653-1 standard for more information.
- */
-#define LINKTYPE_A653_ICM 185
-
-/*
- * USB packets, beginning with a USB setup header; requested by
- * Paolo Abeni <paolo.abeni@email.it>.
- */
-#define LINKTYPE_USB 186
-
-/*
- * Bluetooth HCI UART transport layer (part H:4); requested by
- * Paolo Abeni.
- */
-#define LINKTYPE_BLUETOOTH_HCI_H4 187
-
-/*
- * IEEE 802.16 MAC Common Part Sublayer; requested by Maria Cruz
- * <cruz_petagay@bah.com>.
- */
-#define LINKTYPE_IEEE802_16_MAC_CPS 188
-
-/*
- * USB packets, beginning with a Linux USB header; requested by
- * Paolo Abeni <paolo.abeni@email.it>.
- */
-#define LINKTYPE_USB_LINUX 189
-
-/*
- * Controller Area Network (CAN) v. 2.0B packets.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Used to dump CAN packets coming from a CAN Vector board.
- * More documentation on the CAN v2.0B frames can be found at
- * http://www.can-cia.org/downloads/?269
- */
-#define LINKTYPE_CAN20B 190
-
-/*
- * IEEE 802.15.4, with address fields padded, as is done by Linux
- * drivers; requested by Juergen Schimmer.
- */
-#define LINKTYPE_IEEE802_15_4_LINUX 191
-
-/*
- * Per Packet Information encapsulated packets.
- * LINKTYPE_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- */
-#define LINKTYPE_PPI 192
-
-/*
- * Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header;
- * requested by Charles Clancy.
- */
-#define LINKTYPE_IEEE802_16_MAC_CPS_RADIO 193
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- * The DLT_ is used for internal communication with a
- * integrated service module (ISM).
- */
-#define LINKTYPE_JUNIPER_ISM 194
-
-/*
- * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
- */
-#define LINKTYPE_IEEE802_15_4 195
-
-/*
- * Various link-layer types, with a pseudo-header, for SITA
- * (http://www.sita.aero/); requested by Fulko Hew (fulko.hew@gmail.com).
- */
-#define LINKTYPE_SITA 196
-
-/*
- * Various link-layer types, with a pseudo-header, for Endace DAG cards;
- * encapsulates Endace ERF records. Requested by Stephen Donnelly
- * <stephen@endace.com>.
- */
-#define LINKTYPE_ERF 197
-
-/*
- * Special header prepended to Ethernet packets when capturing from a
- * u10 Networks board. Requested by Phil Mulholland
- * <phil@u10networks.com>.
- */
-#define LINKTYPE_RAIF1 198
-
-/*
- * IPMB packet for IPMI, beginning with the I2C slave address, followed
- * by the netFn and LUN, etc.. Requested by Chanthy Toeung
- * <chanthy.toeung@ca.kontron.com>.
- */
-#define LINKTYPE_IPMB 199
-
-
-static struct linktype_map {
- int dlt;
- int linktype;
-} map[] = {
- /*
- * These DLT_* codes have LINKTYPE_* codes with values identical
- * to the values of the corresponding DLT_* code.
- */
- { DLT_NULL, LINKTYPE_NULL },
- { DLT_EN10MB, LINKTYPE_ETHERNET },
- { DLT_EN3MB, LINKTYPE_EXP_ETHERNET },
- { DLT_AX25, LINKTYPE_AX25 },
- { DLT_PRONET, LINKTYPE_PRONET },
- { DLT_CHAOS, LINKTYPE_CHAOS },
- { DLT_IEEE802, LINKTYPE_TOKEN_RING },
- { DLT_ARCNET, LINKTYPE_ARCNET },
- { DLT_SLIP, LINKTYPE_SLIP },
- { DLT_PPP, LINKTYPE_PPP },
- { DLT_FDDI, LINKTYPE_FDDI },
-
- /*
- * These DLT_* codes have different values on different
- * platforms; we map them to LINKTYPE_* codes that
- * have values that should never be equal to any DLT_*
- * code.
- */
-#ifdef DLT_FR
- /* BSD/OS Frame Relay */
- { DLT_FR, LINKTYPE_FRELAY },
-#endif
-
- { DLT_SYMANTEC_FIREWALL, LINKTYPE_SYMANTEC_FIREWALL },
- { DLT_ATM_RFC1483, LINKTYPE_ATM_RFC1483 },
- { DLT_RAW, LINKTYPE_RAW },
- { DLT_SLIP_BSDOS, LINKTYPE_SLIP_BSDOS },
- { DLT_PPP_BSDOS, LINKTYPE_PPP_BSDOS },
-
- /* BSD/OS Cisco HDLC */
- { DLT_C_HDLC, LINKTYPE_C_HDLC },
-
- /*
- * These DLT_* codes are not on all platforms, but, so far,
- * there don't appear to be any platforms that define
- * other codes with those values; we map them to
- * different LINKTYPE_* values anyway, just in case.
- */
-
- /* Linux ATM Classical IP */
- { DLT_ATM_CLIP, LINKTYPE_ATM_CLIP },
-
- /* NetBSD sync/async serial PPP (or Cisco HDLC) */
- { DLT_PPP_SERIAL, LINKTYPE_PPP_HDLC },
-
- /* NetBSD PPP over Ethernet */
- { DLT_PPP_ETHER, LINKTYPE_PPP_ETHER },
-
- /* IEEE 802.11 wireless */
- { DLT_IEEE802_11, LINKTYPE_IEEE802_11 },
-
- /* Frame Relay */
- { DLT_FRELAY, LINKTYPE_FRELAY },
-
- /* OpenBSD loopback */
- { DLT_LOOP, LINKTYPE_LOOP },
-
- /* Linux cooked socket capture */
- { DLT_LINUX_SLL, LINKTYPE_LINUX_SLL },
-
- /* Apple LocalTalk hardware */
- { DLT_LTALK, LINKTYPE_LTALK },
-
- /* Acorn Econet */
- { DLT_ECONET, LINKTYPE_ECONET },
-
- /* OpenBSD DLT_PFLOG */
- { DLT_PFLOG, LINKTYPE_PFLOG },
-
- /* For Cisco-internal use */
- { DLT_CISCO_IOS, LINKTYPE_CISCO_IOS },
-
- /* Prism II monitor-mode header plus 802.11 header */
- { DLT_PRISM_HEADER, LINKTYPE_PRISM_HEADER },
-
- /* FreeBSD Aironet driver stuff */
- { DLT_AIRONET_HEADER, LINKTYPE_AIRONET_HEADER },
-
- /* Siemens HiPath HDLC */
- { DLT_HHDLC, LINKTYPE_HHDLC },
-
- /* RFC 2625 IP-over-Fibre Channel */
- { DLT_IP_OVER_FC, LINKTYPE_IP_OVER_FC },
-
- /* Solaris+SunATM */
- { DLT_SUNATM, LINKTYPE_SUNATM },
-
- /* RapidIO */
- { DLT_RIO, LINKTYPE_RIO },
-
- /* PCI Express */
- { DLT_PCI_EXP, LINKTYPE_PCI_EXP },
-
- /* Xilinx Aurora link layer */
- { DLT_AURORA, LINKTYPE_AURORA },
-
- /* 802.11 plus BSD radio header */
- { DLT_IEEE802_11_RADIO, LINKTYPE_IEEE802_11_RADIO },
-
- /* Tazmen Sniffer Protocol */
- { DLT_TZSP, LINKTYPE_TZSP },
-
- /* Arcnet with Linux-style link-layer headers */
- { DLT_ARCNET_LINUX, LINKTYPE_ARCNET_LINUX },
-
- /* Juniper-internal chassis encapsulation */
- { DLT_JUNIPER_MLPPP, LINKTYPE_JUNIPER_MLPPP },
- { DLT_JUNIPER_MLFR, LINKTYPE_JUNIPER_MLFR },
- { DLT_JUNIPER_ES, LINKTYPE_JUNIPER_ES },
- { DLT_JUNIPER_GGSN, LINKTYPE_JUNIPER_GGSN },
- { DLT_JUNIPER_MFR, LINKTYPE_JUNIPER_MFR },
- { DLT_JUNIPER_ATM2, LINKTYPE_JUNIPER_ATM2 },
- { DLT_JUNIPER_SERVICES, LINKTYPE_JUNIPER_SERVICES },
- { DLT_JUNIPER_ATM1, LINKTYPE_JUNIPER_ATM1 },
-
- /* Apple IP-over-IEEE 1394 cooked header */
- { DLT_APPLE_IP_OVER_IEEE1394, LINKTYPE_APPLE_IP_OVER_IEEE1394 },
-
- /* SS7 */
- { DLT_MTP2_WITH_PHDR, LINKTYPE_MTP2_WITH_PHDR },
- { DLT_MTP2, LINKTYPE_MTP2 },
- { DLT_MTP3, LINKTYPE_MTP3 },
- { DLT_SCCP, LINKTYPE_SCCP },
-
- /* DOCSIS MAC frames */
- { DLT_DOCSIS, LINKTYPE_DOCSIS },
-
- /* IrDA IrLAP packets + Linux-cooked header */
- { DLT_LINUX_IRDA, LINKTYPE_LINUX_IRDA },
-
- /* IBM SP and Next Federation switches */
- { DLT_IBM_SP, LINKTYPE_IBM_SP },
- { DLT_IBM_SN, LINKTYPE_IBM_SN },
-
- /* 802.11 plus AVS radio header */
- { DLT_IEEE802_11_RADIO_AVS, LINKTYPE_IEEE802_11_RADIO_AVS },
-
- /*
- * Any platform that defines additional DLT_* codes should:
- *
- * request a LINKTYPE_* code and value from tcpdump.org,
- * as per the above;
- *
- * add, in their version of libpcap, an entry to map
- * those DLT_* codes to the corresponding LINKTYPE_*
- * code;
- *
- * redefine, in their "net/bpf.h", any DLT_* values
- * that collide with the values used by their additional
- * DLT_* codes, to remove those collisions (but without
- * making them collide with any of the LINKTYPE_*
- * values equal to 50 or above; they should also avoid
- * defining DLT_* values that collide with those
- * LINKTYPE_* values, either).
- */
-
- /* Juniper-internal chassis encapsulation */
- { DLT_JUNIPER_MONITOR, LINKTYPE_JUNIPER_MONITOR },
-
- /* BACnet MS/TP */
- { DLT_BACNET_MS_TP, LINKTYPE_BACNET_MS_TP },
-
- /* PPP for pppd, with direction flag in the PPP header */
- { DLT_PPP_PPPD, LINKTYPE_PPP_PPPD},
-
- /* Juniper-internal chassis encapsulation */
- { DLT_JUNIPER_PPPOE, LINKTYPE_JUNIPER_PPPOE },
- { DLT_JUNIPER_PPPOE_ATM,LINKTYPE_JUNIPER_PPPOE_ATM },
-
- /* GPRS LLC */
- { DLT_GPRS_LLC, LINKTYPE_GPRS_LLC },
-
- /* Transparent Generic Framing Procedure (ITU-T G.7041/Y.1303) */
- { DLT_GPF_T, LINKTYPE_GPF_T },
-
- /* Framed Generic Framing Procedure (ITU-T G.7041/Y.1303) */
- { DLT_GPF_F, LINKTYPE_GPF_F },
-
- { DLT_GCOM_T1E1, LINKTYPE_GCOM_T1E1 },
- { DLT_GCOM_SERIAL, LINKTYPE_GCOM_SERIAL },
-
- /* Juniper-internal chassis encapsulation */
- { DLT_JUNIPER_PIC_PEER, LINKTYPE_JUNIPER_PIC_PEER },
-
- /* Endace types */
- { DLT_ERF_ETH, LINKTYPE_ERF_ETH },
- { DLT_ERF_POS, LINKTYPE_ERF_POS },
-
- /* viSDN LAPD */
- { DLT_LINUX_LAPD, LINKTYPE_LINUX_LAPD },
-
- /* Juniper meta-information before Ether, PPP, Frame Relay, C-HDLC Frames */
- { DLT_JUNIPER_ETHER, LINKTYPE_JUNIPER_ETHER },
- { DLT_JUNIPER_PPP, LINKTYPE_JUNIPER_PPP },
- { DLT_JUNIPER_FRELAY, LINKTYPE_JUNIPER_FRELAY },
- { DLT_JUNIPER_CHDLC, LINKTYPE_JUNIPER_CHDLC },
-
- /* Multi Link Frame Relay (FRF.16) */
- { DLT_MFR, LINKTYPE_MFR },
-
- /* Juniper Voice PIC */
- { DLT_JUNIPER_VP, LINKTYPE_JUNIPER_VP },
-
- /* Controller Area Network (CAN) v2.0B */
- { DLT_A429, LINKTYPE_A429 },
-
- /* Arinc 653 Interpartition Communication messages */
- { DLT_A653_ICM, LINKTYPE_A653_ICM },
-
- /* USB */
- { DLT_USB, LINKTYPE_USB },
-
- /* Bluetooth HCI UART transport layer */
- { DLT_BLUETOOTH_HCI_H4, LINKTYPE_BLUETOOTH_HCI_H4 },
-
- /* IEEE 802.16 MAC Common Part Sublayer */
- { DLT_IEEE802_16_MAC_CPS, LINKTYPE_IEEE802_16_MAC_CPS },
-
- /* USB with Linux header */
- { DLT_USB_LINUX, LINKTYPE_USB_LINUX },
-
- /* Controller Area Network (CAN) v2.0B */
- { DLT_CAN20B, LINKTYPE_CAN20B },
-
- /* IEEE 802.15.4 with address fields padded */
- { DLT_IEEE802_15_4_LINUX, LINKTYPE_IEEE802_15_4_LINUX },
-
- /* Per Packet Information encapsulated packets */
- { DLT_PPI, LINKTYPE_PPI },
-
- /* IEEE 802.16 MAC Common Part Sublayer plus radiotap header */
- { DLT_IEEE802_16_MAC_CPS_RADIO, LINKTYPE_IEEE802_16_MAC_CPS_RADIO },
-
- /* Juniper Voice ISM */
- { DLT_JUNIPER_ISM, LINKTYPE_JUNIPER_ISM },
-
- /* IEEE 802.15.4 exactly as it appears in the spec */
- { DLT_IEEE802_15_4, LINKTYPE_IEEE802_15_4 },
-
- /* Various link-layer types for SITA */
- { DLT_SITA, LINKTYPE_SITA },
-
- /* Various link-layer types for Endace */
- { DLT_ERF, LINKTYPE_ERF },
-
- /* Special header for u10 Networks boards */
- { DLT_RAIF1, LINKTYPE_RAIF1 },
-
- /* IPMB */
- { DLT_IPMB, LINKTYPE_IPMB },
-
- { -1, -1 }
-};
-
-static int
-dlt_to_linktype(int dlt)
-{
- int i;
-
- for (i = 0; map[i].dlt != -1; i++) {
- if (map[i].dlt == dlt)
- return (map[i].linktype);
- }
-
- /*
- * If we don't have a mapping for this DLT_ code, return an
- * error; that means that the table above needs to have an
- * entry added.
- */
- return (-1);
-}
-
-static int
-linktype_to_dlt(int linktype)
-{
- int i;
-
- for (i = 0; map[i].linktype != -1; i++) {
- if (map[i].linktype == linktype)
- return (map[i].dlt);
- }
-
- /*
- * If we don't have an entry for this link type, return
- * the link type value; it may be a DLT_ value from an
- * older version of libpcap.
- */
- return linktype;
-}
-
-static int
-sf_write_header(FILE *fp, int linktype, int thiszone, int snaplen)
-{
- struct pcap_file_header hdr;
-
- hdr.magic = TCPDUMP_MAGIC;
- hdr.version_major = PCAP_VERSION_MAJOR;
- hdr.version_minor = PCAP_VERSION_MINOR;
-
- hdr.thiszone = thiszone;
- hdr.snaplen = snaplen;
- hdr.sigfigs = 0;
- hdr.linktype = linktype;
-
- if (fwrite((char *)&hdr, sizeof(hdr), 1, fp) != 1)
- return (-1);
-
- return (0);
-}
-
-static void
-swap_hdr(struct pcap_file_header *hp)
-{
- hp->version_major = SWAPSHORT(hp->version_major);
- hp->version_minor = SWAPSHORT(hp->version_minor);
- hp->thiszone = SWAPLONG(hp->thiszone);
- hp->sigfigs = SWAPLONG(hp->sigfigs);
- hp->snaplen = SWAPLONG(hp->snaplen);
- hp->linktype = SWAPLONG(hp->linktype);
-}
-
static int
sf_getnonblock(pcap_t *p, char *errbuf)
{
@@ -895,10 +94,16 @@
sf_setnonblock(pcap_t *p, int nonblock, char *errbuf)
{
/*
- * This is a savefile, not a live capture file, so ignore
- * requests to put it in non-blocking mode.
+ * This is a savefile, not a live capture file, so reject
+ * requests to put it in non-blocking mode. (If it's a
+ * pipe, it could be put in non-blocking mode, but that
+ * would significantly complicate the code to read packets,
+ * as it would have to handle reading partial packets and
+ * keeping the state of the read.)
*/
- return (0);
+ snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+ "Savefiles cannot be put into non-blocking mode");
+ return (-1);
}
static int
@@ -909,6 +114,32 @@
return (-1);
}
+#ifdef WIN32
+static int
+sf_setbuff(pcap_t *p, int dim)
+{
+ snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+ "The kernel buffer size cannot be set while reading from a file");
+ return (-1);
+}
+
+static int
+sf_setmode(pcap_t *p, int mode)
+{
+ snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+ "impossible to set mode while reading from a file");
+ return (-1);
+}
+
+static int
+sf_setmintocopy(pcap_t *p, int size)
+{
+ snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+ "The mintocopy parameter cannot be set while reading from a file");
+ return (-1);
+}
+#endif
+
static int
sf_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
{
@@ -929,17 +160,19 @@
return (-1);
}
-static void
-sf_close(pcap_t *p)
+void
+sf_cleanup(pcap_t *p)
{
- if (p->sf.rfile != stdin)
- (void)fclose(p->sf.rfile);
- if (p->sf.base != NULL)
- free(p->sf.base);
+ if (p->rfile != stdin)
+ (void)fclose(p->rfile);
+ if (p->buffer != NULL)
+ free(p->buffer);
+ pcap_freecode(&p->fcode);
}
pcap_t *
-pcap_open_offline(const char *fname, char *errbuf)
+pcap_open_offline_with_tstamp_precision(const char *fname, u_int precision,
+ char *errbuf)
{
FILE *fp;
pcap_t *p;
@@ -967,7 +200,7 @@
return (NULL);
}
}
- p = pcap_fopen_offline(fp, errbuf);
+ p = pcap_fopen_offline_with_tstamp_precision(fp, precision, errbuf);
if (p == NULL) {
if (fp != stdin)
fclose(fp);
@@ -976,24 +209,73 @@
}
pcap_t *
-pcap_fopen_offline(FILE *fp, char *errbuf)
+pcap_open_offline(const char *fname, char *errbuf)
{
- register pcap_t *p;
- struct pcap_file_header hdr;
- size_t amt_read;
- bpf_u_int32 magic;
- int linklen;
+ return (pcap_open_offline_with_tstamp_precision(fname,
+ PCAP_TSTAMP_PRECISION_MICRO, errbuf));
+}
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- strlcpy(errbuf, "out of swap", PCAP_ERRBUF_SIZE);
- return (NULL);
+#ifdef WIN32
+pcap_t* pcap_hopen_offline_with_tstamp_precision(intptr_t osfd, u_int precision,
+ char *errbuf)
+{
+ int fd;
+ FILE *file;
+
+ fd = _open_osfhandle(osfd, _O_RDONLY);
+ if ( fd < 0 )
+ {
+ snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
+ return NULL;
}
- memset((char *)p, 0, sizeof(*p));
+ file = _fdopen(fd, "rb");
+ if ( file == NULL )
+ {
+ snprintf(errbuf, PCAP_ERRBUF_SIZE, pcap_strerror(errno));
+ return NULL;
+ }
- amt_read = fread((char *)&hdr, 1, sizeof(hdr), fp);
- if (amt_read != sizeof(hdr)) {
+ return pcap_fopen_offline_with_tstamp_precision(file, precision,
+ errbuf);
+}
+
+pcap_t* pcap_hopen_offline(intptr_t osfd, char *errbuf)
+{
+ return pcap_hopen_offline_with_tstamp_precision(osfd,
+ PCAP_TSTAMP_PRECISION_MICRO, errbuf);
+}
+#endif
+
+static pcap_t *(*check_headers[])(bpf_u_int32, FILE *, u_int, char *, int *) = {
+ pcap_check_header,
+ pcap_ng_check_header
+};
+
+#define N_FILE_TYPES (sizeof check_headers / sizeof check_headers[0])
+
+#ifdef WIN32
+static
+#endif
+pcap_t *
+pcap_fopen_offline_with_tstamp_precision(FILE *fp, u_int precision,
+ char *errbuf)
+{
+ register pcap_t *p;
+ bpf_u_int32 magic;
+ size_t amt_read;
+ u_int i;
+ int err;
+
+ /*
+ * Read the first 4 bytes of the file; the network analyzer dump
+ * file formats we support (pcap and pcap-ng), and several other
+ * formats we might support in the future (such as snoop, DOS and
+ * Windows Sniffer, and Microsoft Network Monitor) all have magic
+ * numbers that are unique in their first 4 bytes.
+ */
+ amt_read = fread((char *)&magic, 1, sizeof(magic), fp);
+ if (amt_read != sizeof(magic)) {
if (ferror(fp)) {
snprintf(errbuf, PCAP_ERRBUF_SIZE,
"error reading dump file: %s",
@@ -1001,143 +283,41 @@
} else {
snprintf(errbuf, PCAP_ERRBUF_SIZE,
"truncated dump file; tried to read %lu file header bytes, only got %lu",
- (unsigned long)sizeof(hdr),
+ (unsigned long)sizeof(magic),
(unsigned long)amt_read);
}
- goto bad;
+ return (NULL);
}
- magic = hdr.magic;
- if (magic != TCPDUMP_MAGIC && magic != KUZNETZOV_TCPDUMP_MAGIC) {
- magic = SWAPLONG(magic);
- if (magic != TCPDUMP_MAGIC && magic != KUZNETZOV_TCPDUMP_MAGIC) {
- snprintf(errbuf, PCAP_ERRBUF_SIZE,
- "bad dump file format");
- goto bad;
- }
- p->sf.swapped = 1;
- swap_hdr(&hdr);
- }
- if (magic == KUZNETZOV_TCPDUMP_MAGIC) {
- /*
- * XXX - the patch that's in some versions of libpcap
- * changes the packet header but not the magic number,
- * and some other versions with this magic number have
- * some extra debugging information in the packet header;
- * we'd have to use some hacks^H^H^H^H^Hheuristics to
- * detect those variants.
- *
- * Ethereal does that, but it does so by trying to read
- * the first two packets of the file with each of the
- * record header formats. That currently means it seeks
- * backwards and retries the reads, which doesn't work
- * on pipes. We want to be able to read from a pipe, so
- * that strategy won't work; we'd have to buffer some
- * data ourselves and read from that buffer in order to
- * make that work.
- */
- p->sf.hdrsize = sizeof(struct pcap_sf_patched_pkthdr);
- } else
- p->sf.hdrsize = sizeof(struct pcap_sf_pkthdr);
- if (hdr.version_major < PCAP_VERSION_MAJOR) {
- snprintf(errbuf, PCAP_ERRBUF_SIZE, "archaic file format");
- goto bad;
- }
- p->tzoff = hdr.thiszone;
- p->snapshot = hdr.snaplen;
- p->linktype = linktype_to_dlt(hdr.linktype);
- if (magic == KUZNETZOV_TCPDUMP_MAGIC && p->linktype == DLT_EN10MB) {
- /*
- * This capture might have been done in raw mode or cooked
- * mode.
- *
- * If it was done in cooked mode, p->snapshot was passed
- * to recvfrom() as the buffer size, meaning that the
- * most packet data that would be copied would be
- * p->snapshot. However, a faked Ethernet header would
- * then have been added to it, so the most data that would
- * be in a packet in the file would be p->snapshot + 14.
- *
- * We can't easily tell whether the capture was done in
- * raw mode or cooked mode, so we'll assume it was
- * cooked mode, and add 14 to the snapshot length. That
- * means that, for a raw capture, the snapshot length will
- * be misleading if you use it to figure out why a capture
- * doesn't have all the packet data, but there's not much
- * we can do to avoid that.
- */
- p->snapshot += 14;
- }
- p->sf.rfile = fp;
-#ifndef WIN32
- p->bufsize = hdr.snaplen;
-#else
- /* Allocate the space for pcap_pkthdr as well. It will be used by pcap_read_ex */
- p->bufsize = hdr.snaplen+sizeof(struct pcap_pkthdr);
-#endif
-
- /* Align link header as required for proper data alignment */
- /* XXX should handle all types */
- switch (p->linktype) {
-
- case DLT_EN10MB:
- linklen = 14;
- break;
-
- case DLT_FDDI:
- linklen = 13 + 8; /* fddi_header + llc */
- break;
-
- case DLT_NULL:
- default:
- linklen = 0;
- break;
- }
-
- if (p->bufsize < 0)
- p->bufsize = BPF_MAXBUFSIZE;
- p->sf.base = (u_char *)malloc(p->bufsize + BPF_ALIGNMENT);
- if (p->sf.base == NULL) {
- strlcpy(errbuf, "out of swap", PCAP_ERRBUF_SIZE);
- goto bad;
- }
- p->buffer = p->sf.base + BPF_ALIGNMENT - (linklen % BPF_ALIGNMENT);
- p->sf.version_major = hdr.version_major;
- p->sf.version_minor = hdr.version_minor;
-#ifdef PCAP_FDDIPAD
- /* Padding only needed for live capture fcode */
- p->fddipad = 0;
-#endif
/*
- * We interchanged the caplen and len fields at version 2.3,
- * in order to match the bpf header layout. But unfortunately
- * some files were written with version 2.3 in their headers
- * but without the interchanged fields.
- *
- * In addition, DG/UX tcpdump writes out files with a version
- * number of 543.0, and with the caplen and len fields in the
- * pre-2.3 order.
+ * Try all file types.
*/
- switch (hdr.version_major) {
-
- case 2:
- if (hdr.version_minor < 3)
- p->sf.lengths_swapped = SWAPPED;
- else if (hdr.version_minor == 3)
- p->sf.lengths_swapped = MAYBE_SWAPPED;
- else
- p->sf.lengths_swapped = NOT_SWAPPED;
- break;
-
- case 543:
- p->sf.lengths_swapped = SWAPPED;
- break;
-
- default:
- p->sf.lengths_swapped = NOT_SWAPPED;
- break;
+ for (i = 0; i < N_FILE_TYPES; i++) {
+ p = (*check_headers[i])(magic, fp, precision, errbuf, &err);
+ if (p != NULL) {
+ /* Yup, that's it. */
+ goto found;
+ }
+ if (err) {
+ /*
+ * Error trying to read the header.
+ */
+ return (NULL);
+ }
}
+ /*
+ * Well, who knows what this mess is....
+ */
+ snprintf(errbuf, PCAP_ERRBUF_SIZE, "unknown file format");
+ return (NULL);
+
+found:
+ p->rfile = fp;
+
+ /* Padding only needed for live capture fcode */
+ p->fddipad = 0;
+
#if !defined(WIN32) && !defined(MSDOS)
/*
* You can do "select()" and "poll()" on plain files on most
@@ -1157,160 +337,36 @@
p->getnonblock_op = sf_getnonblock;
p->setnonblock_op = sf_setnonblock;
p->stats_op = sf_stats;
- p->close_op = sf_close;
-
- return (p);
- bad:
- free(p);
- return (NULL);
-}
-
-/*
- * Read sf_readfile and return the next packet. Return the header in hdr
- * and the contents in buf. Return 0 on success, SFERR_EOF if there were
- * no more packets, and SFERR_TRUNC if a partial packet was encountered.
- */
-static int
-sf_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char *buf, u_int buflen)
-{
- struct pcap_sf_patched_pkthdr sf_hdr;
- FILE *fp = p->sf.rfile;
- size_t amt_read;
- bpf_u_int32 t;
+#ifdef WIN32
+ p->setbuff_op = sf_setbuff;
+ p->setmode_op = sf_setmode;
+ p->setmintocopy_op = sf_setmintocopy;
+#endif
/*
- * Read the packet header; the structure we use as a buffer
- * is the longer structure for files generated by the patched
- * libpcap, but if the file has the magic number for an
- * unpatched libpcap we only read as many bytes as the regular
- * header has.
+ * For offline captures, the standard one-shot callback can
+ * be used for pcap_next()/pcap_next_ex().
*/
- amt_read = fread(&sf_hdr, 1, p->sf.hdrsize, fp);
- if (amt_read != p->sf.hdrsize) {
- if (ferror(fp)) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "error reading dump file: %s",
- pcap_strerror(errno));
- return (-1);
- } else {
- if (amt_read != 0) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "truncated dump file; tried to read %d header bytes, only got %lu",
- p->sf.hdrsize, (unsigned long)amt_read);
- return (-1);
- }
- /* EOF */
- return (1);
- }
- }
+ p->oneshot_callback = pcap_oneshot;
- if (p->sf.swapped) {
- /* these were written in opposite byte order */
- hdr->caplen = SWAPLONG(sf_hdr.caplen);
- hdr->len = SWAPLONG(sf_hdr.len);
- hdr->ts.tv_sec = SWAPLONG(sf_hdr.ts.tv_sec);
- hdr->ts.tv_usec = SWAPLONG(sf_hdr.ts.tv_usec);
- } else {
- hdr->caplen = sf_hdr.caplen;
- hdr->len = sf_hdr.len;
- hdr->ts.tv_sec = sf_hdr.ts.tv_sec;
- hdr->ts.tv_usec = sf_hdr.ts.tv_usec;
- }
- /* Swap the caplen and len fields, if necessary. */
- switch (p->sf.lengths_swapped) {
+ p->activated = 1;
- case NOT_SWAPPED:
- break;
+ return (p);
+}
- case MAYBE_SWAPPED:
- if (hdr->caplen <= hdr->len) {
- /*
- * The captured length is <= the actual length,
- * so presumably they weren't swapped.
- */
- break;
- }
- /* FALLTHROUGH */
-
- case SWAPPED:
- t = hdr->caplen;
- hdr->caplen = hdr->len;
- hdr->len = t;
- break;
- }
-
- if (hdr->caplen > buflen) {
- /*
- * This can happen due to Solaris 2.3 systems tripping
- * over the BUFMOD problem and not setting the snapshot
- * correctly in the savefile header. If the caplen isn't
- * grossly wrong, try to salvage.
- */
- static u_char *tp = NULL;
- static size_t tsize = 0;
-
- if (hdr->caplen > 65535) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "bogus savefile header");
- return (-1);
- }
-
- if (tsize < hdr->caplen) {
- tsize = ((hdr->caplen + 1023) / 1024) * 1024;
- if (tp != NULL)
- free((u_char *)tp);
- tp = (u_char *)malloc(tsize);
- if (tp == NULL) {
- tsize = 0;
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "BUFMOD hack malloc");
- return (-1);
- }
- }
- amt_read = fread((char *)tp, 1, hdr->caplen, fp);
- if (amt_read != hdr->caplen) {
- if (ferror(fp)) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "error reading dump file: %s",
- pcap_strerror(errno));
- } else {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "truncated dump file; tried to read %u captured bytes, only got %lu",
- hdr->caplen, (unsigned long)amt_read);
- }
- return (-1);
- }
- /*
- * We can only keep up to buflen bytes. Since caplen > buflen
- * is exactly how we got here, we know we can only keep the
- * first buflen bytes and must drop the remainder. Adjust
- * caplen accordingly, so we don't get confused later as
- * to how many bytes we have to play with.
- */
- hdr->caplen = buflen;
- memcpy((char *)buf, (char *)tp, buflen);
-
- } else {
- /* read the packet itself */
- amt_read = fread((char *)buf, 1, hdr->caplen, fp);
- if (amt_read != hdr->caplen) {
- if (ferror(fp)) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "error reading dump file: %s",
- pcap_strerror(errno));
- } else {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "truncated dump file; tried to read %u captured bytes, only got %lu",
- hdr->caplen, (unsigned long)amt_read);
- }
- return (-1);
- }
- }
- return (0);
+#ifdef WIN32
+static
+#endif
+pcap_t *
+pcap_fopen_offline(FILE *fp, char *errbuf)
+{
+ return (pcap_fopen_offline_with_tstamp_precision(fp,
+ PCAP_TSTAMP_PRECISION_MICRO, errbuf));
}
/*
- * Print out packets stored in the file initialized by sf_read_init().
+ * Read packets from a capture file, and call the callback for each
+ * packet.
* If cnt > 0, return after 'cnt' packets, otherwise continue until eof.
*/
int
@@ -1319,6 +375,7 @@
struct bpf_insn *fcode;
int status = 0;
int n = 0;
+ u_char *data;
while (status == 0) {
struct pcap_pkthdr h;
@@ -1340,7 +397,7 @@
return (n);
}
- status = sf_next_packet(p, &h, p->buffer, p->bufsize);
+ status = p->next_packet_op(p, &h, &data);
if (status) {
if (status == 1)
return (0);
@@ -1348,8 +405,8 @@
}
if ((fcode = p->fcode.bf_insns) == NULL ||
- bpf_filter(fcode, p->buffer, h.len, h.caplen)) {
- (*callback)(user, &h, p->buffer);
+ bpf_filter(fcode, data, h.len, h.caplen)) {
+ (*callback)(user, &h, data);
if (++n >= cnt && cnt > 0)
break;
}
@@ -1357,137 +414,3 @@
/*XXX this breaks semantics tcpslice expects */
return (n);
}
-
-/*
- * Output a packet to the initialized dump file.
- */
-void
-pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
-{
- register FILE *f;
- struct pcap_sf_pkthdr sf_hdr;
-
- f = (FILE *)user;
- sf_hdr.ts.tv_sec = h->ts.tv_sec;
- sf_hdr.ts.tv_usec = h->ts.tv_usec;
- sf_hdr.caplen = h->caplen;
- sf_hdr.len = h->len;
- /* XXX we should check the return status */
- (void)fwrite(&sf_hdr, sizeof(sf_hdr), 1, f);
- (void)fwrite(sp, h->caplen, 1, f);
-}
-
-static pcap_dumper_t *
-pcap_setup_dump(pcap_t *p, int linktype, FILE *f, const char *fname)
-{
-
-#if defined(WIN32) || defined(MSDOS)
- /*
- * If we're writing to the standard output, put it in binary
- * mode, as savefiles are binary files.
- *
- * Otherwise, we turn off buffering.
- * XXX - why? And why not on the standard output?
- */
- if (f == stdout)
- SET_BINMODE(f);
- else
- setbuf(f, NULL);
-#endif
- if (sf_write_header(f, linktype, p->tzoff, p->snapshot) == -1) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "Can't write to %s: %s",
- fname, pcap_strerror(errno));
- if (f != stdout)
- (void)fclose(f);
- return (NULL);
- }
- return ((pcap_dumper_t *)f);
-}
-
-/*
- * Initialize so that sf_write() will output to the file named 'fname'.
- */
-pcap_dumper_t *
-pcap_dump_open(pcap_t *p, const char *fname)
-{
- FILE *f;
- int linktype;
-
- linktype = dlt_to_linktype(p->linktype);
- if (linktype == -1) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "%s: link-layer type %d isn't supported in savefiles",
- fname, linktype);
- return (NULL);
- }
-
- if (fname[0] == '-' && fname[1] == '\0') {
- f = stdout;
- fname = "standard output";
- } else {
-#if !defined(WIN32) && !defined(MSDOS)
- f = fopen(fname, "w");
-#else
- f = fopen(fname, "wb");
-#endif
- if (f == NULL) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s",
- fname, pcap_strerror(errno));
- return (NULL);
- }
- }
- return (pcap_setup_dump(p, linktype, f, fname));
-}
-
-/*
- * Initialize so that sf_write() will output to the given stream.
- */
-pcap_dumper_t *
-pcap_dump_fopen(pcap_t *p, FILE *f)
-{
- int linktype;
-
- linktype = dlt_to_linktype(p->linktype);
- if (linktype == -1) {
- snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
- "stream: link-layer type %d isn't supported in savefiles",
- linktype);
- return (NULL);
- }
-
- return (pcap_setup_dump(p, linktype, f, "stream"));
-}
-
-FILE *
-pcap_dump_file(pcap_dumper_t *p)
-{
- return ((FILE *)p);
-}
-
-long
-pcap_dump_ftell(pcap_dumper_t *p)
-{
- return (ftell((FILE *)p));
-}
-
-int
-pcap_dump_flush(pcap_dumper_t *p)
-{
-
- if (fflush((FILE *)p) == EOF)
- return (-1);
- else
- return (0);
-}
-
-void
-pcap_dump_close(pcap_dumper_t *p)
-{
-
-#ifdef notyet
- if (ferror((FILE *)p))
- return-an-error;
- /* XXX should check return from fclose() too */
-#endif
- (void)fclose((FILE *)p);
-}