1998-11-15 05:29:17 +00:00
|
|
|
/* libpcap.c
|
|
|
|
*
|
2003-12-03 22:40:39 +00:00
|
|
|
* $Id: libpcap.c,v 1.101 2003/12/03 22:40:39 guy Exp $
|
1998-11-15 05:29:17 +00:00
|
|
|
*
|
|
|
|
* Wiretap Library
|
2001-11-13 23:55:44 +00:00
|
|
|
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
2002-08-28 20:30:45 +00:00
|
|
|
*
|
1998-11-15 05:29:17 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
2002-08-28 20:30:45 +00:00
|
|
|
*
|
1998-11-15 05:29:17 +00:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2002-08-28 20:30:45 +00:00
|
|
|
*
|
1998-11-15 05:29:17 +00:00
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
2002-02-27 08:57:25 +00:00
|
|
|
|
1999-07-13 02:53:26 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
2002-07-29 06:09:59 +00:00
|
|
|
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
2000-05-19 23:07:04 +00:00
|
|
|
#include "wtap-int.h"
|
2000-01-13 07:09:20 +00:00
|
|
|
#include "file_wrappers.h"
|
1999-03-01 18:57:07 +00:00
|
|
|
#include "buffer.h"
|
2002-08-07 06:59:49 +00:00
|
|
|
#include "atm.h"
|
1998-11-15 05:29:17 +00:00
|
|
|
#include "libpcap.h"
|
|
|
|
|
2002-06-07 21:11:24 +00:00
|
|
|
#ifdef HAVE_PCAP_H
|
2002-07-29 06:09:59 +00:00
|
|
|
# ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
# endif
|
2002-06-07 21:11:24 +00:00
|
|
|
#include <pcap.h>
|
|
|
|
#include "wtap-capture.h"
|
|
|
|
#endif
|
|
|
|
|
2002-06-06 09:18:28 +00:00
|
|
|
/*
|
|
|
|
* The link-layer header on ATM packets.
|
|
|
|
*/
|
|
|
|
struct sunatm_hdr {
|
|
|
|
guint8 flags; /* destination and traffic type */
|
|
|
|
guint8 vpi; /* VPI */
|
|
|
|
guint16 vci; /* VCI */
|
|
|
|
};
|
|
|
|
|
1998-11-15 05:29:17 +00:00
|
|
|
/* See source to the "libpcap" library for information on the "libpcap"
|
|
|
|
file format. */
|
|
|
|
|
Add a new Wiretap encapsulation type WTAP_ENCAP_FDDI_BITSWAPPED, meaning
"FDDI with the MAC addresses bit-swapped"; whether the MAC addresses are
bit-swapped is a property of the machine on which the capture was taken,
not of the machine on which the capture is being read - right now, none
of the capture file formats we read indicate whether FDDI MAC addresses
are bit-swapped, but this does let us treat non-"libpcap" captures as
being bit-swapped or not bit-swapped independent of the machine on which
they're being read (and of the machine on which they were captured, but
I have the impression they're bit-swapped on most platforms), and allows
us to, if, as, and when we implement packet capture in Wiretap, mark
packets in a capture file written in Wiretap-native format based on the
machine on which they are captured (assuming the rule "Ultrix, Alpha,
and BSD/OS are the only platforms that don't bit-swap", or some other
compile-time rule, gets the right answer, or that some platform has
drivers that can tell us whether the addresses are bit-swapped).
(NOTE: if, for any of the capture file formats used only on one
platform, FDDI MAC addresses aren't bit-swapped, the code to read that
capture file format should be fixed to flag them as not bit-swapped.)
Use the encapsulation type to decide whether to bit-swap addresses in
"dissect_fddi()".
svn path=/trunk/; revision=557
1999-08-24 03:19:34 +00:00
|
|
|
/* On some systems, the FDDI MAC addresses are bit-swapped. */
|
1999-08-31 22:36:20 +00:00
|
|
|
#if !defined(ultrix) && !defined(__alpha) && !defined(__bsdi__)
|
Add a new Wiretap encapsulation type WTAP_ENCAP_FDDI_BITSWAPPED, meaning
"FDDI with the MAC addresses bit-swapped"; whether the MAC addresses are
bit-swapped is a property of the machine on which the capture was taken,
not of the machine on which the capture is being read - right now, none
of the capture file formats we read indicate whether FDDI MAC addresses
are bit-swapped, but this does let us treat non-"libpcap" captures as
being bit-swapped or not bit-swapped independent of the machine on which
they're being read (and of the machine on which they were captured, but
I have the impression they're bit-swapped on most platforms), and allows
us to, if, as, and when we implement packet capture in Wiretap, mark
packets in a capture file written in Wiretap-native format based on the
machine on which they are captured (assuming the rule "Ultrix, Alpha,
and BSD/OS are the only platforms that don't bit-swap", or some other
compile-time rule, gets the right answer, or that some platform has
drivers that can tell us whether the addresses are bit-swapped).
(NOTE: if, for any of the capture file formats used only on one
platform, FDDI MAC addresses aren't bit-swapped, the code to read that
capture file format should be fixed to flag them as not bit-swapped.)
Use the encapsulation type to decide whether to bit-swap addresses in
"dissect_fddi()".
svn path=/trunk/; revision=557
1999-08-24 03:19:34 +00:00
|
|
|
#define BIT_SWAPPED_MAC_ADDRS
|
|
|
|
#endif
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
/* Try to read the first two records of the capture file. */
|
|
|
|
typedef enum {
|
|
|
|
THIS_FORMAT, /* the reads succeeded, assume it's this format */
|
|
|
|
BAD_READ, /* the file is probably not valid */
|
|
|
|
OTHER_FORMAT /* the file may be valid, but not in this format */
|
|
|
|
} libpcap_try_t;
|
|
|
|
static libpcap_try_t libpcap_try(wtap *wth, int *err);
|
|
|
|
|
2001-10-04 08:30:36 +00:00
|
|
|
static gboolean libpcap_read(wtap *wth, int *err, long *data_offset);
|
2002-06-06 09:18:28 +00:00
|
|
|
static gboolean libpcap_seek_read(wtap *wth, long seek_off,
|
2002-07-29 06:09:59 +00:00
|
|
|
union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err);
|
2000-09-15 07:52:43 +00:00
|
|
|
static int libpcap_read_header(wtap *wth, int *err,
|
|
|
|
struct pcaprec_ss990915_hdr *hdr, gboolean silent);
|
1999-11-06 10:31:47 +00:00
|
|
|
static void adjust_header(wtap *wth, struct pcaprec_hdr *hdr);
|
2002-06-07 21:11:24 +00:00
|
|
|
static void libpcap_get_atm_pseudoheader(const struct sunatm_hdr *atm_phdr,
|
|
|
|
union wtap_pseudo_header *pseudo_header);
|
2002-06-06 09:18:28 +00:00
|
|
|
static gboolean libpcap_read_atm_pseudoheader(FILE_T fh,
|
|
|
|
union wtap_pseudo_header *pseudo_header, int *err);
|
2002-07-29 06:09:59 +00:00
|
|
|
static gboolean libpcap_read_rec_data(FILE_T fh, guchar *pd, int length,
|
2002-06-06 09:18:28 +00:00
|
|
|
int *err);
|
2000-03-22 07:06:59 +00:00
|
|
|
static void libpcap_close(wtap *wth);
|
1999-12-04 05:14:39 +00:00
|
|
|
static gboolean libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
|
2002-07-29 06:09:59 +00:00
|
|
|
const union wtap_pseudo_header *pseudo_header, const guchar *pd, int *err);
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
/*
|
2000-08-25 06:25:21 +00:00
|
|
|
* 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.
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
*
|
2000-08-25 06:25:21 +00:00
|
|
|
* 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.
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
*
|
2000-08-25 06:25:21 +00:00
|
|
|
* 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
|
|
|
|
* Ethereal/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).
|
2003-09-04 06:40:45 +00:00
|
|
|
*
|
|
|
|
* 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[]".
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
*/
|
2000-08-25 06:25:21 +00:00
|
|
|
|
|
|
|
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 Ethereal
|
|
|
|
* currently support.
|
|
|
|
*/
|
|
|
|
{ 0, WTAP_ENCAP_NULL }, /* null encapsulation */
|
|
|
|
{ 1, WTAP_ENCAP_ETHERNET },
|
2000-09-21 04:41:37 +00:00
|
|
|
{ 6, WTAP_ENCAP_TOKEN_RING }, /* IEEE 802 Networks - assume token ring */
|
2000-08-25 06:25:21 +00:00
|
|
|
{ 7, WTAP_ENCAP_ARCNET },
|
|
|
|
{ 8, WTAP_ENCAP_SLIP },
|
|
|
|
{ 9, WTAP_ENCAP_PPP },
|
Add a new Wiretap encapsulation type WTAP_ENCAP_FDDI_BITSWAPPED, meaning
"FDDI with the MAC addresses bit-swapped"; whether the MAC addresses are
bit-swapped is a property of the machine on which the capture was taken,
not of the machine on which the capture is being read - right now, none
of the capture file formats we read indicate whether FDDI MAC addresses
are bit-swapped, but this does let us treat non-"libpcap" captures as
being bit-swapped or not bit-swapped independent of the machine on which
they're being read (and of the machine on which they were captured, but
I have the impression they're bit-swapped on most platforms), and allows
us to, if, as, and when we implement packet capture in Wiretap, mark
packets in a capture file written in Wiretap-native format based on the
machine on which they are captured (assuming the rule "Ultrix, Alpha,
and BSD/OS are the only platforms that don't bit-swap", or some other
compile-time rule, gets the right answer, or that some platform has
drivers that can tell us whether the addresses are bit-swapped).
(NOTE: if, for any of the capture file formats used only on one
platform, FDDI MAC addresses aren't bit-swapped, the code to read that
capture file format should be fixed to flag them as not bit-swapped.)
Use the encapsulation type to decide whether to bit-swap addresses in
"dissect_fddi()".
svn path=/trunk/; revision=557
1999-08-24 03:19:34 +00:00
|
|
|
#ifdef BIT_SWAPPED_MAC_ADDRS
|
2000-08-25 06:25:21 +00:00
|
|
|
{ 10, WTAP_ENCAP_FDDI_BITSWAPPED },
|
|
|
|
#else
|
|
|
|
{ 10, WTAP_ENCAP_FDDI },
|
|
|
|
#endif
|
|
|
|
|
2002-06-13 11:03:23 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* Ethereal 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 },
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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 Ethereal
|
|
|
|
* 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 Ethereal.
|
|
|
|
* 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 Ethereal, 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 */
|
2003-03-08 09:11:53 +00:00
|
|
|
#if 0
|
2002-06-13 11:03:23 +00:00
|
|
|
{ 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 */
|
2002-10-22 09:11:13 +00:00
|
|
|
{ 122, WTAP_ENCAP_IP_OVER_FC }, /* RFC 2625 IP-over-FC */
|
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer. (That's not a great name, but I
couldn't think of a better one.)
Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off. That's what at least some versions of the
Windows-based ATM Sniffer appear to have.
Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).
svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
|
|
|
{ 123, WTAP_ENCAP_ATM_PDUS }, /* SunATM */
|
2002-12-11 22:45:24 +00:00
|
|
|
{ 127, WTAP_ENCAP_WLAN_HEADER }, /* 802.11 plus WLAN header */
|
2003-01-08 05:03:54 +00:00
|
|
|
{ 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */
|
2003-01-23 04:04:01 +00:00
|
|
|
{ 129, WTAP_ENCAP_ARCNET_LINUX },
|
2002-06-13 11:03:23 +00:00
|
|
|
|
2003-09-04 06:40:45 +00:00
|
|
|
/*
|
|
|
|
* Values 130 thorugh 137 are reserved for use in Juniper
|
|
|
|
* hardware.
|
|
|
|
*
|
|
|
|
* 138 is reserved for Apple IP-over-IEEE 1394.
|
|
|
|
*/
|
|
|
|
|
2003-12-03 22:40:39 +00:00
|
|
|
{ 140, WTAP_ENCAP_MTP2 },
|
|
|
|
{ 141, WTAP_ENCAP_MTP3 },
|
|
|
|
|
2003-09-04 06:40:45 +00:00
|
|
|
/*
|
|
|
|
* 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[]".
|
|
|
|
*/
|
|
|
|
|
2002-06-13 11:03:23 +00:00
|
|
|
/*
|
|
|
|
* 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 Ethereal chooses the platform-independent libpcap type
|
|
|
|
* value for those encapsulatioin types, not the platform-dependent
|
|
|
|
* one.
|
|
|
|
*/
|
|
|
|
|
2000-08-25 06:25:21 +00:00
|
|
|
/*
|
|
|
|
* 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)
|
2002-06-07 04:48:36 +00:00
|
|
|
{ 11, WTAP_ENCAP_FRELAY },
|
Add a new Wiretap encapsulation type WTAP_ENCAP_FDDI_BITSWAPPED, meaning
"FDDI with the MAC addresses bit-swapped"; whether the MAC addresses are
bit-swapped is a property of the machine on which the capture was taken,
not of the machine on which the capture is being read - right now, none
of the capture file formats we read indicate whether FDDI MAC addresses
are bit-swapped, but this does let us treat non-"libpcap" captures as
being bit-swapped or not bit-swapped independent of the machine on which
they're being read (and of the machine on which they were captured, but
I have the impression they're bit-swapped on most platforms), and allows
us to, if, as, and when we implement packet capture in Wiretap, mark
packets in a capture file written in Wiretap-native format based on the
machine on which they are captured (assuming the rule "Ultrix, Alpha,
and BSD/OS are the only platforms that don't bit-swap", or some other
compile-time rule, gets the right answer, or that some platform has
drivers that can tell us whether the addresses are bit-swapped).
(NOTE: if, for any of the capture file formats used only on one
platform, FDDI MAC addresses aren't bit-swapped, the code to read that
capture file format should be fixed to flag them as not bit-swapped.)
Use the encapsulation type to decide whether to bit-swap addresses in
"dissect_fddi()".
svn path=/trunk/; revision=557
1999-08-24 03:19:34 +00:00
|
|
|
#else
|
2000-08-25 06:25:21 +00:00
|
|
|
{ 11, WTAP_ENCAP_ATM_RFC1483 },
|
Add a new Wiretap encapsulation type WTAP_ENCAP_FDDI_BITSWAPPED, meaning
"FDDI with the MAC addresses bit-swapped"; whether the MAC addresses are
bit-swapped is a property of the machine on which the capture was taken,
not of the machine on which the capture is being read - right now, none
of the capture file formats we read indicate whether FDDI MAC addresses
are bit-swapped, but this does let us treat non-"libpcap" captures as
being bit-swapped or not bit-swapped independent of the machine on which
they're being read (and of the machine on which they were captured, but
I have the impression they're bit-swapped on most platforms), and allows
us to, if, as, and when we implement packet capture in Wiretap, mark
packets in a capture file written in Wiretap-native format based on the
machine on which they are captured (assuming the rule "Ultrix, Alpha,
and BSD/OS are the only platforms that don't bit-swap", or some other
compile-time rule, gets the right answer, or that some platform has
drivers that can tell us whether the addresses are bit-swapped).
(NOTE: if, for any of the capture file formats used only on one
platform, FDDI MAC addresses aren't bit-swapped, the code to read that
capture file format should be fixed to flag them as not bit-swapped.)
Use the encapsulation type to decide whether to bit-swap addresses in
"dissect_fddi()".
svn path=/trunk/; revision=557
1999-08-24 03:19:34 +00:00
|
|
|
#endif
|
2000-08-25 06:25:21 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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 - Ethereal 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)
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
/*
|
|
|
|
* 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?
|
|
|
|
*/
|
2000-08-25 06:25:21 +00:00
|
|
|
#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)
|
2003-03-08 09:11:53 +00:00
|
|
|
{ 13, WTAP_ENCAP_ENC },
|
2000-08-25 06:25:21 +00:00
|
|
|
#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;
|
|
|
|
*
|
2001-03-11 02:51:05 +00:00
|
|
|
* DLT_HDLC on NetBSD (Cisco HDLC);
|
2000-08-25 06:25:21 +00:00
|
|
|
*
|
|
|
|
* 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
|
2001-03-11 02:51:05 +00:00
|
|
|
#if defined(DLT_HDLC) && (DLT_HDLC == 16)
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
{ 16, WTAP_ENCAP_CHDLC },
|
2001-03-11 02:51:05 +00:00
|
|
|
#endif
|
2000-08-25 06:25:21 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 17 is DLT_LANE8023 in SuSE 6.3 libpcap; we don't currently
|
|
|
|
* handle it.
|
2002-01-29 08:44:53 +00:00
|
|
|
* It is also used as the PF (Packet Filter) logging format beginning
|
2002-01-29 08:55:24 +00:00
|
|
|
* with OpenBSD 3.0; we use 17 for PF logs unless DLT_LANE8023 is
|
|
|
|
* defined with the value 17.
|
2000-08-25 06:25:21 +00:00
|
|
|
*/
|
2002-01-29 08:55:24 +00:00
|
|
|
#if !defined(DLT_LANE8023) || (DLT_LANE8023 != 17)
|
2003-05-15 07:14:46 +00:00
|
|
|
{ 17, WTAP_ENCAP_OLD_PFLOG },
|
2002-01-29 08:44:53 +00:00
|
|
|
#endif
|
2000-08-25 06:25:21 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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 },
|
2003-09-04 06:40:45 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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[]".
|
|
|
|
*/
|
|
|
|
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
};
|
2000-08-25 06:25:21 +00:00
|
|
|
#define NUM_PCAP_ENCAPS (sizeof pcap_to_wtap_map / sizeof pcap_to_wtap_map[0])
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
2002-06-10 15:45:30 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
int libpcap_open(wtap *wth, int *err)
|
1998-11-15 05:29:17 +00:00
|
|
|
{
|
|
|
|
int bytes_read;
|
|
|
|
guint32 magic;
|
|
|
|
struct pcap_hdr hdr;
|
1999-11-06 10:31:47 +00:00
|
|
|
gboolean byte_swapped;
|
|
|
|
gboolean modified;
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
gboolean aix;
|
2000-08-25 06:25:21 +00:00
|
|
|
int file_encap;
|
1998-11-15 05:29:17 +00:00
|
|
|
|
|
|
|
/* Read in the number that should be at the start of a "libpcap" file */
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
errno = WTAP_ERR_CANT_READ;
|
1999-09-22 01:26:50 +00:00
|
|
|
bytes_read = file_read(&magic, 1, sizeof magic, wth->fh);
|
1998-11-15 05:29:17 +00:00
|
|
|
if (bytes_read != sizeof magic) {
|
1999-10-05 07:06:08 +00:00
|
|
|
*err = file_error(wth->fh);
|
|
|
|
if (*err != 0)
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
return -1;
|
|
|
|
return 0;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
1999-08-28 01:19:45 +00:00
|
|
|
wth->data_offset += sizeof magic;
|
1998-11-15 05:29:17 +00:00
|
|
|
|
1999-11-06 08:42:01 +00:00
|
|
|
switch (magic) {
|
|
|
|
|
|
|
|
case PCAP_MAGIC:
|
2000-07-26 06:04:34 +00:00
|
|
|
/* Host that wrote it has our byte order, and was running
|
|
|
|
a program using either standard or ss990417 libpcap. */
|
1999-11-06 08:42:01 +00:00
|
|
|
byte_swapped = FALSE;
|
1999-11-06 10:31:47 +00:00
|
|
|
modified = FALSE;
|
1999-11-06 08:42:01 +00:00
|
|
|
break;
|
|
|
|
|
1999-11-06 10:31:47 +00:00
|
|
|
case PCAP_MODIFIED_MAGIC:
|
2000-07-26 06:04:34 +00:00
|
|
|
/* Host that wrote it has our byte order, and was running
|
|
|
|
a program using either ss990915 or ss991029 libpcap. */
|
1999-11-06 08:42:01 +00:00
|
|
|
byte_swapped = FALSE;
|
1999-11-06 10:31:47 +00:00
|
|
|
modified = TRUE;
|
1999-11-06 08:42:01 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PCAP_SWAPPED_MAGIC:
|
2000-07-26 06:04:34 +00:00
|
|
|
/* Host that wrote it has a byte order opposite to ours,
|
|
|
|
and was running a program using either standard or
|
|
|
|
ss990417 libpcap. */
|
1999-11-06 08:42:01 +00:00
|
|
|
byte_swapped = TRUE;
|
1999-11-06 10:31:47 +00:00
|
|
|
modified = FALSE;
|
1999-11-06 08:42:01 +00:00
|
|
|
break;
|
|
|
|
|
1999-11-06 10:31:47 +00:00
|
|
|
case PCAP_SWAPPED_MODIFIED_MAGIC:
|
1999-11-06 08:42:01 +00:00
|
|
|
/* Host that wrote it out has a byte order opposite to
|
2000-07-26 06:04:34 +00:00
|
|
|
ours, and was running a program using either ss990915
|
|
|
|
or ss991029 libpcap. */
|
1999-11-06 08:42:01 +00:00
|
|
|
byte_swapped = TRUE;
|
1999-11-06 10:31:47 +00:00
|
|
|
modified = TRUE;
|
1999-11-06 08:42:01 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* Not a "libpcap" type we know about. */
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
return 0;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the rest of the header. */
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
errno = WTAP_ERR_CANT_READ;
|
1999-09-22 01:26:50 +00:00
|
|
|
bytes_read = file_read(&hdr, 1, sizeof hdr, wth->fh);
|
1998-11-15 05:29:17 +00:00
|
|
|
if (bytes_read != sizeof hdr) {
|
1999-10-05 07:06:08 +00:00
|
|
|
*err = file_error(wth->fh);
|
|
|
|
if (*err != 0)
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
return -1;
|
|
|
|
return 0;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
1999-08-28 01:19:45 +00:00
|
|
|
wth->data_offset += sizeof hdr;
|
1998-11-15 05:29:17 +00:00
|
|
|
|
|
|
|
if (byte_swapped) {
|
|
|
|
/* Byte-swap the header fields about which we care. */
|
|
|
|
hdr.version_major = BSWAP16(hdr.version_major);
|
|
|
|
hdr.version_minor = BSWAP16(hdr.version_minor);
|
|
|
|
hdr.snaplen = BSWAP32(hdr.snaplen);
|
|
|
|
hdr.network = BSWAP32(hdr.network);
|
|
|
|
}
|
|
|
|
if (hdr.version_major < 2) {
|
|
|
|
/* We only support version 2.0 and later. */
|
1999-08-22 02:29:40 +00:00
|
|
|
g_message("pcap: major version %u unsupported",
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
hdr.version_major);
|
|
|
|
*err = WTAP_ERR_UNSUPPORTED;
|
|
|
|
return -1;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* AIX's non-standard tcpdump uses a minor version number of 2.
|
|
|
|
* Unfortunately, older versions of libpcap might have used
|
|
|
|
* that as well.
|
|
|
|
*
|
|
|
|
* The AIX libpcap uses RFC 1573 ifType values rather than
|
|
|
|
* DLT_ values in the header; the ifType values for LAN devices
|
|
|
|
* are:
|
|
|
|
*
|
|
|
|
* Ethernet 6
|
2001-11-09 07:44:51 +00:00
|
|
|
* Token Ring 9
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
* FDDI 15
|
|
|
|
*
|
|
|
|
* which correspond to DLT_IEEE802 (used for Token Ring),
|
2003-03-25 06:04:54 +00:00
|
|
|
* DLT_PPP, and DLT_SLIP_BSDOS, respectively. The ifType value
|
|
|
|
* for a loopback interface is 24, which currently isn't
|
|
|
|
* used by any version of libpcap I know about (and, as
|
|
|
|
* tcpdump.org are assigning DLT_ values above 100, and
|
|
|
|
* NetBSD started assigning values starting at 50, and
|
|
|
|
* the values chosen by other libpcaps appear to stop at
|
|
|
|
* 19, it's probably not going to be used by any libpcap
|
|
|
|
* in the future).
|
|
|
|
*
|
|
|
|
* We shall assume that if the minor version number is 2, and
|
|
|
|
* the network type is 6, 9, 15, or 24, that it's AIX libpcap.
|
2001-11-09 07:44:51 +00:00
|
|
|
*
|
2001-11-07 08:16:26 +00:00
|
|
|
* I'm assuming those older versions of libpcap didn't
|
|
|
|
* use DLT_IEEE802 for Token Ring, and didn't use DLT_SLIP_BSDOS
|
2002-03-07 21:46:06 +00:00
|
|
|
* as that came later. It may have used DLT_PPP, however, in
|
2001-11-07 08:16:26 +00:00
|
|
|
* which case we're out of luck; we assume it's Token Ring
|
2001-11-09 07:44:51 +00:00
|
|
|
* in AIX libpcap rather than PPP in standard libpcap, as
|
2001-11-07 08:16:26 +00:00
|
|
|
* you're probably more likely to be handing an AIX libpcap
|
2001-11-09 07:44:51 +00:00
|
|
|
* token-ring capture than an old (pre-libpcap 0.4) PPP capture
|
|
|
|
* to Ethereal.
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
*/
|
|
|
|
aix = FALSE; /* assume it's not AIX */
|
|
|
|
if (hdr.version_major == 2 && hdr.version_minor == 2) {
|
|
|
|
switch (hdr.network) {
|
|
|
|
|
|
|
|
case 6:
|
|
|
|
hdr.network = 1; /* DLT_EN10MB, Ethernet */
|
|
|
|
aix = TRUE;
|
|
|
|
break;
|
|
|
|
|
2002-03-07 21:31:12 +00:00
|
|
|
case 9:
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
hdr.network = 6; /* DLT_IEEE802, Token Ring */
|
|
|
|
aix = TRUE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 15:
|
|
|
|
hdr.network = 10; /* DLT_FDDI, FDDI */
|
|
|
|
aix = TRUE;
|
|
|
|
break;
|
2003-03-25 06:04:54 +00:00
|
|
|
|
|
|
|
case 24:
|
|
|
|
hdr.network = 0; /* DLT_NULL, loopback */
|
|
|
|
aix = TRUE;
|
|
|
|
break;
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
}
|
|
|
|
}
|
2000-08-25 06:25:21 +00:00
|
|
|
file_encap = wtap_pcap_encap_to_wtap_encap(hdr.network);
|
|
|
|
if (file_encap == WTAP_ENCAP_UNKNOWN) {
|
1999-08-22 02:29:40 +00:00
|
|
|
g_message("pcap: network type %u unknown or unsupported",
|
|
|
|
hdr.network);
|
2000-02-19 08:00:08 +00:00
|
|
|
*err = WTAP_ERR_UNSUPPORTED_ENCAP;
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
return -1;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
wth->subtype_read = libpcap_read;
|
2002-06-06 09:18:28 +00:00
|
|
|
wth->subtype_seek_read = libpcap_seek_read;
|
2000-03-22 07:06:59 +00:00
|
|
|
wth->subtype_close = libpcap_close;
|
2000-08-25 06:25:21 +00:00
|
|
|
wth->file_encap = file_encap;
|
1998-11-15 05:29:17 +00:00
|
|
|
wth->snapshot_length = hdr.snaplen;
|
1999-11-06 10:31:47 +00:00
|
|
|
|
2003-10-24 23:55:34 +00:00
|
|
|
/* In file format version 2.3, the order of the "incl_len" and
|
|
|
|
"orig_len" fields in the per-packet header was reversed,
|
|
|
|
in order to match the BPF header layout.
|
|
|
|
|
|
|
|
Therefore, in files with versions prior to that, we must swap
|
|
|
|
those two fields.
|
|
|
|
|
|
|
|
Unfortunately, some files were, according to a comment in the
|
|
|
|
"libpcap" source, written with version 2.3 in their headers
|
|
|
|
but without the interchanged fields, so if "incl_len" is
|
|
|
|
greater than "orig_len" - which would make no sense - we
|
|
|
|
assume that we need to swap them in version 2.3 files
|
|
|
|
as well.
|
|
|
|
|
|
|
|
In addition, DG/UX's tcpdump uses version 543.0, and writes
|
|
|
|
the two fields in the pre-2.3 order. */
|
|
|
|
switch (hdr.version_major) {
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
if (hdr.version_minor < 3)
|
|
|
|
wth->capture.pcap->lengths_swapped = SWAPPED;
|
|
|
|
else if (hdr.version_minor == 3)
|
|
|
|
wth->capture.pcap->lengths_swapped = MAYBE_SWAPPED;
|
|
|
|
else
|
|
|
|
wth->capture.pcap->lengths_swapped = NOT_SWAPPED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 543:
|
|
|
|
wth->capture.pcap->lengths_swapped = SWAPPED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
wth->capture.pcap->lengths_swapped = NOT_SWAPPED;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-11-06 10:31:47 +00:00
|
|
|
/*
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
* Is this AIX format?
|
|
|
|
*/
|
|
|
|
if (aix) {
|
|
|
|
/*
|
|
|
|
* Yes. Skip all the tests for other mutant formats.
|
|
|
|
*/
|
|
|
|
wth->file_type = WTAP_FILE_PCAP_AIX;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No. Let's look at the header for the first record,
|
2000-07-26 06:04:34 +00:00
|
|
|
* and see if, interpreting it as a standard header (if the
|
|
|
|
* magic number was standard) or a modified header (if the
|
|
|
|
* magic number was modified), the position where it says the
|
|
|
|
* header for the *second* record is contains a corrupted header.
|
|
|
|
*
|
|
|
|
* If so, then:
|
|
|
|
*
|
|
|
|
* If this file had the standard magic number, it may be
|
|
|
|
* an ss990417 capture file - in that version of Alexey's
|
|
|
|
* patch, the packet header format was changed but the
|
|
|
|
* magic number wasn't, and, alas, Red Hat appear to have
|
|
|
|
* picked up that version of the patch for RH 6.1, meaning
|
|
|
|
* RH 6.1 has a tcpdump that writes out files that can't
|
|
|
|
* be read by any software that expects non-modified headers
|
|
|
|
* if the magic number isn't the modified magic number (e.g.,
|
|
|
|
* any normal version of tcpdump, and Ethereal if we don't
|
|
|
|
* do this gross heuristic).
|
|
|
|
*
|
|
|
|
* If this file had the modified magic number, it may be
|
|
|
|
* an ss990915 capture file - in that version of Alexey's
|
|
|
|
* patch, the magic number was changed, but the record
|
|
|
|
* header had some extra fields, and, alas, SuSE appear
|
|
|
|
* to have picked up that version of the patch for SuSE
|
|
|
|
* 6.3, meaning that programs expecting the standard per-
|
|
|
|
* packet header in captures with the modified magic number
|
|
|
|
* can't read dumps from its tcpdump.
|
2000-09-15 07:52:43 +00:00
|
|
|
*
|
|
|
|
* Oh, and if it has the standard magic number, it might, instead,
|
|
|
|
* be a Nokia libpcap file, so we may need to try that if
|
|
|
|
* neither normal nor ss990417 headers work.
|
1999-11-06 10:31:47 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
if (modified) {
|
|
|
|
/*
|
|
|
|
* Well, we have the magic number from Alexey's
|
|
|
|
* later two patches.
|
|
|
|
*
|
|
|
|
* Try ss991029, the last of his patches, first.
|
|
|
|
*/
|
|
|
|
wth->file_type = WTAP_FILE_PCAP_SS991029;
|
|
|
|
switch (libpcap_try(wth, err)) {
|
|
|
|
|
|
|
|
case BAD_READ:
|
|
|
|
/*
|
|
|
|
* Well, we couldn't even read it.
|
|
|
|
* Give up.
|
|
|
|
*/
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
2000-09-15 07:52:43 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case THIS_FORMAT:
|
|
|
|
/*
|
|
|
|
* Well, it looks as if it might be 991029.
|
|
|
|
* Put the seek pointer back, and return success.
|
|
|
|
*/
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
case OTHER_FORMAT:
|
|
|
|
/*
|
|
|
|
* Try the next format.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
}
|
2000-07-26 06:04:34 +00:00
|
|
|
|
1999-11-06 10:31:47 +00:00
|
|
|
/*
|
2000-09-15 07:52:43 +00:00
|
|
|
* Well, it's not completely unreadable,
|
|
|
|
* but it's not ss991029. Try ss990915;
|
|
|
|
* there are no other types to try after that,
|
|
|
|
* so we put the seek pointer back and treat
|
|
|
|
* it as 990915.
|
1999-11-06 10:31:47 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
wth->file_type = WTAP_FILE_PCAP_SS990915;
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Well, we have the standard magic number.
|
|
|
|
*
|
|
|
|
* Try the standard format first.
|
|
|
|
*/
|
|
|
|
wth->file_type = WTAP_FILE_PCAP;
|
|
|
|
switch (libpcap_try(wth, err)) {
|
|
|
|
|
|
|
|
case BAD_READ:
|
|
|
|
/*
|
|
|
|
* Well, we couldn't even read it.
|
|
|
|
* Give up.
|
|
|
|
*/
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
2000-09-15 07:52:43 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case THIS_FORMAT:
|
|
|
|
/*
|
|
|
|
* Well, it looks as if it might be a standard
|
|
|
|
* libpcap file.
|
|
|
|
* Put the seek pointer back, and return success.
|
|
|
|
*/
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
case OTHER_FORMAT:
|
|
|
|
/*
|
|
|
|
* Try the next format.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Well, it's not completely unreadable, but it's not
|
|
|
|
* a standard file. Put the seek pointer back and try
|
|
|
|
* ss990417.
|
|
|
|
*/
|
|
|
|
wth->file_type = WTAP_FILE_PCAP_SS990417;
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
switch (libpcap_try(wth, err)) {
|
|
|
|
|
|
|
|
case BAD_READ:
|
|
|
|
/*
|
|
|
|
* Well, we couldn't even read it.
|
|
|
|
* Give up.
|
|
|
|
*/
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
2000-09-15 07:52:43 +00:00
|
|
|
return -1;
|
1999-11-06 10:31:47 +00:00
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
case THIS_FORMAT:
|
|
|
|
/*
|
|
|
|
* Well, it looks as if it might be ss990417.
|
|
|
|
* Put the seek pointer back, and return success.
|
|
|
|
*/
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
case OTHER_FORMAT:
|
|
|
|
/*
|
|
|
|
* Try the next format.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
}
|
1999-11-06 10:31:47 +00:00
|
|
|
|
|
|
|
/*
|
2000-09-15 07:52:43 +00:00
|
|
|
* Well, it's not completely unreadable,
|
|
|
|
* but it's not a standard file *nor* is it ss990417.
|
|
|
|
* Try it as a Nokia file; there are no other types
|
|
|
|
* to try after that, so we put the seek pointer back
|
|
|
|
* and treat it as a Nokia file.
|
1999-11-06 10:31:47 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
wth->file_type = WTAP_FILE_PCAP_NOKIA;
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->fh, wth->data_offset, SEEK_SET, err) == -1) {
|
2002-03-04 00:25:35 +00:00
|
|
|
g_free(wth->capture.pcap);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-07-26 06:04:34 +00:00
|
|
|
}
|
1999-11-06 10:31:47 +00:00
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2000-07-26 06:04:34 +00:00
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
/* Try to read the first two records of the capture file. */
|
|
|
|
static libpcap_try_t libpcap_try(wtap *wth, int *err)
|
|
|
|
{
|
2000-07-26 06:04:34 +00:00
|
|
|
/*
|
2000-09-15 07:52:43 +00:00
|
|
|
* pcaprec_ss990915_hdr is the largest header type.
|
2000-07-26 06:04:34 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
struct pcaprec_ss990915_hdr first_rec_hdr, second_rec_hdr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Attempt to read the first record's header.
|
|
|
|
*/
|
|
|
|
if (libpcap_read_header(wth, err, &first_rec_hdr, TRUE) == -1) {
|
2000-09-17 07:50:35 +00:00
|
|
|
if (*err == 0 || *err == WTAP_ERR_SHORT_READ) {
|
2000-09-15 07:52:43 +00:00
|
|
|
/*
|
2000-09-17 07:50:35 +00:00
|
|
|
* EOF or short read - assume the file is in this
|
|
|
|
* format.
|
2000-09-15 07:52:43 +00:00
|
|
|
* When our client tries to read the first packet
|
2000-09-17 07:50:35 +00:00
|
|
|
* they will presumably get the same EOF or short
|
|
|
|
* read.
|
2000-09-15 07:52:43 +00:00
|
|
|
*/
|
|
|
|
return THIS_FORMAT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*err == WTAP_ERR_BAD_RECORD) {
|
|
|
|
/*
|
|
|
|
* The first record is bogus, so this is probably
|
|
|
|
* a corrupt file. Assume the file is in this
|
|
|
|
* format. When our client tries to read the
|
|
|
|
* first packet they will presumably get the
|
|
|
|
* same bogus record.
|
|
|
|
*/
|
|
|
|
return THIS_FORMAT;
|
|
|
|
}
|
1999-11-06 10:31:47 +00:00
|
|
|
|
|
|
|
/*
|
2000-09-15 07:52:43 +00:00
|
|
|
* Some other error, e.g. an I/O error; just give up.
|
1999-11-06 10:31:47 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
return BAD_READ;
|
1999-11-06 10:31:47 +00:00
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
/*
|
|
|
|
* Now skip over the first record's data, under the assumption
|
|
|
|
* that the header is sane.
|
|
|
|
*/
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->fh, first_rec_hdr.hdr.incl_len, SEEK_CUR, err) == -1)
|
2002-03-04 00:25:35 +00:00
|
|
|
return BAD_READ;
|
2000-09-15 07:52:43 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Now attempt to read the second record's header.
|
|
|
|
*/
|
|
|
|
if (libpcap_read_header(wth, err, &second_rec_hdr, TRUE) == -1) {
|
2000-09-17 07:50:35 +00:00
|
|
|
if (*err == 0 || *err == WTAP_ERR_SHORT_READ) {
|
2000-09-15 07:52:43 +00:00
|
|
|
/*
|
2000-09-17 07:50:35 +00:00
|
|
|
* EOF or short read - assume the file is in this
|
|
|
|
* format.
|
2000-09-15 07:52:43 +00:00
|
|
|
* When our client tries to read the second packet
|
2000-09-17 07:50:35 +00:00
|
|
|
* they will presumably get the same EOF or short
|
|
|
|
* read.
|
2000-09-15 07:52:43 +00:00
|
|
|
*/
|
|
|
|
return THIS_FORMAT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*err == WTAP_ERR_BAD_RECORD) {
|
|
|
|
/*
|
|
|
|
* The second record is bogus; maybe it's a
|
|
|
|
* Capture File From Hell, and what looks like
|
|
|
|
* the "header" of the next packet is actually
|
|
|
|
* random junk from the middle of a packet.
|
|
|
|
* Try the next format; if we run out of formats,
|
|
|
|
* it probably *is* a corrupt file.
|
|
|
|
*/
|
|
|
|
return OTHER_FORMAT;
|
|
|
|
}
|
|
|
|
|
2000-07-26 06:04:34 +00:00
|
|
|
/*
|
2000-09-15 07:52:43 +00:00
|
|
|
* Some other error, e.g. an I/O error; just give up.
|
2000-07-26 06:04:34 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
return BAD_READ;
|
2000-07-26 06:04:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2000-09-15 07:52:43 +00:00
|
|
|
* OK, the first two records look OK; assume this is the
|
|
|
|
* right format.
|
2000-07-26 06:04:34 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
return THIS_FORMAT;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the next packet */
|
2001-10-04 08:30:36 +00:00
|
|
|
static gboolean libpcap_read(wtap *wth, int *err, long *data_offset)
|
1998-11-15 05:29:17 +00:00
|
|
|
{
|
2000-07-26 06:04:34 +00:00
|
|
|
struct pcaprec_ss990915_hdr hdr;
|
2000-09-15 07:52:43 +00:00
|
|
|
guint packet_size;
|
2002-06-06 09:18:28 +00:00
|
|
|
guint orig_size;
|
2000-09-15 07:52:43 +00:00
|
|
|
int bytes_read;
|
2002-11-16 20:20:30 +00:00
|
|
|
char fddi_padding[3];
|
2000-09-15 07:52:43 +00:00
|
|
|
|
|
|
|
bytes_read = libpcap_read_header(wth, err, &hdr, FALSE);
|
|
|
|
if (bytes_read == -1) {
|
|
|
|
/*
|
|
|
|
* We failed to read the header.
|
|
|
|
*/
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
wth->data_offset += bytes_read;
|
|
|
|
packet_size = hdr.hdr.incl_len;
|
2002-06-06 09:18:28 +00:00
|
|
|
orig_size = hdr.hdr.orig_len;
|
2000-09-15 07:52:43 +00:00
|
|
|
|
2002-11-16 20:20:30 +00:00
|
|
|
/*
|
|
|
|
* AIX appears to put 3 bytes of padding in front of FDDI
|
|
|
|
* frames; strip that crap off.
|
|
|
|
*/
|
|
|
|
if (wth->file_type == WTAP_FILE_PCAP_AIX &&
|
|
|
|
(wth->file_encap == WTAP_ENCAP_FDDI ||
|
|
|
|
wth->file_encap == WTAP_ENCAP_FDDI_BITSWAPPED)) {
|
|
|
|
/*
|
|
|
|
* The packet size is really a record size and includes
|
|
|
|
* the padding.
|
|
|
|
*/
|
|
|
|
packet_size -= 3;
|
|
|
|
orig_size -= 3;
|
|
|
|
wth->data_offset += 3;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the padding.
|
|
|
|
*/
|
|
|
|
if (!libpcap_read_rec_data(wth->fh, fddi_padding, 3, err))
|
|
|
|
return FALSE; /* Read error */
|
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
*data_offset = wth->data_offset;
|
|
|
|
|
2002-06-06 09:18:28 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
2003-10-01 07:11:49 +00:00
|
|
|
switch (wth->file_encap) {
|
|
|
|
|
|
|
|
case WTAP_ENCAP_ATM_PDUS:
|
2002-06-06 09:18:28 +00:00
|
|
|
if (packet_size < sizeof (struct sunatm_hdr)) {
|
|
|
|
/*
|
|
|
|
* Uh-oh, the packet isn't big enough to even
|
|
|
|
* have a pseudo-header.
|
|
|
|
*/
|
|
|
|
g_message("libpcap: SunATM file has a %u-byte packet, too small to have even an ATM pseudo-header\n",
|
|
|
|
packet_size);
|
|
|
|
*err = WTAP_ERR_BAD_RECORD;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
if (!libpcap_read_atm_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);
|
2003-10-01 07:11:49 +00:00
|
|
|
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;
|
2000-09-15 07:52:43 +00:00
|
|
|
}
|
2002-06-06 09:18:28 +00:00
|
|
|
|
|
|
|
buffer_assure_space(wth->frame_buffer, packet_size);
|
|
|
|
if (!libpcap_read_rec_data(wth->fh, buffer_start_ptr(wth->frame_buffer),
|
|
|
|
packet_size, err))
|
|
|
|
return FALSE; /* Read error */
|
2000-09-15 07:52:43 +00:00
|
|
|
wth->data_offset += packet_size;
|
|
|
|
|
|
|
|
wth->phdr.ts.tv_sec = hdr.hdr.ts_sec;
|
|
|
|
wth->phdr.ts.tv_usec = hdr.hdr.ts_usec;
|
|
|
|
wth->phdr.caplen = packet_size;
|
2002-06-06 09:18:28 +00:00
|
|
|
wth->phdr.len = orig_size;
|
2000-09-15 07:52:43 +00:00
|
|
|
wth->phdr.pkt_encap = wth->file_encap;
|
|
|
|
|
2002-08-07 06:59:49 +00:00
|
|
|
/*
|
|
|
|
* If this is ATM LANE traffic, try to guess what type of LANE
|
|
|
|
* traffic it is based on the packet contents.
|
|
|
|
*/
|
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer. (That's not a great name, but I
couldn't think of a better one.)
Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off. That's what at least some versions of the
Windows-based ATM Sniffer appear to have.
Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).
svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
|
|
|
if (wth->file_encap == WTAP_ENCAP_ATM_PDUS &&
|
2002-08-07 06:59:49 +00:00
|
|
|
wth->pseudo_header.atm.type == TRAF_LANE) {
|
|
|
|
atm_guess_lane_type(buffer_start_ptr(wth->frame_buffer),
|
|
|
|
wth->phdr.caplen, &wth->pseudo_header);
|
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2002-06-06 09:18:28 +00:00
|
|
|
static gboolean
|
|
|
|
libpcap_seek_read(wtap *wth, long seek_off,
|
2002-07-29 06:09:59 +00:00
|
|
|
union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err)
|
2002-06-06 09:18:28 +00:00
|
|
|
{
|
2002-06-07 07:27:35 +00:00
|
|
|
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
2002-06-06 09:18:28 +00:00
|
|
|
return FALSE;
|
|
|
|
|
2003-10-01 07:11:49 +00:00
|
|
|
switch (wth->file_encap) {
|
|
|
|
|
|
|
|
case WTAP_ENCAP_ATM_PDUS:
|
2002-06-06 09:18:28 +00:00
|
|
|
if (!libpcap_read_atm_pseudoheader(wth->random_fh, pseudo_header,
|
|
|
|
err)) {
|
|
|
|
/* Read error */
|
|
|
|
return FALSE;
|
|
|
|
}
|
2003-10-01 07:11:49 +00:00
|
|
|
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;
|
2002-06-06 09:18:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the packet data.
|
|
|
|
*/
|
2002-08-07 06:59:49 +00:00
|
|
|
if (!libpcap_read_rec_data(wth->random_fh, pd, length, err))
|
|
|
|
return FALSE; /* failed */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If this is ATM LANE traffic, try to guess what type of LANE
|
|
|
|
* traffic it is based on the packet contents.
|
|
|
|
*/
|
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer. (That's not a great name, but I
couldn't think of a better one.)
Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off. That's what at least some versions of the
Windows-based ATM Sniffer appear to have.
Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).
svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
|
|
|
if (wth->file_encap == WTAP_ENCAP_ATM_PDUS &&
|
2002-08-07 06:59:49 +00:00
|
|
|
pseudo_header->atm.type == TRAF_LANE)
|
|
|
|
atm_guess_lane_type(pd, length, pseudo_header);
|
|
|
|
return TRUE;
|
2002-06-06 09:18:28 +00:00
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
/* Read the header of the next packet; if "silent" is TRUE, don't complain
|
|
|
|
to the console, as we're testing to see if the file appears to be of a
|
|
|
|
particular type.
|
|
|
|
|
|
|
|
Return -1 on an error, or the number of bytes of header read on success. */
|
|
|
|
static int libpcap_read_header(wtap *wth, int *err,
|
|
|
|
struct pcaprec_ss990915_hdr *hdr, gboolean silent)
|
|
|
|
{
|
|
|
|
int bytes_to_read, bytes_read;
|
1998-11-15 05:29:17 +00:00
|
|
|
|
|
|
|
/* Read record header. */
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
errno = WTAP_ERR_CANT_READ;
|
2000-07-26 06:04:34 +00:00
|
|
|
switch (wth->file_type) {
|
|
|
|
|
|
|
|
case WTAP_FILE_PCAP:
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
case WTAP_FILE_PCAP_AIX:
|
2000-07-26 06:04:34 +00:00
|
|
|
bytes_to_read = sizeof (struct pcaprec_hdr);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_FILE_PCAP_SS990417:
|
|
|
|
case WTAP_FILE_PCAP_SS991029:
|
|
|
|
bytes_to_read = sizeof (struct pcaprec_modified_hdr);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_FILE_PCAP_SS990915:
|
|
|
|
bytes_to_read = sizeof (struct pcaprec_ss990915_hdr);
|
|
|
|
break;
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
case WTAP_FILE_PCAP_NOKIA:
|
|
|
|
bytes_to_read = sizeof (struct pcaprec_nokia_hdr);
|
|
|
|
break;
|
|
|
|
|
2000-07-26 06:04:34 +00:00
|
|
|
default:
|
|
|
|
g_assert_not_reached();
|
|
|
|
bytes_to_read = 0;
|
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
bytes_read = file_read(hdr, 1, bytes_to_read, wth->fh);
|
1999-11-06 08:42:01 +00:00
|
|
|
if (bytes_read != bytes_to_read) {
|
1999-10-05 07:06:08 +00:00
|
|
|
*err = file_error(wth->fh);
|
2000-09-07 05:34:23 +00:00
|
|
|
if (*err == 0 && bytes_read != 0) {
|
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of
the type that file is checking for, and supply an error code if they
return -1; have "wtap_open_offline()" use that error code. Also, have
the per-capture-file-type open routines treat errors accessing the file
as errors, and return -1, rather than just returning 0 so that we try
another file type.
Have the per-capture-file-type read routines "wtap_loop()" calls return
-1 and supply an error code on error (and not, as they did in some
cases, call "g_error()" and abort), and have "wtap_loop()", if the read
routine returned an error, return FALSE (and pass an error-code-pointer
argument onto the read routines, so they fill it in), and return TRUE on
success.
Add some new error codes for them to return.
Now that "wtap_loop()" can return a success/failure indication and an
error code, in "read_cap_file()" put up a message box if we get an error
reading the file, and return the error code.
Handle the additional errors we can get when opening a capture file.
If the attempt to open a capture file succeeds, but the attempt to read
it fails, don't treat that as a complete failure - we may have managed
to read some of the capture file, and we should display what we managed
to read.
svn path=/trunk/; revision=516
1999-08-19 05:31:38 +00:00
|
|
|
*err = WTAP_ERR_SHORT_READ;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
return -1;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
adjust_header(wth, &hdr->hdr);
|
1998-11-15 05:29:17 +00:00
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
if (hdr->hdr.incl_len > WTAP_MAX_PACKET_SIZE) {
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
/*
|
2000-09-15 07:52:43 +00:00
|
|
|
* Probably a corrupt capture file; return an error,
|
|
|
|
* so that our caller doesn't blow up trying to allocate
|
|
|
|
* space for an immensely-large packet, and so that
|
|
|
|
* the code to try to guess what type of libpcap file
|
|
|
|
* this is can tell when it's not the type we're guessing
|
|
|
|
* it is.
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
*/
|
2000-09-15 07:52:43 +00:00
|
|
|
if (!silent) {
|
|
|
|
g_message("pcap: File has %u-byte packet, bigger than maximum of %u",
|
|
|
|
hdr->hdr.incl_len, WTAP_MAX_PACKET_SIZE);
|
|
|
|
}
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
*err = WTAP_ERR_BAD_RECORD;
|
2000-09-15 07:52:43 +00:00
|
|
|
return -1;
|
DLT_NULL, from "libpcap", means different things on different platforms
and in different capture files; throw in some heuristics to try to
figure out whether the 4-byte header is:
1) PPP-over-HDLC (some version of ISDN4BSD?);
2) big-endian AF_ value (BSD on big-endian platforms);
3) little-endian AF_ value (BSD on little-endian platforms);
4) two octets of 0 followed by an Ethernet type (Linux, at least
on little-endian platforms, as mutated by "libpcap").
Make a separate Wiretap encapsulation type, WTAP_ENCAP_NULL,
corresponding to DLT_NULL.
Have the PPP code dissect the frame if it's PPP-over-HDLC, and have
"ethertype()" dissect the Ethernet type and the rest of the packet if
it's a Linux-style header; dissect it ourselves only if it's an AF_
value.
Have Wiretap impose a maximum packet size of 65535 bytes, so that it
fails more gracefully when handed a corrupt "libpcap" capture file
(other capture file formats with more than a 16-bit capture length
field, if any, will have that check added later), and put that size in
"wtap.h" and have Ethereal use it as its notion of a maximum packet
size.
Have Ethereal put up a "this file appears to be damaged or corrupt"
message box if Wiretap returns a WTAP_ERR_BAD_RECORD error when opening
or reading a capture file.
Include loopback interfaces in the list of interfaces offered by the
"Capture" dialog box, but put them at the end of the list so that it
doesn't default to a loopback interface unless there are no other
interfaces. Also, don't require that an interface in the list have an
IP address associated with it, and only put one entry in the list for a
given interface (SIOCGIFCONF returns one entry per interface *address*,
not per *interface* - and even if you were to use only IP addresses, an
interface could conceivably have more than one IP address).
Exclusively use Wiretap encapsulation types internally, even when
capturing; don't use DLT_ types.
svn path=/trunk/; revision=540
1999-08-22 00:47:56 +00:00
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
if (hdr->hdr.orig_len > WTAP_MAX_PACKET_SIZE) {
|
|
|
|
/*
|
|
|
|
* Probably a corrupt capture file; return an error,
|
|
|
|
* so that our caller doesn't blow up trying to
|
|
|
|
* cope with a huge "real" packet length, and so that
|
|
|
|
* the code to try to guess what type of libpcap file
|
|
|
|
* this is can tell when it's not the type we're guessing
|
|
|
|
* it is.
|
|
|
|
*/
|
|
|
|
if (!silent) {
|
|
|
|
g_message("pcap: File has %u-byte packet, bigger than maximum of %u",
|
|
|
|
hdr->hdr.orig_len, WTAP_MAX_PACKET_SIZE);
|
|
|
|
}
|
|
|
|
*err = WTAP_ERR_BAD_RECORD;
|
|
|
|
return -1;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
return bytes_read;
|
1998-11-15 05:29:17 +00:00
|
|
|
}
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
1999-11-06 10:31:47 +00:00
|
|
|
static void
|
|
|
|
adjust_header(wtap *wth, struct pcaprec_hdr *hdr)
|
|
|
|
{
|
2003-10-24 23:55:34 +00:00
|
|
|
guint32 temp;
|
|
|
|
|
1999-11-06 10:31:47 +00:00
|
|
|
if (wth->capture.pcap->byte_swapped) {
|
|
|
|
/* Byte-swap the record header fields. */
|
|
|
|
hdr->ts_sec = BSWAP32(hdr->ts_sec);
|
|
|
|
hdr->ts_usec = BSWAP32(hdr->ts_usec);
|
|
|
|
hdr->incl_len = BSWAP32(hdr->incl_len);
|
|
|
|
hdr->orig_len = BSWAP32(hdr->orig_len);
|
|
|
|
}
|
|
|
|
|
Add in some heuristics to try to detect AIX libpcap format. (This works
with one capture I've seen, but perhaps that was done with an old
version of AIX, and newer versions use a minor version number, in the
file, of 4.
However, libpcap hasn't used a minor version of 2 for ages, so perhaps
AIX hasn't updated their libpcap in ages, and aren't about to do so
soon. If they do, let's hope they change the magic number. The capture
file in question *does* have the capture length and real length in the
old, pre-2.3, order, so it really looks as if it's an old version,
rather than IBM trying to be "helpful" by using a different minor
version number so that you can distinguish between normal libpcap and
AIX libpcap formats.)
svn path=/trunk/; revision=4164
2001-11-06 01:55:14 +00:00
|
|
|
/* If this is AIX, convert the time stamp from seconds/nanoseconds
|
|
|
|
to seconds/microseconds. */
|
|
|
|
if (wth->file_type == WTAP_FILE_PCAP_AIX)
|
|
|
|
hdr->ts_usec = hdr->ts_usec/1000;
|
|
|
|
|
2003-10-24 23:55:34 +00:00
|
|
|
/* Swap the "incl_len" and "orig_len" fields, if necessary. */
|
|
|
|
switch (wth->capture.pcap->lengths_swapped) {
|
1999-11-06 10:31:47 +00:00
|
|
|
|
2003-10-24 23:55:34 +00:00
|
|
|
case NOT_SWAPPED:
|
|
|
|
break;
|
1999-11-06 10:31:47 +00:00
|
|
|
|
2003-10-24 23:55:34 +00:00
|
|
|
case MAYBE_SWAPPED:
|
|
|
|
if (hdr->incl_len <= hdr->orig_len) {
|
|
|
|
/*
|
|
|
|
* The captured length is <= the actual length,
|
|
|
|
* so presumably they weren't swapped.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHROUGH */
|
2003-10-24 10:52:04 +00:00
|
|
|
|
2003-10-24 23:55:34 +00:00
|
|
|
case SWAPPED:
|
1999-11-06 10:31:47 +00:00
|
|
|
temp = hdr->orig_len;
|
|
|
|
hdr->orig_len = hdr->incl_len;
|
|
|
|
hdr->incl_len = temp;
|
2003-10-24 23:55:34 +00:00
|
|
|
break;
|
1999-11-06 10:31:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-06-07 21:11:24 +00:00
|
|
|
static void
|
|
|
|
libpcap_get_atm_pseudoheader(const struct sunatm_hdr *atm_phdr,
|
|
|
|
union wtap_pseudo_header *pseudo_header)
|
2002-06-06 09:18:28 +00:00
|
|
|
{
|
|
|
|
guint8 vpi;
|
|
|
|
guint16 vci;
|
|
|
|
|
2002-06-07 21:11:24 +00:00
|
|
|
vpi = atm_phdr->vpi;
|
|
|
|
vci = pntohs(&atm_phdr->vci);
|
2002-06-06 09:18:28 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The lower 4 bits of the first byte of the header indicate
|
|
|
|
* the type of traffic, as per the "atmioctl.h" header in
|
|
|
|
* SunATM.
|
|
|
|
*/
|
2002-06-07 21:11:24 +00:00
|
|
|
switch (atm_phdr->flags & 0x0F) {
|
2002-06-06 09:18:28 +00:00
|
|
|
|
|
|
|
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;
|
2003-01-09 01:55:13 +00:00
|
|
|
pseudo_header->atm.channel = (atm_phdr->flags & 0x80) ? 0 : 1;
|
2002-06-06 09:18:28 +00:00
|
|
|
|
|
|
|
/* We don't have this information */
|
2003-01-10 04:04:42 +00:00
|
|
|
pseudo_header->atm.flags = 0;
|
2002-06-06 09:18:28 +00:00
|
|
|
pseudo_header->atm.cells = 0;
|
|
|
|
pseudo_header->atm.aal5t_u2u = 0;
|
|
|
|
pseudo_header->atm.aal5t_len = 0;
|
|
|
|
pseudo_header->atm.aal5t_chksum = 0;
|
2002-06-07 21:11:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
libpcap_read_atm_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_atm_pseudoheader(&atm_phdr, pseudo_header);
|
2002-06-06 09:18:28 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2002-07-29 06:09:59 +00:00
|
|
|
libpcap_read_rec_data(FILE_T fh, guchar *pd, int length, int *err)
|
2002-06-06 09:18:28 +00:00
|
|
|
{
|
|
|
|
int bytes_read;
|
|
|
|
|
|
|
|
errno = WTAP_ERR_CANT_READ;
|
|
|
|
bytes_read = file_read(pd, 1, length, fh);
|
|
|
|
|
|
|
|
if (bytes_read != length) {
|
|
|
|
*err = file_error(fh);
|
|
|
|
if (*err == 0)
|
|
|
|
*err = WTAP_ERR_SHORT_READ;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2000-03-22 07:06:59 +00:00
|
|
|
static void
|
|
|
|
libpcap_close(wtap *wth)
|
|
|
|
{
|
|
|
|
g_free(wth->capture.pcap);
|
|
|
|
}
|
|
|
|
|
2000-08-25 06:25:21 +00:00
|
|
|
static int wtap_wtap_encap_to_pcap_encap(int encap)
|
|
|
|
{
|
2001-07-13 00:55:58 +00:00
|
|
|
unsigned int i;
|
2000-08-25 06:25:21 +00:00
|
|
|
|
2003-01-31 01:02:14 +00:00
|
|
|
switch (encap) {
|
|
|
|
|
|
|
|
case WTAP_ENCAP_FDDI:
|
|
|
|
case WTAP_ENCAP_FDDI_BITSWAPPED:
|
|
|
|
/*
|
|
|
|
* 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).
|
|
|
|
*/
|
2000-08-25 06:25:21 +00:00
|
|
|
return 10; /* that's DLT_FDDI */
|
2003-01-31 01:02:14 +00:00
|
|
|
|
|
|
|
case WTAP_ENCAP_PPP_WITH_PHDR:
|
|
|
|
/*
|
|
|
|
* Also special-case PPP and Frame Relay with direction
|
|
|
|
* bits; map them to PPP and Frame Relay, even though
|
|
|
|
* that means that the direction of the packet is lost.
|
|
|
|
*/
|
|
|
|
return 9;
|
|
|
|
|
|
|
|
case WTAP_ENCAP_FRELAY_WITH_PHDR:
|
|
|
|
return 107;
|
|
|
|
}
|
|
|
|
|
2000-08-25 06:25:21 +00:00
|
|
|
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;
|
|
|
|
}
|
1999-12-04 08:32:14 +00:00
|
|
|
|
2002-06-07 21:11:24 +00:00
|
|
|
#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.
|
|
|
|
*/
|
2002-07-29 06:09:59 +00:00
|
|
|
const guchar *
|
2002-06-07 21:11:24 +00:00
|
|
|
wtap_process_pcap_packet(gint linktype, const struct pcap_pkthdr *phdr,
|
2002-07-29 06:09:59 +00:00
|
|
|
const guchar *pd, union wtap_pseudo_header *pseudo_header,
|
2002-06-07 21:11:24 +00:00
|
|
|
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.tv_sec = phdr->ts.tv_sec;
|
|
|
|
whdr->ts.tv_usec = phdr->ts.tv_usec;
|
|
|
|
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.
|
|
|
|
*/
|
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer. (That's not a great name, but I
couldn't think of a better one.)
Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off. That's what at least some versions of the
Windows-based ATM Sniffer appear to have.
Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).
svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
|
|
|
if (linktype == WTAP_ENCAP_ATM_PDUS) {
|
2002-06-07 21:11:24 +00:00
|
|
|
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;
|
|
|
|
}
|
2002-11-27 22:23:34 +00:00
|
|
|
libpcap_get_atm_pseudoheader((const struct sunatm_hdr *)pd,
|
2002-06-07 21:11:24 +00:00
|
|
|
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);
|
2002-08-07 06:59:49 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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);
|
2002-06-07 21:11:24 +00:00
|
|
|
}
|
|
|
|
return pd;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-12-04 08:32:14 +00:00
|
|
|
/* Returns 0 if we could write the specified encapsulation type,
|
|
|
|
an error indication otherwise. */
|
2002-02-27 08:57:25 +00:00
|
|
|
int libpcap_dump_can_write_encap(int encap)
|
1999-12-04 08:32:14 +00:00
|
|
|
{
|
|
|
|
/* Per-packet encapsulations aren't supported. */
|
|
|
|
if (encap == WTAP_ENCAP_PER_PACKET)
|
|
|
|
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
|
|
|
|
|
2000-08-25 06:25:21 +00:00
|
|
|
if (wtap_wtap_encap_to_pcap_encap(encap) == -1)
|
1999-12-04 08:32:14 +00:00
|
|
|
return WTAP_ERR_UNSUPPORTED_ENCAP;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-12-04 05:14:39 +00:00
|
|
|
/* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
failure */
|
2002-07-16 07:15:09 +00:00
|
|
|
gboolean libpcap_dump_open(wtap_dumper *wdh, gboolean cant_seek _U_, int *err)
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
{
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
guint32 magic;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
struct pcap_hdr file_hdr;
|
2001-08-25 03:18:48 +00:00
|
|
|
size_t nwritten;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
|
|
|
/* This is a libpcap file */
|
|
|
|
wdh->subtype_write = libpcap_dump;
|
1999-12-04 08:32:14 +00:00
|
|
|
wdh->subtype_close = NULL;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
|
|
|
/* Write the file header. */
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
switch (wdh->file_type) {
|
|
|
|
|
|
|
|
case WTAP_FILE_PCAP:
|
2000-07-26 06:04:34 +00:00
|
|
|
case WTAP_FILE_PCAP_SS990417: /* modified, but with the old magic, sigh */
|
2000-09-15 07:52:43 +00:00
|
|
|
case WTAP_FILE_PCAP_NOKIA: /* Nokia libpcap of some sort */
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
magic = PCAP_MAGIC;
|
|
|
|
break;
|
|
|
|
|
2000-07-26 06:04:34 +00:00
|
|
|
case WTAP_FILE_PCAP_SS990915: /* new magic, extra crap */
|
|
|
|
case WTAP_FILE_PCAP_SS991029:
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
magic = PCAP_MODIFIED_MAGIC;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* We should never get here - our open routine
|
|
|
|
should only get called for the types above. */
|
|
|
|
*err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
nwritten = fwrite(&magic, 1, sizeof magic, wdh->fh);
|
|
|
|
if (nwritten != sizeof magic) {
|
2001-08-25 03:18:48 +00:00
|
|
|
if (nwritten == 0 && ferror(wdh->fh))
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
*err = errno;
|
|
|
|
else
|
|
|
|
*err = WTAP_ERR_SHORT_WRITE;
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
}
|
2001-12-04 07:32:05 +00:00
|
|
|
wdh->bytes_dumped += sizeof magic;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
|
|
|
/* current "libpcap" format is 2.4 */
|
|
|
|
file_hdr.version_major = 2;
|
|
|
|
file_hdr.version_minor = 4;
|
|
|
|
file_hdr.thiszone = 0; /* XXX - current offset? */
|
|
|
|
file_hdr.sigfigs = 0; /* unknown, but also apparently unused */
|
2002-03-09 23:07:26 +00:00
|
|
|
/*
|
|
|
|
* Tcpdump cannot handle capture files with a snapshot length of 0,
|
|
|
|
* as BPF filters return either 0 if they fail or the snapshot length
|
|
|
|
* if they succeed, and a snapshot length of 0 means success is
|
|
|
|
* indistinguishable from failure and the filter expression would
|
|
|
|
* reject all packets.
|
|
|
|
*
|
|
|
|
* A snapshot length of 0, inside Wiretap, means "snapshot length
|
|
|
|
* unknown"; if the snapshot length supplied to us is 0, we make
|
|
|
|
* the snapshot length in the header file WTAP_MAX_PACKET_SIZE.
|
|
|
|
*/
|
|
|
|
file_hdr.snaplen = (wdh->snaplen != 0) ? wdh->snaplen :
|
|
|
|
WTAP_MAX_PACKET_SIZE;
|
2000-08-25 06:25:21 +00:00
|
|
|
file_hdr.network = wtap_wtap_encap_to_pcap_encap(wdh->encap);
|
1999-09-23 05:00:59 +00:00
|
|
|
nwritten = fwrite(&file_hdr, 1, sizeof file_hdr, wdh->fh);
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
if (nwritten != sizeof file_hdr) {
|
2001-08-25 03:18:48 +00:00
|
|
|
if (nwritten == 0 && ferror(wdh->fh))
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
*err = errno;
|
|
|
|
else
|
|
|
|
*err = WTAP_ERR_SHORT_WRITE;
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
}
|
2001-12-04 07:32:05 +00:00
|
|
|
wdh->bytes_dumped += sizeof file_hdr;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
1999-12-04 05:14:39 +00:00
|
|
|
return TRUE;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write a record for a packet to a dump file.
|
1999-12-04 05:14:39 +00:00
|
|
|
Returns TRUE on success, FALSE on failure. */
|
2002-03-02 20:41:08 +00:00
|
|
|
static gboolean libpcap_dump(wtap_dumper *wdh,
|
|
|
|
const struct wtap_pkthdr *phdr,
|
|
|
|
const union wtap_pseudo_header *pseudo_header _U_,
|
2002-07-29 06:09:59 +00:00
|
|
|
const guchar *pd, int *err)
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
{
|
2000-07-26 06:04:34 +00:00
|
|
|
struct pcaprec_ss990915_hdr rec_hdr;
|
2001-08-25 03:18:48 +00:00
|
|
|
size_t hdr_size;
|
|
|
|
size_t nwritten;
|
2002-06-06 09:18:28 +00:00
|
|
|
struct sunatm_hdr atm_hdr;
|
|
|
|
int atm_hdrsize;
|
|
|
|
|
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer. (That's not a great name, but I
couldn't think of a better one.)
Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off. That's what at least some versions of the
Windows-based ATM Sniffer appear to have.
Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).
svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
|
|
|
if (wdh->encap == WTAP_ENCAP_ATM_PDUS)
|
2002-06-06 09:18:28 +00:00
|
|
|
atm_hdrsize = sizeof (struct sunatm_hdr);
|
|
|
|
else
|
|
|
|
atm_hdrsize = 0;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
rec_hdr.hdr.ts_sec = phdr->ts.tv_sec;
|
|
|
|
rec_hdr.hdr.ts_usec = phdr->ts.tv_usec;
|
2002-06-06 09:18:28 +00:00
|
|
|
rec_hdr.hdr.incl_len = phdr->caplen + atm_hdrsize;
|
|
|
|
rec_hdr.hdr.orig_len = phdr->len + atm_hdrsize;
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
switch (wdh->file_type) {
|
|
|
|
|
|
|
|
case WTAP_FILE_PCAP:
|
2000-07-26 06:04:34 +00:00
|
|
|
hdr_size = sizeof (struct pcaprec_hdr);
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
break;
|
|
|
|
|
2000-07-26 06:04:34 +00:00
|
|
|
case WTAP_FILE_PCAP_SS990417: /* modified, but with the old magic, sigh */
|
|
|
|
case WTAP_FILE_PCAP_SS991029:
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
/* XXX - what should we supply here?
|
|
|
|
|
|
|
|
Alexey's "libpcap" looks up the interface in the system's
|
|
|
|
interface list if "ifindex" is non-zero, and prints
|
|
|
|
the interface name. It ignores "protocol", and uses
|
|
|
|
"pkt_type" to tag the packet as "host", "broadcast",
|
|
|
|
"multicast", "other host", "outgoing", or "none of the
|
|
|
|
above", but that's it.
|
|
|
|
|
|
|
|
If the capture we're writing isn't a modified or
|
|
|
|
RH 6.1 capture, we'd have to do some work to
|
|
|
|
generate the packet type and interface index - and
|
|
|
|
we can't generate the interface index unless we
|
|
|
|
just did the capture ourselves in any case.
|
|
|
|
|
|
|
|
I'm inclined to continue to punt; systems other than
|
|
|
|
those with the older patch can read standard "libpcap"
|
|
|
|
files, and systems with the older patch, e.g. RH 6.1,
|
|
|
|
will just have to live with this. */
|
|
|
|
rec_hdr.ifindex = 0;
|
|
|
|
rec_hdr.protocol = 0;
|
|
|
|
rec_hdr.pkt_type = 0;
|
2000-07-26 06:04:34 +00:00
|
|
|
hdr_size = sizeof (struct pcaprec_modified_hdr);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_FILE_PCAP_SS990915: /* new magic, extra crap at the end */
|
|
|
|
rec_hdr.ifindex = 0;
|
|
|
|
rec_hdr.protocol = 0;
|
|
|
|
rec_hdr.pkt_type = 0;
|
|
|
|
rec_hdr.cpu1 = 0;
|
|
|
|
rec_hdr.cpu2 = 0;
|
|
|
|
hdr_size = sizeof (struct pcaprec_ss990915_hdr);
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
break;
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
case WTAP_FILE_PCAP_NOKIA: /* old magic, extra crap at the end */
|
|
|
|
rec_hdr.ifindex = 0;
|
|
|
|
rec_hdr.protocol = 0;
|
|
|
|
rec_hdr.pkt_type = 0;
|
|
|
|
rec_hdr.cpu1 = 0;
|
|
|
|
rec_hdr.cpu2 = 0;
|
|
|
|
hdr_size = sizeof (struct pcaprec_nokia_hdr);
|
|
|
|
break;
|
|
|
|
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
default:
|
|
|
|
/* We should never get here - our open routine
|
|
|
|
should only get called for the types above. */
|
2000-07-26 06:04:34 +00:00
|
|
|
g_assert_not_reached();
|
Provide different file types for "modified" and Red Hat 6.1 "libpcap"
files (the former have a different per-packet header, and a different
magic number, from the standard "libpcap"; the latter have the same
per-packet header as "modified" "libpcap" files, but the same magic
number as standard "libpcap" files, sigh).
Support writing "libpcap" captures in all three formats (so that, for
example, people running Ethereal on RH 6.1 can write out captures that
the "tcpdump" that comes with RH 6.1 can read, although that's not the
default format we save in - there's no way to tell whether you're
running on RH 6.1, as far as I know; "uname()" just tells you, on Linux
systems, that the kernel is Linux 2.x, and what "x" is, it doesn't say
what the *rest* of the system is).
Fix the table in "file.c" to use Olivier's code for writing Sniffer
files.
svn path=/trunk/; revision=1288
1999-12-11 00:40:40 +00:00
|
|
|
*err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
nwritten = fwrite(&rec_hdr, 1, hdr_size, wdh->fh);
|
|
|
|
if (nwritten != hdr_size) {
|
2001-08-25 03:18:48 +00:00
|
|
|
if (nwritten == 0 && ferror(wdh->fh))
|
1999-08-18 04:41:20 +00:00
|
|
|
*err = errno;
|
|
|
|
else
|
|
|
|
*err = WTAP_ERR_SHORT_WRITE;
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
1999-08-18 04:41:20 +00:00
|
|
|
}
|
2001-12-04 07:32:05 +00:00
|
|
|
wdh->bytes_dumped += hdr_size;
|
2002-06-06 09:18:28 +00:00
|
|
|
|
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer. (That's not a great name, but I
couldn't think of a better one.)
Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off. That's what at least some versions of the
Windows-based ATM Sniffer appear to have.
Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).
svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
|
|
|
if (wdh->encap == WTAP_ENCAP_ATM_PDUS) {
|
2002-06-06 09:18:28 +00:00
|
|
|
/*
|
|
|
|
* Write the ATM header.
|
|
|
|
*/
|
|
|
|
atm_hdr.flags =
|
2003-01-09 01:55:13 +00:00
|
|
|
(pseudo_header->atm.channel == 0) ? 0x80 : 0x00;
|
2002-06-06 09:18:28 +00:00
|
|
|
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 = pseudo_header->atm.vpi;
|
2002-06-06 18:58:12 +00:00
|
|
|
atm_hdr.vci = phtons(&pseudo_header->atm.vci);
|
2002-06-06 09:18:28 +00:00
|
|
|
nwritten = fwrite(&atm_hdr, 1, sizeof atm_hdr, wdh->fh);
|
|
|
|
if (nwritten != sizeof atm_hdr) {
|
|
|
|
if (nwritten == 0 && ferror(wdh->fh))
|
|
|
|
*err = errno;
|
|
|
|
else
|
|
|
|
*err = WTAP_ERR_SHORT_WRITE;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
wdh->bytes_dumped += sizeof atm_hdr;
|
|
|
|
}
|
|
|
|
|
1999-09-23 05:00:59 +00:00
|
|
|
nwritten = fwrite(pd, 1, phdr->caplen, wdh->fh);
|
1999-08-18 04:41:20 +00:00
|
|
|
if (nwritten != phdr->caplen) {
|
2001-08-25 03:18:48 +00:00
|
|
|
if (nwritten == 0 && ferror(wdh->fh))
|
1999-08-18 04:41:20 +00:00
|
|
|
*err = errno;
|
|
|
|
else
|
|
|
|
*err = WTAP_ERR_SHORT_WRITE;
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
1999-08-18 04:41:20 +00:00
|
|
|
}
|
2001-12-04 07:32:05 +00:00
|
|
|
wdh->bytes_dumped += phdr->caplen;
|
1999-12-04 05:14:39 +00:00
|
|
|
return TRUE;
|
Add to Wiretap the ability to write capture files; for now, it can only
write them in "libpcap" format, but the mechanism can have other formats
added.
When creating the temporary file for a capture, use "create_tempfile()",
to close a security hole opened by the fact that "tempnam()" creates a
temporary file, but doesn't open it, and we open the file with the name
it gives us - somebody could remove the file and plant a link to some
file, and, if as may well be the case when Ethereal is capturing
packets, it's running as "root", that means we write a capture on top of
that file.... (The aforementioned changes to Wiretap let you open a
capture file for writing given an file descriptor, "fdopen()"-style,
which this change requires.)
svn path=/trunk/; revision=509
1999-08-18 04:17:38 +00:00
|
|
|
}
|