#include "config.h"
#endif
-#ifdef HAVE_PCAP_H
-#include <pcap.h>
-#endif
-
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "wtap-int.h"
#include "file_wrappers.h"
#include "buffer.h"
-#include "atm.h"
+#include "pcap-common.h"
+#include "pcap-encap.h"
#include "libpcap.h"
-#ifdef HAVE_PCAP_H
-# ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
-#include "wtap-capture.h"
-#endif
-
-/*
- * The link-layer header on SunATM packets.
- */
-struct sunatm_hdr {
- guint8 flags; /* destination and traffic type */
- guint8 vpi; /* VPI */
- guint16 vci; /* VCI */
-};
-
-/*
- * The link-layer header on Nokia IPSO ATM packets.
- */
-struct nokiaatm_hdr {
- guint8 flags; /* destination */
- guint8 vpi; /* VPI */
- guint16 vci; /* VCI */
-};
-
-/*
- * The fake link-layer header of IrDA packets as introduced by Jean Tourrilhes
- * to libpcap.
- */
-struct irda_sll_hdr {
- guint16 sll_pkttype; /* packet type */
- guint8 unused[12]; /* usused SLL header fields */
- guint16 sll_protocol; /* protocol, should be 0x0017 */
-};
-
-/*
- * A header containing additional MTP information.
- */
-struct mtp2_hdr {
- guint8 sent;
- guint8 annex_a_used;
- guint16 link_number;
-};
-
-#ifndef ETH_P_LAPD
-#define ETH_P_LAPD 0x0030
-#endif
+/* See source to the "libpcap" library for information on the "libpcap"
+ file format. */
/*
- * The fake link-layer header of LAPD packets
+ * Private per-wtap_t data needed to read a file.
*/
-struct lapd_sll_hdr {
- guint16 sll_pkttype; /* packet type */
- guint16 sll_hatype;
- guint16 sll_halen;
- guint8 sll_addr[8];
- guint16 sll_protocol; /* protocol, should be ETH_P_LAPD */
-};
+typedef enum {
+ NOT_SWAPPED,
+ SWAPPED,
+ MAYBE_SWAPPED
+} swapped_type_t;
-/* See source to the "libpcap" library for information on the "libpcap"
- file format. */
+typedef struct {
+ gboolean byte_swapped;
+ swapped_type_t lengths_swapped;
+ guint16 version_major;
+ guint16 version_minor;
+} libpcap_t;
/* On some systems, the FDDI MAC addresses are bit-swapped. */
#if !defined(ultrix) && !defined(__alpha) && !defined(__bsdi__)
static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info,
gint64 *data_offset);
static gboolean libpcap_seek_read(wtap *wth, gint64 seek_off,
- union wtap_pseudo_header *pseudo_header, guchar *pd, int length,
+ union wtap_pseudo_header *pseudo_header, guint8 *pd, int length,
int *err, gchar **err_info);
static int libpcap_read_header(wtap *wth, int *err, gchar **err_info,
struct pcaprec_ss990915_hdr *hdr);
static void adjust_header(wtap *wth, struct pcaprec_hdr *hdr);
-static void libpcap_get_sunatm_pseudoheader(const struct sunatm_hdr *atm_phdr,
- union wtap_pseudo_header *pseudo_header);
-static gboolean libpcap_read_sunatm_pseudoheader(FILE_T fh,
- union wtap_pseudo_header *pseudo_header, int *err);
-static gboolean libpcap_read_nokiaatm_pseudoheader(FILE_T fh,
- union wtap_pseudo_header *pseudo_header, int *err);
-static gboolean libpcap_get_irda_pseudoheader(const struct irda_sll_hdr *irda_phdr,
- union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
-static gboolean libpcap_read_irda_pseudoheader(FILE_T fh,
- union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
-static gboolean libpcap_get_mtp2_pseudoheader(const struct mtp2_hdr *mtp2_hdr,
- union wtap_pseudo_header *pseudo_header);
-static gboolean libpcap_read_mtp2_pseudoheader(FILE_T fh,
- union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
-static gboolean libpcap_get_lapd_pseudoheader(const struct lapd_sll_hdr *lapd_phdr,
- union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
-static gboolean libpcap_read_lapd_pseudoheader(FILE_T fh,
- union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
-static gboolean libpcap_read_rec_data(FILE_T fh, guchar *pd, int length,
- int *err);
-static void libpcap_close(wtap *wth);
+static gboolean libpcap_read_rec_data(FILE_T fh, guint8 *pd, int length,
+ int *err, gchar **err_info);
static gboolean libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
- const union wtap_pseudo_header *pseudo_header, const guchar *pd, int *err);
-
-/*
- * Either LBL NRG wasn't an adequate central registry (e.g., because of
- * the slow rate of releases from them), or nobody bothered using them
- * as a central registry, as many different groups have patched libpcap
- * (and BPF, on the BSDs) to add new encapsulation types, and have ended
- * up using the same DLT_ values for different encapsulation types.
- *
- * For those numerical encapsulation type values that everybody uses for
- * the same encapsulation type (which inclues those that some platforms
- * specify different DLT_ names for but don't appear to use), we map
- * those values to the appropriate Wiretap values.
- *
- * For those numerical encapsulation type values that different libpcap
- * variants use for different encapsulation types, we check what
- * <pcap.h> defined to determine how to interpret them, so that we
- * interpret them the way the libpcap with which we're building
- * Wireshark/Wiretap interprets them (which, if it doesn't support
- * them at all, means we don't support them either - any capture files
- * using them are foreign, and we don't hazard a guess as to which
- * platform they came from; we could, I guess, choose the most likely
- * platform).
- *
- * Note: if you need a new encapsulation type for libpcap files, do
- * *N*O*T* use *ANY* of the values listed here! I.e., do *NOT*
- * add a new encapsulation type by changing an existing entry;
- * leave the existing entries alone.
- *
- * Instead, send mail to tcpdump-workers@tcpdump.org, asking for a new
- * DLT_ value, and specifying the purpose of the new value. When you
- * get the new DLT_ value, use that numerical value in the "dlt_value"
- * field of "pcap_to_wtap_map[]".
- */
-
-static const struct {
- int dlt_value;
- int wtap_encap_value;
-} pcap_to_wtap_map[] = {
- /*
- * These are the values that are almost certainly the same
- * in all libpcaps (I've yet to find one where the values
- * in question are used for some purpose other than the
- * one below, but...), and that Wiretap and Wireshark
- * currently support.
- */
- { 0, WTAP_ENCAP_NULL }, /* null encapsulation */
- { 1, WTAP_ENCAP_ETHERNET },
- { 6, WTAP_ENCAP_TOKEN_RING }, /* IEEE 802 Networks - assume token ring */
- { 7, WTAP_ENCAP_ARCNET },
- { 8, WTAP_ENCAP_SLIP },
- { 9, WTAP_ENCAP_PPP },
-#ifdef BIT_SWAPPED_MAC_ADDRS
- { 10, WTAP_ENCAP_FDDI_BITSWAPPED },
-#else
- { 10, WTAP_ENCAP_FDDI },
-#endif
-
- { 32, WTAP_ENCAP_REDBACK },
-
- /*
- * 50 is DLT_PPP_SERIAL in NetBSD; it appears that DLT_PPP
- * on BSD (at least according to standard tcpdump) has, as
- * the first octet, an indication of whether the packet was
- * transmitted or received (rather than having the standard
- * PPP address value of 0xff), but that DLT_PPP_SERIAL puts
- * a real live PPP header there, or perhaps a Cisco PPP header
- * as per section 4.3.1 of RFC 1547 (implementations of this
- * exist in various BSDs in "sys/net/if_spppsubr.c", and
- * I think also exist either in standard Linux or in
- * various Linux patches; the implementations show how to handle
- * Cisco keepalive packets).
- *
- * However, I don't see any obvious place in FreeBSD "if_ppp.c"
- * where anything other than the standard PPP header would be
- * passed up. I see some stuff that sets the first octet
- * to 0 for incoming and 1 for outgoing packets before applying
- * a BPF filter to see whether to drop packets whose protocol
- * field has the 0x8000 bit set, i.e. network control protocols -
- * those are handed up to userland - but that code puts the
- * address field back before passing the packet up.
- *
- * I also don't see anything immediately obvious that munges
- * the address field for sync PPP, either.
- *
- * Wireshark currently assumes that if the first octet of a
- * PPP frame is 0xFF, it's the address field and is followed
- * by a control field and a 2-byte protocol, otherwise the
- * address and control fields are absent and the frame begins
- * with a protocol field. If we ever see a BSD/OS PPP
- * capture, we'll have to handle it differently, and we may
- * have to handle standard BSD captures differently if, in fact,
- * they don't have 0xff 0x03 as the first two bytes - but, as per
- * the two paragraphs preceding this, it's not clear that
- * the address field *is* munged into an incoming/outgoing
- * field when the packet is handed to the BPF device.
- *
- * For now, we just map DLT_PPP_SERIAL to WTAP_ENCAP_PPP, as
- * we treat WTAP_ENCAP_PPP packets as if those beginning with
- * 0xff have the standard RFC 1662 "PPP in HDLC-like Framing"
- * 0xff 0x03 address/control header, and DLT_PPP_SERIAL frames
- * appear to contain that unless they're Cisco frames (if we
- * ever see a capture with them, we'd need to implement the
- * RFC 1547 stuff, and the keepalive protocol stuff).
- *
- * We may have to distinguish between "PPP where if it doesn't
- * begin with 0xff there's no HDLC encapsulation and the frame
- * begins with the protocol field" (which is how we handle
- * WTAP_ENCAP_PPP now) and "PPP where there's either HDLC
- * encapsulation or Cisco PPP" (which is what DLT_PPP_SERIAL
- * is) at some point.
- *
- * XXX - NetBSD has DLT_HDLC, which appears to be used for
- * Cisco HDLC. Ideally, they should use DLT_PPP_SERIAL
- * only for real live HDLC-encapsulated PPP, not for Cisco
- * HDLC.
- */
- { 50, WTAP_ENCAP_PPP },
-
- /*
- * Apparently used by the Axent Raptor firewall (now Symantec
- * Enterprise Firewall).
- * Thanks, Axent, for not reserving that type with tcpdump.org
- * and not telling anybody about it.
- */
- { 99, WTAP_ENCAP_SYMANTEC },
-
- /*
- * These are the values that libpcap 0.5 and later use in
- * capture file headers, in an attempt to work around the
- * confusion decried above, and that Wiretap and Wireshark
- * currently support.
- */
- { 100, WTAP_ENCAP_ATM_RFC1483 },
- { 101, WTAP_ENCAP_RAW_IP },
-#if 0
- /*
- * More values used by libpcap 0.5 as DLT_ values and used by the
- * current CVS version of libpcap in capture file headers.
- * They are not yet handled in Wireshark.
- * If we get a capture that contains them, we'll implement them.
- */
- { 102, WTAP_ENCAP_SLIP_BSDOS },
- { 103, WTAP_ENCAP_PPP_BSDOS },
-#endif
-
- /*
- * These ones are handled in Wireshark, though.
- */
- { 104, WTAP_ENCAP_CHDLC }, /* Cisco HDLC */
- { 105, WTAP_ENCAP_IEEE_802_11 }, /* IEEE 802.11 */
- { 106, WTAP_ENCAP_LINUX_ATM_CLIP },
- { 107, WTAP_ENCAP_FRELAY }, /* Frame Relay */
- { 108, WTAP_ENCAP_NULL }, /* OpenBSD loopback */
- { 109, WTAP_ENCAP_ENC }, /* OpenBSD IPSEC enc */
-#if 0
- { 110, WTAP_ENCAP_LANE_802_3 },/* ATM LANE 802.3 */
- { 111, WTAP_ENCAP_HIPPI }, /* NetBSD HIPPI */
-#endif
- { 112, WTAP_ENCAP_CHDLC }, /* NetBSD HDLC framing */
-
- /*
- * Linux "cooked mode" captures, used by the current CVS version
- * of libpcap.
- */
- { 113, WTAP_ENCAP_SLL }, /* Linux cooked capture */
-
- { 114, WTAP_ENCAP_LOCALTALK }, /* Localtalk */
-
- /*
- * The tcpdump.org version of libpcap uses 117, rather than 17,
- * for OpenBSD packet filter logging, so as to avoid conflicting
- * with DLT_LANE8023 in SuSE 6.3 libpcap.
- */
- { 117, WTAP_ENCAP_PFLOG },
-
- { 118, WTAP_ENCAP_CISCO_IOS },
- { 119, WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */
- { 121, WTAP_ENCAP_HHDLC }, /* HiPath HDLC */
- { 122, WTAP_ENCAP_IP_OVER_FC }, /* RFC 2625 IP-over-FC */
- { 123, WTAP_ENCAP_ATM_PDUS }, /* SunATM */
- { 127, WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP }, /* 802.11 plus radiotap WLAN header */
- { 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */
- { 129, WTAP_ENCAP_ARCNET_LINUX },
- { 130, WTAP_ENCAP_JUNIPER_MLPPP }, /* Juniper MLPPP on ML-, LS-, AS- PICs */
- { 131, WTAP_ENCAP_JUNIPER_MLFR }, /* Juniper MLFR (FRF.15) on ML-, LS-, AS- PICs */
- { 133, WTAP_ENCAP_JUNIPER_GGSN},
- /*
- * Values 132-134, 136 not listed here are reserved for use
- * in Juniper hardware.
- */
- { 135, WTAP_ENCAP_JUNIPER_ATM2 }, /* various encapsulations captured on the ATM2 PIC */
- { 137, WTAP_ENCAP_JUNIPER_ATM1 }, /* various encapsulations captured on the ATM1 PIC */
-
- { 138, WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 },
- /* Apple IP-over-IEEE 1394 */
-
- { 139, WTAP_ENCAP_MTP2_WITH_PHDR },
- { 140, WTAP_ENCAP_MTP2 },
- { 141, WTAP_ENCAP_MTP3 },
- { 143, WTAP_ENCAP_DOCSIS },
- { 144, WTAP_ENCAP_IRDA }, /* IrDA capture */
-
- /* Reserved for private use. */
- { 147, WTAP_ENCAP_USER0 },
- { 148, WTAP_ENCAP_USER1 },
- { 149, WTAP_ENCAP_USER2 },
- { 150, WTAP_ENCAP_USER3 },
- { 151, WTAP_ENCAP_USER4 },
- { 152, WTAP_ENCAP_USER5 },
- { 153, WTAP_ENCAP_USER6 },
- { 154, WTAP_ENCAP_USER7 },
- { 155, WTAP_ENCAP_USER8 },
- { 156, WTAP_ENCAP_USER9 },
- { 157, WTAP_ENCAP_USER10 },
- { 158, WTAP_ENCAP_USER11 },
- { 159, WTAP_ENCAP_USER12 },
- { 160, WTAP_ENCAP_USER13 },
- { 161, WTAP_ENCAP_USER14 },
- { 162, WTAP_ENCAP_USER15 },
-
- { 163, WTAP_ENCAP_IEEE_802_11_WLAN_AVS }, /* 802.11 plus AVS WLAN header */
-
- /*
- * 164 is reserved for Juniper-private chassis-internal
- * meta-information such as QoS profiles, etc..
- */
-
- { 165, WTAP_ENCAP_BACNET_MS_TP },
-
- /*
- * 166 is reserved for a PPP variant in which the first byte
- * of the 0xff03 header, the 0xff, is replaced by a direction
- * byte. I don't know whether any captures look like that,
- * but it is used for some Linux IP filtering (ipfilter?).
- */
-
- /* Ethernet PPPoE frames captured on a service PIC */
- { 167, WTAP_ENCAP_JUNIPER_PPPOE },
-
- /*
- * 168 is reserved for more Juniper private-chassis-
- * internal meta-information.
- */
-
- { 169, WTAP_ENCAP_GPRS_LLC },
-
- /*
- * 170 and 171 are reserved for ITU-T G.7041/Y.1303 Generic
- * Framing Procedure.
- */
-
- /* Registered by Gcom, Inc. */
- { 172, WTAP_GCOM_TIE1 },
- { 173, WTAP_GCOM_SERIAL },
-
- { 177, WTAP_ENCAP_LINUX_LAPD },
-
- /* Ethernet frames prepended with meta-information */
- { 178, WTAP_ENCAP_JUNIPER_ETHER },
- /* PPP frames prepended with meta-information */
- { 179, WTAP_ENCAP_JUNIPER_PPP },
- /* Frame-Relay frames prepended with meta-information */
- { 180, WTAP_ENCAP_JUNIPER_FRELAY },
- /* C-HDLC frames prepended with meta-information */
- { 181, WTAP_ENCAP_JUNIPER_CHDLC },
- /* VOIP Frames prepended with meta-information */
- { 183, WTAP_ENCAP_JUNIPER_VP },
- /* raw USB packets */
- { 186, WTAP_ENCAP_USB },
- /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */
- { 187, WTAP_ENCAP_BLUETOOTH_H4 },
- /* IEEE 802.16 MAC Common Part Sublayer */
- { 188, WTAP_ENCAP_IEEE802_16_MAC_CPS },
-
- /*
- * To repeat:
- *
- * If you need a new encapsulation type for libpcap files, do
- * *N*O*T* use *ANY* of the values listed here! I.e., do *NOT*
- * add a new encapsulation type by changing an existing entry;
- * leave the existing entries alone.
- *
- * Instead, send mail to tcpdump-workers@tcpdump.org, asking for
- * a new DLT_ value, and specifying the purpose of the new value.
- * When you get the new DLT_ value, use that numerical value in
- * the "dlt_value" field of "pcap_to_wtap_map[]".
- */
-
- /*
- * The following are entries for libpcap type values that have
- * different meanings on different OSes.
- *
- * We put these *after* the entries for the platform-independent
- * libpcap type values for those Wiretap encapsulation types, so
- * that Wireshark chooses the platform-independent libpcap type
- * value for those encapsulatioin types, not the platform-dependent
- * one.
- */
-
- /*
- * 11 is DLT_ATM_RFC1483 on most platforms; the only libpcaps I've
- * seen that define anything other than DLT_ATM_RFC1483 as 11 are
- * the BSD/OS one, which defines DLT_FR as 11, and libpcap 0.5,
- * which define it as 100, mapping the kernel's value to 100, in
- * an attempt to hide the different values used on different
- * platforms.
- *
- * If this is a platform where DLT_FR is defined as 11, we
- * don't handle 11 at all; otherwise, we handle it as
- * DLT_ATM_RFC1483 (this means we'd misinterpret Frame Relay
- * captures from BSD/OS if running on platforms other than BSD/OS,
- * but
- *
- * 1) we don't yet support DLT_FR
- *
- * and
- *
- * 2) nothing short of a heuristic would let us interpret
- * them correctly).
- */
-#if defined(DLT_FR) && (DLT_FR == 11)
- { 11, WTAP_ENCAP_FRELAY },
-#else
- { 11, WTAP_ENCAP_ATM_RFC1483 },
-#endif
-
- /*
- * 12 is DLT_RAW on most platforms, but it's DLT_C_HDLC on
- * BSD/OS, and DLT_LOOP on OpenBSD.
- *
- * We don't yet handle DLT_C_HDLC, but we can handle DLT_LOOP
- * (it's just like DLT_NULL, only with the AF_ value in network
- * rather than host byte order - Wireshark figures out the
- * byte order from the data, so we don't care what byte order
- * it's in), so if DLT_LOOP is defined as 12, interpret 12
- * as WTAP_ENCAP_NULL, otherwise, unless DLT_C_HDLC is defined
- * as 12, interpret it as WTAP_ENCAP_RAW_IP.
- */
-#if defined(DLT_LOOP) && (DLT_LOOP == 12)
- { 12, WTAP_ENCAP_NULL },
-#elif defined(DLT_C_HDLC) && (DLT_C_HDLC == 12)
- /*
- * Put entry for Cisco HDLC here.
- * XXX - is this just WTAP_ENCAP_CHDLC, i.e. does the frame
- * start with a 4-byte Cisco HDLC header?
- */
-#else
- { 12, WTAP_ENCAP_RAW_IP },
-#endif
-
- /*
- * 13 is DLT_SLIP_BSDOS on FreeBSD and NetBSD, but those OSes
- * don't actually generate it. I infer that BSD/OS translates
- * DLT_SLIP from the kernel BPF code to DLT_SLIP_BSDOS in
- * libpcap, as the BSD/OS link-layer header is different;
- * however, in BSD/OS, DLT_SLIP_BSDOS is 15.
- *
- * From this, I infer that there's no point in handling 13
- * as DLT_SLIP_BSDOS.
- *
- * 13 is DLT_ATM_RFC1483 on BSD/OS.
- *
- * 13 is DLT_ENC in OpenBSD, which is, I suspect, some kind
- * of decrypted IPSEC traffic.
- */
-#if defined(DLT_ATM_RFC1483) && (DLT_ATM_RFC1483 == 13)
- { 13, WTAP_ENCAP_ATM_RFC1483 },
-#elif defined(DLT_ENC) && (DLT_ENC == 13)
- { 13, WTAP_ENCAP_ENC },
-#endif
-
- /*
- * 14 is DLT_PPP_BSDOS on FreeBSD and NetBSD, but those OSes
- * don't actually generate it. I infer that BSD/OS translates
- * DLT_PPP from the kernel BPF code to DLT_PPP_BSDOS in
- * libpcap, as the BSD/OS link-layer header is different;
- * however, in BSD/OS, DLT_PPP_BSDOS is 16.
- *
- * From this, I infer that there's no point in handling 14
- * as DLT_PPP_BSDOS.
- *
- * 14 is DLT_RAW on BSD/OS and OpenBSD.
- */
- { 14, WTAP_ENCAP_RAW_IP },
-
- /*
- * 15 is:
- *
- * DLT_SLIP_BSDOS on BSD/OS;
- *
- * DLT_HIPPI on NetBSD;
- *
- * DLT_LANE8023 with Alexey Kuznetzov's patches for
- * Linux libpcap;
- *
- * DLT_I4L_RAWIP with the ISDN4Linux patches for libpcap
- * (and on SuSE 6.3);
- *
- * but we don't currently handle any of those.
- */
-
- /*
- * 16 is:
- *
- * DLT_PPP_BSDOS on BSD/OS;
- *
- * DLT_HDLC on NetBSD (Cisco HDLC);
- *
- * DLT_CIP with Alexey Kuznetzov's patches for
- * Linux libpcap - this is WTAP_ENCAP_LINUX_ATM_CLIP;
- *
- * DLT_I4L_IP with the ISDN4Linux patches for libpcap
- * (and on SuSE 6.3).
- */
-#if defined(DLT_CIP) && (DLT_CIP == 16)
- { 16, WTAP_ENCAP_LINUX_ATM_CLIP },
-#endif
-#if defined(DLT_HDLC) && (DLT_HDLC == 16)
- { 16, WTAP_ENCAP_CHDLC },
-#endif
-
- /*
- * 17 is DLT_LANE8023 in SuSE 6.3 libpcap; we don't currently
- * handle it.
- * It is also used as the PF (Packet Filter) logging format beginning
- * with OpenBSD 3.0; we use 17 for PF logs unless DLT_LANE8023 is
- * defined with the value 17.
- */
-#if !defined(DLT_LANE8023) || (DLT_LANE8023 != 17)
- { 17, WTAP_ENCAP_OLD_PFLOG },
-#endif
-
- /*
- * 18 is DLT_CIP in SuSE 6.3 libpcap; if it's the same as the
- * DLT_CIP of 16 that the Alexey Kuznetzov patches for
- * libpcap/tcpdump define, it's WTAP_ENCAP_LINUX_ATM_CLIP.
- * I've not found any libpcap that uses it for any other purpose -
- * hopefully nobody will do so in the future.
- */
- { 18, WTAP_ENCAP_LINUX_ATM_CLIP },
-
- /*
- * 19 is DLT_ATM_CLIP in the libpcap/tcpdump patches in the
- * recent versions I've seen of the Linux ATM distribution;
- * I've not yet found any libpcap that uses it for any other
- * purpose - hopefully nobody will do so in the future.
- */
- { 19, WTAP_ENCAP_LINUX_ATM_CLIP },
-
- /*
- * nettl (HP-UX) mappings to standard DLT values
- */
-
- { 1, WTAP_ENCAP_NETTL_ETHERNET },
- { 6, WTAP_ENCAP_NETTL_TOKEN_RING },
- { 10, WTAP_ENCAP_NETTL_FDDI },
- { 101, WTAP_ENCAP_NETTL_RAW_IP },
-
- /*
- * To repeat:
- *
- * If you need a new encapsulation type for libpcap files, do
- * *N*O*T* use *ANY* of the values listed here! I.e., do *NOT*
- * add a new encapsulation type by changing an existing entry;
- * leave the existing entries alone.
- *
- * Instead, send mail to tcpdump-workers@tcpdump.org, asking for
- * a new DLT_ value, and specifying the purpose of the new value.
- * When you get the new DLT_ value, use that numerical value in
- * the "dlt_value" field of "pcap_to_wtap_map[]".
- */
-
-};
-#define NUM_PCAP_ENCAPS (sizeof pcap_to_wtap_map / sizeof pcap_to_wtap_map[0])
-
-int wtap_pcap_encap_to_wtap_encap(int encap)
-{
- unsigned int i;
-
- for (i = 0; i < NUM_PCAP_ENCAPS; i++) {
- if (pcap_to_wtap_map[i].dlt_value == encap)
- return pcap_to_wtap_map[i].wtap_encap_value;
- }
- return WTAP_ENCAP_UNKNOWN;
-}
-
+ const union wtap_pseudo_header *pseudo_header, const guint8 *pd, int *err);
int libpcap_open(wtap *wth, int *err, gchar **err_info)
{
gboolean modified;
gboolean aix;
int file_encap;
-
+ libpcap_t *libpcap;
/* Read in the number that should be at the start of a "libpcap" file */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&magic, 1, sizeof magic, wth->fh);
+ bytes_read = file_read(&magic, sizeof magic, wth->fh);
if (bytes_read != sizeof magic) {
- *err = file_error(wth->fh);
+ *err = file_error(wth->fh, err_info);
if (*err != 0)
return -1;
return 0;
break;
case PCAP_NSEC_MAGIC:
- /* Host that wrote it has our byte order, and was running
- a program using either standard or ss990417 libpcap. */
+ /* Host that wrote it has our byte order, and was writing
+ the file in a format similar to standard libpcap
+ except that the time stamps have nanosecond resolution. */
byte_swapped = FALSE;
modified = FALSE;
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
case PCAP_SWAPPED_NSEC_MAGIC:
/* Host that wrote it out has a byte order opposite to
- ours, and was running a program using either ss990915
- or ss991029 libpcap. */
+ ours, and was writing the file in a format similar to
+ standard libpcap except that the time stamps have
+ nanosecond resolution. */
byte_swapped = TRUE;
modified = FALSE;
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
/* Read the rest of the header. */
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&hdr, 1, sizeof hdr, wth->fh);
+ bytes_read = file_read(&hdr, sizeof hdr, wth->fh);
if (bytes_read != sizeof hdr) {
- *err = file_error(wth->fh);
+ *err = file_error(wth->fh, err_info);
if (*err != 0)
return -1;
return 0;
}
}
- /*
- * We treat a DLT_ value of 13 specially - it appears that in
- * Nokia libpcap format, it's some form of ATM with what I
- * suspect is a pseudo-header (even though Nokia's IPSO is
- * based on FreeBSD, which #defines DLT_SLIP_BSDOS as 13).
- *
- * We don't yet know whether this is a Nokia capture, so if
- * "wtap_pcap_encap_to_wtap_encap()" returned WTAP_ENCAP_UNKNOWN
- * but "hdr.network" is 13, we don't treat that as an error yet.
- */
file_encap = wtap_pcap_encap_to_wtap_encap(hdr.network);
- if (file_encap == WTAP_ENCAP_UNKNOWN && hdr.network != 13) {
+ if (file_encap == WTAP_ENCAP_UNKNOWN) {
*err = WTAP_ERR_UNSUPPORTED_ENCAP;
*err_info = g_strdup_printf("pcap: network type %u unknown or unsupported",
hdr.network);
}
/* This is a libpcap file */
- wth->capture.pcap = g_malloc(sizeof(libpcap_t));
- wth->capture.pcap->byte_swapped = byte_swapped;
- wth->capture.pcap->version_major = hdr.version_major;
- wth->capture.pcap->version_minor = hdr.version_minor;
+ libpcap = (libpcap_t *)g_malloc(sizeof(libpcap_t));;
+ libpcap->byte_swapped = byte_swapped;
+ libpcap->version_major = hdr.version_major;
+ libpcap->version_minor = hdr.version_minor;
+ wth->priv = (void *)libpcap;
wth->subtype_read = libpcap_read;
wth->subtype_seek_read = libpcap_seek_read;
- wth->subtype_close = libpcap_close;
wth->file_encap = file_encap;
wth->snapshot_length = hdr.snaplen;
case 2:
if (hdr.version_minor < 3)
- wth->capture.pcap->lengths_swapped = SWAPPED;
+ libpcap->lengths_swapped = SWAPPED;
else if (hdr.version_minor == 3)
- wth->capture.pcap->lengths_swapped = MAYBE_SWAPPED;
+ libpcap->lengths_swapped = MAYBE_SWAPPED;
else
- wth->capture.pcap->lengths_swapped = NOT_SWAPPED;
+ libpcap->lengths_swapped = NOT_SWAPPED;
break;
case 543:
- wth->capture.pcap->lengths_swapped = SWAPPED;
+ libpcap->lengths_swapped = SWAPPED;
break;
default:
- wth->capture.pcap->lengths_swapped = NOT_SWAPPED;
+ libpcap->lengths_swapped = NOT_SWAPPED;
break;
}
* Well, we couldn't even read it.
* Give up.
*/
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
case THIS_FORMAT:
* Put the seek pointer back, and return success.
*/
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
}
return 1;
*/
wth->file_type = WTAP_FILE_PCAP_SS990915;
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
}
} else {
* Well, we couldn't even read it.
* Give up.
*/
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
case THIS_FORMAT:
* Put the seek pointer back, and return success.
*/
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
}
return 1;
*/
wth->file_type = WTAP_FILE_PCAP_SS990417;
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
}
switch (libpcap_try(wth, err)) {
* Well, we couldn't even read it.
* Give up.
*/
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
case THIS_FORMAT:
* Put the seek pointer back, and return success.
*/
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
}
return 1;
*/
wth->file_type = WTAP_FILE_PCAP_NOKIA;
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
- g_free(wth->capture.pcap);
+ g_free(wth->priv);
return -1;
}
}
- if (hdr.network == 13) {
- /*
- * OK, if this was a Nokia capture, make it
- * WTAP_ENCAP_ATM_PDUS, otherwise return
- * an error.
- */
- if (wth->file_type == WTAP_FILE_PCAP_NOKIA)
- wth->file_encap = WTAP_ENCAP_ATM_PDUS;
- else {
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
- *err_info = g_strdup_printf("pcap: network type %u unknown or unsupported",
- hdr.network);
- g_free(wth->capture.pcap);
- return -1;
- }
- }
+ /*
+ * We treat a DLT_ value of 13 specially - it appears that in
+ * Nokia libpcap format, it's some form of ATM with what I
+ * suspect is a pseudo-header (even though Nokia's IPSO is
+ * based on FreeBSD, which #defines DLT_SLIP_BSDOS as 13).
+ *
+ * If this is a Nokia capture, treat 13 as WTAP_ENCAP_ATM_PDUS,
+ * rather than as what we normally treat it.
+ */
+ if (wth->file_type == WTAP_FILE_PCAP_NOKIA && hdr.network == 13)
+ wth->file_encap = WTAP_ENCAP_ATM_PDUS;
return 1;
}
*/
struct pcaprec_ss990915_hdr first_rec_hdr, second_rec_hdr;
+
/*
* Attempt to read the first record's header.
*/
return THIS_FORMAT;
}
- if (*err == WTAP_ERR_BAD_RECORD) {
+ if (*err == WTAP_ERR_BAD_FILE) {
/*
* The first record is bogus, so this is probably
* a corrupt file. Assume the file is in this
return THIS_FORMAT;
}
- if (*err == WTAP_ERR_BAD_RECORD) {
+ if (*err == WTAP_ERR_BAD_FILE) {
/*
* The second record is bogus; maybe it's a
* Capture File From Hell, and what looks like
guint packet_size;
guint orig_size;
int bytes_read;
- guchar fddi_padding[3];
+ guint8 fddi_padding[3];
+ int phdr_len;
+ libpcap_t *libpcap;
bytes_read = libpcap_read_header(wth, err, err_info, &hdr);
if (bytes_read == -1) {
/*
* Read the padding.
*/
- if (!libpcap_read_rec_data(wth->fh, fddi_padding, 3, err))
+ if (!libpcap_read_rec_data(wth->fh, fddi_padding, 3, err,
+ err_info))
return FALSE; /* Read error */
}
*data_offset = wth->data_offset;
+ libpcap = (libpcap_t *)wth->priv;
+ phdr_len = pcap_process_pseudo_header(wth->fh, wth->file_type,
+ wth->file_encap, packet_size, TRUE, &wth->phdr,
+ &wth->pseudo_header, err, err_info);
+ if (phdr_len < 0)
+ return FALSE; /* error */
+
/*
- * If this is an ATM packet, the first four bytes are the
- * direction of the packet (transmit/receive), the VPI, and
- * the VCI; read them and generate the pseudo-header from
- * them.
+ * Don't count any pseudo-header as part of the packet.
*/
- switch (wth->file_encap) {
-
- case WTAP_ENCAP_ATM_PDUS:
- if (wth->file_type == WTAP_FILE_PCAP_NOKIA) {
- /*
- * Nokia IPSO ATM.
- */
- if (packet_size < sizeof (struct nokiaatm_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- *err = WTAP_ERR_BAD_RECORD;
- *err_info = g_strdup_printf("libpcap: Nokia IPSO ATM file has a %u-byte packet, too small to have even an ATM pseudo-header\n",
- packet_size);
- return FALSE;
- }
- if (!libpcap_read_nokiaatm_pseudoheader(wth->fh,
- &wth->pseudo_header, err))
- return FALSE; /* Read error */
-
- /*
- * Don't count the pseudo-header as part of the
- * packet.
- */
- orig_size -= sizeof (struct nokiaatm_hdr);
- packet_size -= sizeof (struct nokiaatm_hdr);
- wth->data_offset += sizeof (struct nokiaatm_hdr);
- } else {
- /*
- * SunATM.
- */
- if (packet_size < sizeof (struct sunatm_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- *err = WTAP_ERR_BAD_RECORD;
- *err_info = g_strdup_printf("libpcap: SunATM file has a %u-byte packet, too small to have even an ATM pseudo-header\n",
- packet_size);
- return FALSE;
- }
- if (!libpcap_read_sunatm_pseudoheader(wth->fh,
- &wth->pseudo_header, err))
- return FALSE; /* Read error */
-
- /*
- * Don't count the pseudo-header as part of the
- * packet.
- */
- orig_size -= sizeof (struct sunatm_hdr);
- packet_size -= sizeof (struct sunatm_hdr);
- wth->data_offset += sizeof (struct sunatm_hdr);
- }
- break;
-
- case WTAP_ENCAP_ETHERNET:
- /*
- * We don't know whether there's an FCS in this frame or not.
- */
- wth->pseudo_header.eth.fcs_len = -1;
- break;
-
- case WTAP_ENCAP_IEEE_802_11:
- case WTAP_ENCAP_PRISM_HEADER:
- case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP:
- case WTAP_ENCAP_IEEE_802_11_WLAN_AVS:
- /*
- * We don't know whether there's an FCS in this frame or not.
- * XXX - are there any OSes where the capture mechanism
- * supplies an FCS?
- */
- wth->pseudo_header.ieee_802_11.fcs_len = -1;
- wth->pseudo_header.ieee_802_11.channel = 0;
- wth->pseudo_header.ieee_802_11.data_rate = 0;
- wth->pseudo_header.ieee_802_11.signal_level = 0;
- break;
-
- case WTAP_ENCAP_IRDA:
- if (packet_size < sizeof (struct irda_sll_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- *err = WTAP_ERR_BAD_RECORD;
- *err_info = g_strdup_printf("libpcap: IrDA file has a %u-byte packet, too small to have even an IrDA pseudo-header\n",
- packet_size);
- return FALSE;
- }
- if (!libpcap_read_irda_pseudoheader(wth->fh, &wth->pseudo_header,
- err, err_info))
- return FALSE; /* Read error */
-
- /*
- * Don't count the pseudo-header as part of the packet.
- */
- orig_size -= sizeof (struct irda_sll_hdr);
- packet_size -= sizeof (struct irda_sll_hdr);
- wth->data_offset += sizeof (struct irda_sll_hdr);
- break;
- case WTAP_ENCAP_MTP2_WITH_PHDR:
- if (packet_size < sizeof (struct mtp2_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- *err = WTAP_ERR_BAD_RECORD;
- *err_info = g_strdup_printf("libpcap: MTP2 file has a %u-byte packet, too small to have even an MTP2 pseudo-header\n",
- packet_size);
- return FALSE;
- }
- if (!libpcap_read_mtp2_pseudoheader(wth->fh, &wth->pseudo_header,
- err, err_info))
- return FALSE; /* Read error */
-
- /*
- * Don't count the pseudo-header as part of the packet.
- */
- orig_size -= sizeof (struct mtp2_hdr);
- packet_size -= sizeof (struct mtp2_hdr);
- wth->data_offset += sizeof (struct mtp2_hdr);
- break;
-
- case WTAP_ENCAP_LINUX_LAPD:
- if (packet_size < sizeof (struct lapd_sll_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- *err = WTAP_ERR_BAD_RECORD;
- *err_info = g_strdup_printf("libpcap: LAPD file has a %u-byte packet, too small to have even a LAPD pseudo-header\n",
- packet_size);
- return FALSE;
- }
- if (!libpcap_read_lapd_pseudoheader(wth->fh, &wth->pseudo_header,
- err, err_info))
- return FALSE; /* Read error */
-
- /*
- * Don't count the pseudo-header as part of the packet.
- */
- orig_size -= sizeof (struct lapd_sll_hdr);
- packet_size -= sizeof (struct lapd_sll_hdr);
- wth->data_offset += sizeof (struct lapd_sll_hdr);
- break;
- }
+ orig_size -= phdr_len;
+ packet_size -= phdr_len;
+ wth->data_offset += phdr_len;
buffer_assure_space(wth->frame_buffer, packet_size);
if (!libpcap_read_rec_data(wth->fh, buffer_start_ptr(wth->frame_buffer),
- packet_size, err))
+ packet_size, err, err_info))
return FALSE; /* Read error */
wth->data_offset += packet_size;
- wth->phdr.ts.secs = hdr.hdr.ts_sec;
- if(wth->tsprecision == WTAP_FILE_TSPREC_NSEC) {
- wth->phdr.ts.nsecs = hdr.hdr.ts_usec;
- } else {
- wth->phdr.ts.nsecs = hdr.hdr.ts_usec * 1000;
+ wth->phdr.presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN;
+
+ /* Update the Timestamp, if not already done */
+ if (wth->file_encap != WTAP_ENCAP_ERF) {
+ wth->phdr.ts.secs = hdr.hdr.ts_sec;
+ if(wth->tsprecision == WTAP_FILE_TSPREC_NSEC) {
+ wth->phdr.ts.nsecs = hdr.hdr.ts_usec;
+ } else {
+ wth->phdr.ts.nsecs = hdr.hdr.ts_usec * 1000;
+ }
}
wth->phdr.caplen = packet_size;
wth->phdr.len = orig_size;
- if (wth->file_encap == WTAP_ENCAP_ATM_PDUS) {
- if (wth->file_type == WTAP_FILE_PCAP_NOKIA) {
- /*
- * Nokia IPSO ATM.
- *
- * Guess the traffic type based on the packet
- * contents.
- */
- atm_guess_traffic_type(buffer_start_ptr(wth->frame_buffer),
- wth->phdr.caplen, &wth->pseudo_header);
- } else {
- /*
- * SunATM.
- *
- * If this is ATM LANE traffic, try to guess what
- * type of LANE traffic it is based on the packet
- * contents.
- */
- if (wth->pseudo_header.atm.type == TRAF_LANE) {
- atm_guess_lane_type(buffer_start_ptr(wth->frame_buffer),
- wth->phdr.caplen, &wth->pseudo_header);
- }
- }
- }
-
+ pcap_read_post_process(wth->file_type, wth->file_encap,
+ &wth->pseudo_header, buffer_start_ptr(wth->frame_buffer),
+ wth->phdr.caplen, libpcap->byte_swapped, -1);
return TRUE;
}
static gboolean
libpcap_seek_read(wtap *wth, gint64 seek_off,
- union wtap_pseudo_header *pseudo_header, guchar *pd, int length,
+ union wtap_pseudo_header *pseudo_header, guint8 *pd, int length,
int *err, gchar **err_info)
{
+ int phdr_len;
+ libpcap_t *libpcap;
+
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
return FALSE;
- switch (wth->file_encap) {
-
- case WTAP_ENCAP_ATM_PDUS:
- if (wth->file_type == WTAP_FILE_PCAP_NOKIA) {
- /*
- * Nokia IPSO ATM.
- */
- if (!libpcap_read_nokiaatm_pseudoheader(wth->random_fh,
- pseudo_header, err)) {
- /* Read error */
- return FALSE;
- }
- } else {
- /*
- * SunATM.
- */
- if (!libpcap_read_sunatm_pseudoheader(wth->random_fh,
- pseudo_header, err)) {
- /* Read error */
- return FALSE;
- }
- }
- break;
-
- case WTAP_ENCAP_ETHERNET:
- /*
- * We don't know whether there's an FCS in this frame or not.
- */
- pseudo_header->eth.fcs_len = -1;
- break;
-
- case WTAP_ENCAP_IEEE_802_11:
- case WTAP_ENCAP_PRISM_HEADER:
- case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP:
- case WTAP_ENCAP_IEEE_802_11_WLAN_AVS:
- /*
- * We don't know whether there's an FCS in this frame or not.
- * XXX - are there any OSes where the capture mechanism
- * supplies an FCS?
- */
- pseudo_header->ieee_802_11.fcs_len = -1;
- break;
-
- case WTAP_ENCAP_IRDA:
- if (!libpcap_read_irda_pseudoheader(wth->random_fh, pseudo_header,
- err, err_info)) {
- /* Read error */
- return FALSE;
- }
- break;
- case WTAP_ENCAP_MTP2_WITH_PHDR:
- if (!libpcap_read_mtp2_pseudoheader(wth->random_fh, pseudo_header,
- err, err_info)) {
- /* Read error */
- return FALSE;
- }
- break;
-
- case WTAP_ENCAP_LINUX_LAPD:
- if (!libpcap_read_lapd_pseudoheader(wth->random_fh, pseudo_header,
- err, err_info)) {
- /* Read error */
- return FALSE;
- }
- break;
- }
+ libpcap = (libpcap_t *)wth->priv;
+ phdr_len = pcap_process_pseudo_header(wth->random_fh, wth->file_type,
+ wth->file_encap, length, FALSE, NULL, pseudo_header, err, err_info);
+ if (phdr_len < 0)
+ return FALSE; /* error */
/*
* Read the packet data.
*/
- if (!libpcap_read_rec_data(wth->random_fh, pd, length, err))
+ if (!libpcap_read_rec_data(wth->random_fh, pd, length, err, err_info))
return FALSE; /* failed */
- if (wth->file_encap == WTAP_ENCAP_ATM_PDUS) {
- if (wth->file_type == WTAP_FILE_PCAP_NOKIA) {
- /*
- * Nokia IPSO ATM.
- *
- * Guess the traffic type based on the packet
- * contents.
- */
- atm_guess_traffic_type(pd, length, pseudo_header);
- } else {
- /*
- * SunATM.
- *
- * If this is ATM LANE traffic, try to guess what
- * type of LANE traffic it is based on the packet
- * contents.
- */
- if (pseudo_header->atm.type == TRAF_LANE)
- atm_guess_lane_type(pd, length, pseudo_header);
- }
- }
+ pcap_read_post_process(wth->file_type, wth->file_encap,
+ pseudo_header, pd, length, libpcap->byte_swapped, -1);
return TRUE;
}
g_assert_not_reached();
bytes_to_read = 0;
}
- bytes_read = file_read(hdr, 1, bytes_to_read, wth->fh);
+ bytes_read = file_read(hdr, bytes_to_read, wth->fh);
if (bytes_read != bytes_to_read) {
- *err = file_error(wth->fh);
+ *err = file_error(wth->fh, err_info);
if (*err == 0 && bytes_read != 0) {
*err = WTAP_ERR_SHORT_READ;
}
* this is can tell when it's not the type we're guessing
* it is.
*/
- *err = WTAP_ERR_BAD_RECORD;
+ *err = WTAP_ERR_BAD_FILE;
if (err_info != NULL) {
*err_info = g_strdup_printf("pcap: File has %u-byte packet, bigger than maximum of %u",
hdr->hdr.incl_len, WTAP_MAX_PACKET_SIZE);
* this is can tell when it's not the type we're guessing
* it is.
*/
- *err = WTAP_ERR_BAD_RECORD;
+ *err = WTAP_ERR_BAD_FILE;
if (err_info != NULL) {
*err_info = g_strdup_printf("pcap: File has %u-byte packet, bigger than maximum of %u",
hdr->hdr.orig_len, WTAP_MAX_PACKET_SIZE);
adjust_header(wtap *wth, struct pcaprec_hdr *hdr)
{
guint32 temp;
+ libpcap_t *libpcap;
- if (wth->capture.pcap->byte_swapped) {
+ libpcap = (libpcap_t *)wth->priv;
+ if (libpcap->byte_swapped) {
/* Byte-swap the record header fields. */
hdr->ts_sec = BSWAP32(hdr->ts_sec);
hdr->ts_usec = BSWAP32(hdr->ts_usec);
}
/* Swap the "incl_len" and "orig_len" fields, if necessary. */
- switch (wth->capture.pcap->lengths_swapped) {
+ switch (libpcap->lengths_swapped) {
case NOT_SWAPPED:
break;
}
}
-static void
-libpcap_get_sunatm_pseudoheader(const struct sunatm_hdr *atm_phdr,
- union wtap_pseudo_header *pseudo_header)
-{
- guint8 vpi;
- guint16 vci;
-
- vpi = atm_phdr->vpi;
- vci = pntohs(&atm_phdr->vci);
-
- switch (atm_phdr->flags & 0x0F) {
-
- case 0x01: /* LANE */
- pseudo_header->atm.aal = AAL_5;
- pseudo_header->atm.type = TRAF_LANE;
- break;
-
- case 0x02: /* RFC 1483 LLC multiplexed traffic */
- pseudo_header->atm.aal = AAL_5;
- pseudo_header->atm.type = TRAF_LLCMX;
- break;
-
- case 0x05: /* ILMI */
- pseudo_header->atm.aal = AAL_5;
- pseudo_header->atm.type = TRAF_ILMI;
- break;
-
- case 0x06: /* Q.2931 */
- pseudo_header->atm.aal = AAL_SIGNALLING;
- pseudo_header->atm.type = TRAF_UNKNOWN;
- break;
-
- case 0x03: /* MARS (RFC 2022) */
- pseudo_header->atm.aal = AAL_5;
- pseudo_header->atm.type = TRAF_UNKNOWN;
- break;
-
- case 0x04: /* IFMP (Ipsilon Flow Management Protocol; see RFC 1954) */
- pseudo_header->atm.aal = AAL_5;
- pseudo_header->atm.type = TRAF_UNKNOWN; /* XXX - TRAF_IPSILON? */
- break;
-
- default:
- /*
- * Assume it's AAL5, unless it's VPI 0 and VCI 5, in which
- * case assume it's AAL_SIGNALLING; we know nothing more
- * about it.
- *
- * XXX - is this necessary? Or are we guaranteed that
- * all signalling traffic has a type of 0x06?
- *
- * XXX - is this guaranteed to be AAL5? Or, if the type is
- * 0x00 ("raw"), might it be non-AAL5 traffic?
- */
- if (vpi == 0 && vci == 5)
- pseudo_header->atm.aal = AAL_SIGNALLING;
- else
- pseudo_header->atm.aal = AAL_5;
- pseudo_header->atm.type = TRAF_UNKNOWN;
- break;
- }
- pseudo_header->atm.subtype = TRAF_ST_UNKNOWN;
-
- pseudo_header->atm.vpi = vpi;
- pseudo_header->atm.vci = vci;
- pseudo_header->atm.channel = (atm_phdr->flags & 0x80) ? 0 : 1;
-
- /* We don't have this information */
- pseudo_header->atm.flags = 0;
- pseudo_header->atm.cells = 0;
- pseudo_header->atm.aal5t_u2u = 0;
- pseudo_header->atm.aal5t_len = 0;
- pseudo_header->atm.aal5t_chksum = 0;
-}
-
-static gboolean
-libpcap_read_sunatm_pseudoheader(FILE_T fh,
- union wtap_pseudo_header *pseudo_header, int *err)
-{
- struct sunatm_hdr atm_phdr;
- int bytes_read;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&atm_phdr, 1, sizeof (struct sunatm_hdr), fh);
- if (bytes_read != sizeof (struct sunatm_hdr)) {
- *err = file_error(fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
-
- libpcap_get_sunatm_pseudoheader(&atm_phdr, pseudo_header);
-
- return TRUE;
-}
-
-static gboolean
-libpcap_read_nokiaatm_pseudoheader(FILE_T fh,
- union wtap_pseudo_header *pseudo_header, int *err)
-{
- struct nokiaatm_hdr atm_phdr;
- int bytes_read;
- guint8 vpi;
- guint16 vci;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&atm_phdr, 1, sizeof (struct nokiaatm_hdr), fh);
- if (bytes_read != sizeof (struct nokiaatm_hdr)) {
- *err = file_error(fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
-
- vpi = atm_phdr.vpi;
- vci = pntohs(&atm_phdr.vci);
-
- pseudo_header->atm.vpi = vpi;
- pseudo_header->atm.vci = vci;
- pseudo_header->atm.channel = (atm_phdr.flags & 0x80) ? 0 : 1;
-
- /* We don't have this information */
- pseudo_header->atm.flags = 0;
- pseudo_header->atm.cells = 0;
- pseudo_header->atm.aal5t_u2u = 0;
- pseudo_header->atm.aal5t_len = 0;
- pseudo_header->atm.aal5t_chksum = 0;
-
- return TRUE;
-}
-
-static gboolean
-libpcap_get_irda_pseudoheader(const struct irda_sll_hdr *irda_phdr,
- union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info)
-{
- if (pntohs(&irda_phdr->sll_protocol) != 0x0017) {
- *err = WTAP_ERR_BAD_RECORD;
- if (err_info != NULL)
- *err_info = g_strdup("libpcap: IrDA capture has a packet with an invalid sll_protocol field\n");
- return FALSE;
- }
-
- pseudo_header->irda.pkttype = pntohs(&irda_phdr->sll_pkttype);
-
- return TRUE;
-}
-
-static gboolean
-libpcap_read_irda_pseudoheader(FILE_T fh, union wtap_pseudo_header *pseudo_header,
- int *err, gchar **err_info)
-{
- struct irda_sll_hdr irda_phdr;
- int bytes_read;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&irda_phdr, 1, sizeof (struct irda_sll_hdr), fh);
- if (bytes_read != sizeof (struct irda_sll_hdr)) {
- *err = file_error(fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
-
- return libpcap_get_irda_pseudoheader(&irda_phdr, pseudo_header, err,
- err_info);
-}
-
-static gboolean
-libpcap_get_mtp2_pseudoheader(const struct mtp2_hdr *mtp2_hdr, union wtap_pseudo_header *pseudo_header)
-{
- pseudo_header->mtp2.sent = mtp2_hdr->sent;
- pseudo_header->mtp2.annex_a_used = mtp2_hdr->annex_a_used;
- pseudo_header->mtp2.link_number = pntohs(&mtp2_hdr->link_number);
-
- return TRUE;
-}
-
-static gboolean
-libpcap_read_mtp2_pseudoheader(FILE_T fh, union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info _U_)
-{
- struct mtp2_hdr mtp2_hdr;
- int bytes_read;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&mtp2_hdr, 1, sizeof (struct mtp2_hdr), fh);
- if (bytes_read != sizeof (struct mtp2_hdr)) {
- *err = file_error(fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
-
- return libpcap_get_mtp2_pseudoheader(&mtp2_hdr, pseudo_header);
-
-}
-
-static gboolean
-libpcap_get_lapd_pseudoheader(const struct lapd_sll_hdr *lapd_phdr,
- union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info)
-{
- if (pntohs(&lapd_phdr->sll_protocol) != ETH_P_LAPD) {
- *err = WTAP_ERR_BAD_RECORD;
- if (err_info != NULL)
- *err_info = g_strdup("libpcap: LAPD capture has a packet with an invalid sll_protocol field\n");
- return FALSE;
- }
-
- pseudo_header->lapd.pkttype = pntohs(&lapd_phdr->sll_pkttype);
- pseudo_header->lapd.we_network = !!lapd_phdr->sll_addr[0];
-
- return TRUE;
-}
-
-static gboolean
-libpcap_read_lapd_pseudoheader(FILE_T fh, union wtap_pseudo_header *pseudo_header,
- int *err, gchar **err_info)
-{
- struct lapd_sll_hdr lapd_phdr;
- int bytes_read;
-
- errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(&lapd_phdr, 1, sizeof (struct lapd_sll_hdr), fh);
- if (bytes_read != sizeof (struct lapd_sll_hdr)) {
- *err = file_error(fh);
- if (*err == 0)
- *err = WTAP_ERR_SHORT_READ;
- return FALSE;
- }
-
- return libpcap_get_lapd_pseudoheader(&lapd_phdr, pseudo_header, err,
- err_info);
-}
-
static gboolean
-libpcap_read_rec_data(FILE_T fh, guchar *pd, int length, int *err)
+libpcap_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err,
+ gchar **err_info)
{
int bytes_read;
errno = WTAP_ERR_CANT_READ;
- bytes_read = file_read(pd, 1, length, fh);
+ bytes_read = file_read(pd, length, fh);
if (bytes_read != length) {
- *err = file_error(fh);
+ *err = file_error(fh, err_info);
if (*err == 0)
*err = WTAP_ERR_SHORT_READ;
return FALSE;
return TRUE;
}
-static void
-libpcap_close(wtap *wth)
-{
- g_free(wth->capture.pcap);
-}
-
-static int wtap_wtap_encap_to_pcap_encap(int encap)
-{
- unsigned int i;
-
- switch (encap) {
-
- case WTAP_ENCAP_FDDI:
- case WTAP_ENCAP_FDDI_BITSWAPPED:
- case WTAP_ENCAP_NETTL_FDDI:
- /*
- * Special-case WTAP_ENCAP_FDDI and
- * WTAP_ENCAP_FDDI_BITSWAPPED; both of them get mapped
- * to DLT_FDDI (even though that may mean that the bit
- * order in the FDDI MAC addresses is wrong; so it goes
- * - libpcap format doesn't record the byte order,
- * so that's not fixable).
- */
- return 10; /* that's DLT_FDDI */
-
- case WTAP_ENCAP_PPP_WITH_PHDR:
- /*
- * Also special-case PPP with direction bits; map it to
- * PPP, even though that means that the direction of the
- * packet is lost.
- */
- return 9;
-
- case WTAP_ENCAP_FRELAY_WITH_PHDR:
- /*
- * Do the same with Frame Relay.
- */
- return 107;
-
- case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
- /*
- * Map this to DLT_IEEE802_11, for now, even though
- * that means the radio information will be lost.
- * Once tcpdump support for the BSD radiotap header
- * is sufficiently widespread, we should probably
- * use that, instead - although we should probably
- * ultimately just have WTAP_ENCAP_IEEE_802_11
- * as the only Wiretap encapsulation for 802.11,
- * and have the pseudo-header include a radiotap-style
- * list of attributes. If we do that, though, we
- * should probably bypass the regular Wiretap code
- * when writing out packets during a capture, and just
- * do the equivalent of a libpcap write (unfortunately,
- * libpcap doesn't have an "open dump by file descriptor"
- * function, so we can't just use "pcap_dump()"), so
- * that we don't spend cycles mapping from libpcap to
- * Wiretap and then back to libpcap. (There are other
- * reasons to do that, e.g. to handle AIX libpcap better.)
- */
- return 105;
- }
-
- for (i = 0; i < NUM_PCAP_ENCAPS; i++) {
- if (pcap_to_wtap_map[i].wtap_encap_value == encap)
- return pcap_to_wtap_map[i].dlt_value;
- }
- return -1;
-}
-
-#ifdef HAVE_PCAP_H
-/*
- * Given a Wiretap encapsulation type, and raw packet data and the packet
- * header from libpcap, process any pseudo-header in the packet,
- * fill in the Wiretap packet header, and return a pointer to the
- * beginning of the non-pseudo-header data in the packet.
- */
-const guchar *
-wtap_process_pcap_packet(gint linktype, const struct pcap_pkthdr *phdr,
- const guchar *pd, union wtap_pseudo_header *pseudo_header,
- struct wtap_pkthdr *whdr, int *err)
-{
- /* "phdr->ts" may not necessarily be a "struct timeval" - it may
- be a "struct bpf_timeval", with member sizes wired to 32
- bits - and we may go that way ourselves in the future, so
- copy the members individually. */
- whdr->ts.secs = phdr->ts.tv_sec;
- whdr->ts.nsecs = phdr->ts.tv_usec * 1000;
- whdr->caplen = phdr->caplen;
- whdr->len = phdr->len;
- whdr->pkt_encap = linktype;
-
- /*
- * If this is an ATM packet, the first four bytes are the
- * direction of the packet (transmit/receive), the VPI, and
- * the VCI; read them and generate the pseudo-header from
- * them.
- */
- if (linktype == WTAP_ENCAP_ATM_PDUS) {
- if (whdr->caplen < sizeof (struct sunatm_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- g_message("libpcap: SunATM capture has a %u-byte packet, too small to have even an ATM pseudo-header\n",
- whdr->caplen);
- *err = WTAP_ERR_BAD_RECORD;
- return NULL;
- }
- libpcap_get_sunatm_pseudoheader((const struct sunatm_hdr *)pd,
- pseudo_header);
-
- /*
- * Don't count the pseudo-header as part of the packet.
- */
- whdr->len -= sizeof (struct sunatm_hdr);
- whdr->caplen -= sizeof (struct sunatm_hdr);
- pd += sizeof (struct sunatm_hdr);
-
- /*
- * If this is ATM LANE traffic, try to guess what type of
- * LANE traffic it is based on the packet contents.
- */
- if (pseudo_header->atm.type == TRAF_LANE)
- atm_guess_lane_type(pd, whdr->caplen, pseudo_header);
- }
- else if (linktype == WTAP_ENCAP_IRDA) {
- if (whdr->caplen < sizeof (struct irda_sll_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- g_message("libpcap: IrDA capture has a %u-byte packet, too small to have even an IrDA pseudo-header\n",
- whdr->caplen);
- *err = WTAP_ERR_BAD_RECORD;
- return NULL;
- }
- if (!libpcap_get_irda_pseudoheader((const struct irda_sll_hdr *)pd,
- pseudo_header, err, NULL))
- return NULL;
-
- /*
- * Don't count the pseudo-header as part of the packet.
- */
- whdr->len -= sizeof (struct irda_sll_hdr);
- whdr->caplen -= sizeof (struct irda_sll_hdr);
- pd += sizeof (struct irda_sll_hdr);
- }
- else if (linktype == WTAP_ENCAP_MTP2_WITH_PHDR) {
- if (whdr->caplen < sizeof (struct mtp2_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- g_message("libpcap: MTP2 capture has a %u-byte packet, too small to have even an MTP2 pseudo-header\n",
- whdr->caplen);
- *err = WTAP_ERR_BAD_RECORD;
- return NULL;
- }
- if (!libpcap_get_mtp2_pseudoheader((const struct mtp2_hdr *)pd, pseudo_header))
- return NULL;
-
- /*
- * Don't count the pseudo-header as part of the packet.
- */
- whdr->len -= sizeof (struct mtp2_hdr);
- whdr->caplen -= sizeof (struct mtp2_hdr);
- pd += sizeof (struct mtp2_hdr);
- }
- else if (linktype == WTAP_ENCAP_LINUX_LAPD) {
- if (whdr->caplen < sizeof (struct lapd_sll_hdr)) {
- /*
- * Uh-oh, the packet isn't big enough to even
- * have a pseudo-header.
- */
- g_message("libpcap: LAPD capture has a %u-byte packet, too small to have even an LAPD pseudo-header\n",
- whdr->caplen);
- *err = WTAP_ERR_BAD_RECORD;
- return NULL;
- }
- if (!libpcap_get_lapd_pseudoheader((const struct lapd_sll_hdr *)pd,
- pseudo_header, err, NULL))
- return NULL;
-
- /*
- * Don't count the pseudo-header as part of the packet.
- */
- whdr->len -= sizeof (struct lapd_sll_hdr);
- whdr->caplen -= sizeof (struct lapd_sll_hdr);
- pd += sizeof (struct lapd_sll_hdr);
- }
- return pd;
-}
-#endif
-
/* Returns 0 if we could write the specified encapsulation type,
an error indication otherwise. */
int libpcap_dump_can_write_encap(int encap)
/* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on
failure */
-gboolean libpcap_dump_open(wtap_dumper *wdh, gboolean cant_seek _U_, int *err)
+gboolean libpcap_dump_open(wtap_dumper *wdh, int *err)
{
guint32 magic;
struct pcap_hdr file_hdr;
- size_t nwritten;
/* This is a libpcap file */
wdh->subtype_write = libpcap_dump;
return FALSE;
}
- nwritten = wtap_dump_file_write(wdh, &magic, sizeof magic);
- if (nwritten != sizeof magic) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, &magic, sizeof magic, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof magic;
/* current "libpcap" format is 2.4 */
file_hdr.snaplen = (wdh->snaplen != 0) ? wdh->snaplen :
WTAP_MAX_PACKET_SIZE;
file_hdr.network = wtap_wtap_encap_to_pcap_encap(wdh->encap);
- nwritten = wtap_dump_file_write(wdh, &file_hdr, sizeof file_hdr);
- if (nwritten != sizeof file_hdr) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, &file_hdr, sizeof file_hdr, err))
return FALSE;
- }
wdh->bytes_dumped += sizeof file_hdr;
return TRUE;
Returns TRUE on success, FALSE on failure. */
static gboolean libpcap_dump(wtap_dumper *wdh,
const struct wtap_pkthdr *phdr,
- const union wtap_pseudo_header *pseudo_header _U_,
- const guchar *pd, int *err)
+ const union wtap_pseudo_header *pseudo_header,
+ const guint8 *pd, int *err)
{
struct pcaprec_ss990915_hdr rec_hdr;
size_t hdr_size;
- size_t nwritten;
- struct sunatm_hdr atm_hdr;
- struct irda_sll_hdr irda_hdr;
- struct lapd_sll_hdr lapd_hdr;
- struct mtp2_hdr mtp2_hdr;
- int hdrsize;
-
- if (wdh->encap == WTAP_ENCAP_ATM_PDUS)
- hdrsize = sizeof (struct sunatm_hdr);
- else if (wdh->encap == WTAP_ENCAP_IRDA)
- hdrsize = sizeof (struct irda_sll_hdr);
- else if (wdh->encap == WTAP_ENCAP_LINUX_LAPD)
- hdrsize = sizeof (struct lapd_sll_hdr);
- else
- hdrsize = 0;
-
- rec_hdr.hdr.ts_sec = phdr->ts.secs;
+ int phdrsize;
+
+ phdrsize = pcap_get_phdr_size(wdh->encap, pseudo_header);
+
+ rec_hdr.hdr.ts_sec = (guint32) phdr->ts.secs;
if(wdh->tsprecision == WTAP_FILE_TSPREC_NSEC) {
rec_hdr.hdr.ts_usec = phdr->ts.nsecs;
} else {
rec_hdr.hdr.ts_usec = phdr->ts.nsecs / 1000;
}
- rec_hdr.hdr.incl_len = phdr->caplen + hdrsize;
- rec_hdr.hdr.orig_len = phdr->len + hdrsize;
+ rec_hdr.hdr.incl_len = phdr->caplen + phdrsize;
+ rec_hdr.hdr.orig_len = phdr->len + phdrsize;
+
+ if (rec_hdr.hdr.incl_len > WTAP_MAX_PACKET_SIZE || rec_hdr.hdr.orig_len > WTAP_MAX_PACKET_SIZE) {
+ *err = WTAP_ERR_BAD_FILE;
+ return FALSE;
+ }
+
switch (wdh->file_type) {
case WTAP_FILE_PCAP:
return FALSE;
}
- nwritten = wtap_dump_file_write(wdh, &rec_hdr, hdr_size);
- if (nwritten != hdr_size) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, &rec_hdr, hdr_size, err))
return FALSE;
- }
wdh->bytes_dumped += hdr_size;
- if (wdh->encap == WTAP_ENCAP_ATM_PDUS) {
- /*
- * Write the ATM header.
- */
- atm_hdr.flags =
- (pseudo_header->atm.channel == 0) ? 0x80 : 0x00;
- switch (pseudo_header->atm.aal) {
-
- case AAL_SIGNALLING:
- /* Q.2931 */
- atm_hdr.flags |= 0x06;
- break;
-
- case AAL_5:
- switch (pseudo_header->atm.type) {
-
- case TRAF_LANE:
- /* LANE */
- atm_hdr.flags |= 0x01;
- break;
-
- case TRAF_LLCMX:
- /* RFC 1483 LLC multiplexed traffic */
- atm_hdr.flags |= 0x02;
- break;
-
- case TRAF_ILMI:
- /* ILMI */
- atm_hdr.flags |= 0x05;
- break;
- }
- break;
- }
- atm_hdr.vpi = (guint8) pseudo_header->atm.vpi;
- atm_hdr.vci = phtons(&pseudo_header->atm.vci);
- nwritten = wtap_dump_file_write(wdh, &atm_hdr, sizeof atm_hdr);
- if (nwritten != sizeof atm_hdr) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
- return FALSE;
- }
- wdh->bytes_dumped += sizeof atm_hdr;
- }
- else if (wdh->encap == WTAP_ENCAP_IRDA) {
- /*
- * Write the IrDA header.
- */
- memset(&irda_hdr, 0, sizeof(irda_hdr));
- irda_hdr.sll_pkttype = phtons(&pseudo_header->irda.pkttype);
- irda_hdr.sll_protocol = g_htons(0x0017);
- nwritten = wtap_dump_file_write(wdh, &irda_hdr, sizeof(irda_hdr));
- if (nwritten != sizeof(irda_hdr)) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
- return FALSE;
- }
- wdh->bytes_dumped += sizeof(irda_hdr);
- }
- else if (wdh->encap == WTAP_ENCAP_MTP2_WITH_PHDR) {
- /*
- * Write the MTP2 header.
- */
- memset(&mtp2_hdr, 0, sizeof(mtp2_hdr));
- mtp2_hdr.sent = pseudo_header->mtp2.sent;
- mtp2_hdr.annex_a_used = pseudo_header->mtp2.annex_a_used;
- mtp2_hdr.link_number = phtons(&pseudo_header->mtp2.link_number);
- nwritten = wtap_dump_file_write(wdh, &mtp2_hdr, sizeof(mtp2_hdr));
- if (nwritten != sizeof(mtp2_hdr)) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
- return FALSE;
- }
- wdh->bytes_dumped += sizeof(mtp2_hdr);
- }
- else if (wdh->encap == WTAP_ENCAP_LINUX_LAPD) {
- /*
- * Write the LAPD header.
- */
- memset(&lapd_hdr, 0, sizeof(lapd_hdr));
- lapd_hdr.sll_pkttype = phtons(&pseudo_header->lapd.pkttype);
- lapd_hdr.sll_protocol = g_htons(ETH_P_LAPD);
- lapd_hdr.sll_addr[0] = pseudo_header->lapd.we_network?0x01:0x00;
- nwritten = fwrite(&lapd_hdr, 1, sizeof(lapd_hdr), wdh->fh);
- if (nwritten != sizeof(lapd_hdr)) {
- if (nwritten == 0 && ferror(wdh->fh))
- *err = errno;
- else
- *err = WTAP_ERR_SHORT_WRITE;
- return FALSE;
- }
- wdh->bytes_dumped += sizeof(lapd_hdr);
- }
+ if (!pcap_write_phdr(wdh, wdh->encap, pseudo_header, err))
+ return FALSE;
- nwritten = wtap_dump_file_write(wdh, pd, phdr->caplen);
- if (nwritten != phdr->caplen) {
- if (nwritten == 0 && wtap_dump_file_ferror(wdh))
- *err = wtap_dump_file_ferror(wdh);
- else
- *err = WTAP_ERR_SHORT_WRITE;
+ if (!wtap_dump_file_write(wdh, pd, phdr->caplen, err))
return FALSE;
- }
wdh->bytes_dumped += phdr->caplen;
return TRUE;
}
git.samba.org / obnox / wireshark / wip.git / blobdiff