1998-11-15 05:29:17 +00:00
|
|
|
/* libpcap.c
|
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
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>
|
2003-12-18 19:07:14 +00:00
|
|
|
#include <string.h>
|
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 <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"
|
2009-04-27 09:28:28 +00:00
|
|
|
#include "pcap-common.h"
|
2010-02-23 03:50:42 +00:00
|
|
|
#include "pcap-encap.h"
|
1998-11-15 05:29:17 +00:00
|
|
|
#include "libpcap.h"
|
|
|
|
|
|
|
|
/* See source to the "libpcap" library for information on the "libpcap"
|
|
|
|
file format. */
|
|
|
|
|
2010-02-24 07:21:17 +00:00
|
|
|
/*
|
|
|
|
* Private per-wtap_t data needed to read a file.
|
|
|
|
*/
|
|
|
|
typedef enum {
|
|
|
|
NOT_SWAPPED,
|
|
|
|
SWAPPED,
|
|
|
|
MAYBE_SWAPPED
|
|
|
|
} swapped_type_t;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
gboolean byte_swapped;
|
|
|
|
swapped_type_t lengths_swapped;
|
|
|
|
guint16 version_major;
|
|
|
|
guint16 version_minor;
|
|
|
|
} libpcap_t;
|
|
|
|
|
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);
|
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info,
|
2006-11-05 22:46:44 +00:00
|
|
|
gint64 *data_offset);
|
|
|
|
static gboolean libpcap_seek_read(wtap *wth, gint64 seek_off,
|
2011-09-01 09:43:10 +00:00
|
|
|
union wtap_pseudo_header *pseudo_header, guint8 *pd, int length,
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
int *err, gchar **err_info);
|
|
|
|
static int libpcap_read_header(wtap *wth, int *err, gchar **err_info,
|
|
|
|
struct pcaprec_ss990915_hdr *hdr);
|
1999-11-06 10:31:47 +00:00
|
|
|
static void adjust_header(wtap *wth, struct pcaprec_hdr *hdr);
|
2011-09-01 09:43:10 +00:00
|
|
|
static gboolean libpcap_read_rec_data(FILE_T fh, guint8 *pd, int length,
|
2011-04-21 09:41:52 +00:00
|
|
|
int *err, gchar **err_info);
|
1999-12-04 05:14:39 +00:00
|
|
|
static gboolean libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
|
2011-09-01 09:43:10 +00:00
|
|
|
const union wtap_pseudo_header *pseudo_header, const guint8 *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
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
int libpcap_open(wtap *wth, int *err, gchar **err_info)
|
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;
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap_t *libpcap;
|
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;
|
2011-04-06 06:51:19 +00:00
|
|
|
bytes_read = file_read(&magic, sizeof magic, wth->fh);
|
1998-11-15 05:29:17 +00:00
|
|
|
if (bytes_read != sizeof magic) {
|
2011-04-21 09:41:52 +00:00
|
|
|
*err = file_error(wth->fh, err_info);
|
1999-10-05 07:06:08 +00:00
|
|
|
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;
|
2005-08-25 21:29:54 +00:00
|
|
|
wth->tsprecision = WTAP_FILE_TSPREC_USEC;
|
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;
|
2005-08-25 21:29:54 +00:00
|
|
|
wth->tsprecision = WTAP_FILE_TSPREC_USEC;
|
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;
|
2005-08-25 21:29:54 +00:00
|
|
|
wth->tsprecision = WTAP_FILE_TSPREC_USEC;
|
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;
|
2005-08-25 21:29:54 +00:00
|
|
|
wth->tsprecision = WTAP_FILE_TSPREC_USEC;
|
1999-11-06 08:42:01 +00:00
|
|
|
break;
|
|
|
|
|
2005-08-30 09:43:47 +00:00
|
|
|
case PCAP_NSEC_MAGIC:
|
2010-01-27 00:35:32 +00:00
|
|
|
/* Host that wrote it has our byte order, and was writing
|
|
|
|
the file in a format similar to standard libpcap
|
|
|
|
except that the time stamps have nanosecond resolution. */
|
2005-08-30 09:43:47 +00:00
|
|
|
byte_swapped = FALSE;
|
|
|
|
modified = FALSE;
|
|
|
|
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PCAP_SWAPPED_NSEC_MAGIC:
|
|
|
|
/* Host that wrote it out has a byte order opposite to
|
2010-01-27 00:35:32 +00:00
|
|
|
ours, and was writing the file in a format similar to
|
|
|
|
standard libpcap except that the time stamps have
|
|
|
|
nanosecond resolution. */
|
2005-08-30 09:43:47 +00:00
|
|
|
byte_swapped = TRUE;
|
|
|
|
modified = FALSE;
|
|
|
|
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
|
|
|
|
break;
|
|
|
|
|
1999-11-06 08:42:01 +00:00
|
|
|
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;
|
2011-04-06 06:51:19 +00:00
|
|
|
bytes_read = file_read(&hdr, sizeof hdr, wth->fh);
|
1998-11-15 05:29:17 +00:00
|
|
|
if (bytes_read != sizeof hdr) {
|
2011-04-21 09:41:52 +00:00
|
|
|
*err = file_error(wth->fh, err_info);
|
1999-10-05 07:06:08 +00:00
|
|
|
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. */
|
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_UNSUPPORTED;
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
*err_info = g_strdup_printf("pcap: major version %u unsupported",
|
|
|
|
hdr.version_major);
|
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
|
|
|
}
|
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
|
2006-05-28 15:56:15 +00:00
|
|
|
* to Wireshark.
|
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
|
|
|
}
|
|
|
|
}
|
2004-02-19 08:02:06 +00:00
|
|
|
|
2000-08-25 06:25:21 +00:00
|
|
|
file_encap = wtap_pcap_encap_to_wtap_encap(hdr.network);
|
2009-09-25 21:55:39 +00:00
|
|
|
if (file_encap == WTAP_ENCAP_UNKNOWN) {
|
2000-02-19 08:00:08 +00:00
|
|
|
*err = WTAP_ERR_UNSUPPORTED_ENCAP;
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
*err_info = g_strdup_printf("pcap: network type %u unknown or unsupported",
|
|
|
|
hdr.network);
|
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 */
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap = (libpcap_t *)g_malloc(sizeof(libpcap_t));;
|
|
|
|
libpcap->byte_swapped = byte_swapped;
|
|
|
|
libpcap->version_major = hdr.version_major;
|
|
|
|
libpcap->version_minor = hdr.version_minor;
|
2010-02-26 07:59:54 +00:00
|
|
|
wth->priv = (void *)libpcap;
|
1998-11-15 05:29:17 +00:00
|
|
|
wth->subtype_read = libpcap_read;
|
2002-06-06 09:18:28 +00:00
|
|
|
wth->subtype_seek_read = libpcap_seek_read;
|
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)
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap->lengths_swapped = SWAPPED;
|
2003-10-24 23:55:34 +00:00
|
|
|
else if (hdr.version_minor == 3)
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap->lengths_swapped = MAYBE_SWAPPED;
|
2003-10-24 23:55:34 +00:00
|
|
|
else
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap->lengths_swapped = NOT_SWAPPED;
|
2003-10-24 23:55:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 543:
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap->lengths_swapped = SWAPPED;
|
2003-10-24 23:55:34 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap->lengths_swapped = NOT_SWAPPED;
|
2003-10-24 23:55:34 +00:00
|
|
|
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) {
|
|
|
|
/*
|
2007-01-08 02:55:41 +00:00
|
|
|
* Yes. Skip all the tests for other mutant formats,
|
|
|
|
* and set the precision to nanosecond precision.
|
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
|
|
|
*/
|
|
|
|
wth->file_type = WTAP_FILE_PCAP_AIX;
|
2007-01-08 02:55:41 +00:00
|
|
|
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
|
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
|
|
|
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.,
|
2006-05-28 15:56:15 +00:00
|
|
|
* any normal version of tcpdump, and Wireshark if we don't
|
2000-07-26 06:04:34 +00:00
|
|
|
* 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.
|
|
|
|
*/
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
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) {
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
2002-03-04 00:25:35 +00:00
|
|
|
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) {
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
2002-03-04 00:25:35 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Well, we have the standard magic number.
|
|
|
|
*
|
|
|
|
* Try the standard format first.
|
|
|
|
*/
|
2005-08-30 09:43:47 +00:00
|
|
|
if(wth->tsprecision == WTAP_FILE_TSPREC_NSEC) {
|
|
|
|
wth->file_type = WTAP_FILE_PCAP_NSEC;
|
|
|
|
} else {
|
|
|
|
wth->file_type = WTAP_FILE_PCAP;
|
|
|
|
}
|
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.
|
|
|
|
*/
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
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) {
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
2002-03-04 00:25:35 +00:00
|
|
|
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) {
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
2002-03-04 00:25:35 +00:00
|
|
|
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.
|
|
|
|
*/
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
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) {
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
2002-03-04 00:25:35 +00:00
|
|
|
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) {
|
2010-02-26 07:59:54 +00:00
|
|
|
g_free(wth->priv);
|
2002-03-04 00:25:35 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2000-07-26 06:04:34 +00:00
|
|
|
}
|
1999-11-06 10:31:47 +00:00
|
|
|
|
2009-09-25 21:55:39 +00:00
|
|
|
/*
|
|
|
|
* We treat a DLT_ value of 13 specially - it appears that in
|
|
|
|
* Nokia libpcap format, it's some form of ATM with what I
|
|
|
|
* suspect is a pseudo-header (even though Nokia's IPSO is
|
|
|
|
* based on FreeBSD, which #defines DLT_SLIP_BSDOS as 13).
|
|
|
|
*
|
|
|
|
* If this is a Nokia capture, treat 13 as WTAP_ENCAP_ATM_PDUS,
|
|
|
|
* rather than as what we normally treat it.
|
|
|
|
*/
|
|
|
|
if (wth->file_type == WTAP_FILE_PCAP_NOKIA && hdr.network == 13)
|
|
|
|
wth->file_encap = WTAP_ENCAP_ATM_PDUS;
|
2004-02-19 08:02:06 +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;
|
2008-11-13 00:36:52 +00:00
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Attempt to read the first record's header.
|
|
|
|
*/
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
if (libpcap_read_header(wth, err, NULL, &first_rec_hdr) == -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;
|
|
|
|
}
|
|
|
|
|
2011-12-13 09:53:50 +00:00
|
|
|
if (*err == WTAP_ERR_BAD_FILE) {
|
2000-09-15 07:52:43 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
if (libpcap_read_header(wth, err, NULL, &second_rec_hdr) == -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;
|
|
|
|
}
|
|
|
|
|
2011-12-13 09:53:50 +00:00
|
|
|
if (*err == WTAP_ERR_BAD_FILE) {
|
2000-09-15 07:52:43 +00:00
|
|
|
/*
|
|
|
|
* 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 */
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info,
|
2006-11-05 22:46:44 +00:00
|
|
|
gint64 *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;
|
2009-04-27 19:39:06 +00:00
|
|
|
guint orig_size;
|
2000-09-15 07:52:43 +00:00
|
|
|
int bytes_read;
|
2011-09-01 09:43:10 +00:00
|
|
|
guint8 fddi_padding[3];
|
2009-04-27 19:39:06 +00:00
|
|
|
int phdr_len;
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap_t *libpcap;
|
2000-09-15 07:52:43 +00:00
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
bytes_read = libpcap_read_header(wth, err, err_info, &hdr);
|
2000-09-15 07:52:43 +00:00
|
|
|
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.
|
|
|
|
*/
|
2011-04-21 09:41:52 +00:00
|
|
|
if (!libpcap_read_rec_data(wth->fh, fddi_padding, 3, err,
|
|
|
|
err_info))
|
2002-11-16 20:20:30 +00:00
|
|
|
return FALSE; /* Read error */
|
|
|
|
}
|
|
|
|
|
2000-09-15 07:52:43 +00:00
|
|
|
*data_offset = wth->data_offset;
|
|
|
|
|
2010-02-26 07:59:54 +00:00
|
|
|
libpcap = (libpcap_t *)wth->priv;
|
2010-02-24 07:21:17 +00:00
|
|
|
phdr_len = pcap_process_pseudo_header(wth->fh, wth->file_type,
|
2010-04-21 20:51:22 +00:00
|
|
|
wth->file_encap, packet_size, TRUE, &wth->phdr,
|
|
|
|
&wth->pseudo_header, err, err_info);
|
2009-04-27 19:39:06 +00:00
|
|
|
if (phdr_len < 0)
|
|
|
|
return FALSE; /* error */
|
|
|
|
|
2002-06-06 09:18:28 +00:00
|
|
|
/*
|
2009-04-27 19:39:06 +00:00
|
|
|
* Don't count any pseudo-header as part of the packet.
|
2002-06-06 09:18:28 +00:00
|
|
|
*/
|
2009-04-27 19:39:06 +00:00
|
|
|
orig_size -= phdr_len;
|
|
|
|
packet_size -= phdr_len;
|
|
|
|
wth->data_offset += phdr_len;
|
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),
|
2011-04-21 09:41:52 +00:00
|
|
|
packet_size, err, err_info))
|
2002-06-06 09:18:28 +00:00
|
|
|
return FALSE; /* Read error */
|
2000-09-15 07:52:43 +00:00
|
|
|
wth->data_offset += packet_size;
|
|
|
|
|
2012-02-25 23:24:34 +00:00
|
|
|
wth->phdr.presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN;
|
|
|
|
|
2007-10-08 11:41:21 +00:00
|
|
|
/* Update the Timestamp, if not already done */
|
|
|
|
if (wth->file_encap != WTAP_ENCAP_ERF) {
|
|
|
|
wth->phdr.ts.secs = hdr.hdr.ts_sec;
|
|
|
|
if(wth->tsprecision == WTAP_FILE_TSPREC_NSEC) {
|
|
|
|
wth->phdr.ts.nsecs = hdr.hdr.ts_usec;
|
|
|
|
} else {
|
|
|
|
wth->phdr.ts.nsecs = hdr.hdr.ts_usec * 1000;
|
|
|
|
}
|
2005-08-30 09:43:47 +00:00
|
|
|
}
|
2000-09-15 07:52:43 +00:00
|
|
|
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
|
|
|
|
2011-09-01 19:58:25 +00:00
|
|
|
pcap_read_post_process(wth->file_type, wth->file_encap,
|
|
|
|
&wth->pseudo_header, buffer_start_ptr(wth->frame_buffer),
|
|
|
|
wth->phdr.caplen, libpcap->byte_swapped, -1);
|
2000-09-15 07:52:43 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2002-06-06 09:18:28 +00:00
|
|
|
static gboolean
|
2006-11-05 22:46:44 +00:00
|
|
|
libpcap_seek_read(wtap *wth, gint64 seek_off,
|
2011-09-01 09:43:10 +00:00
|
|
|
union wtap_pseudo_header *pseudo_header, guint8 *pd, int length,
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
int *err, gchar **err_info)
|
2002-06-06 09:18:28 +00:00
|
|
|
{
|
2009-04-27 19:39:06 +00:00
|
|
|
int phdr_len;
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap_t *libpcap;
|
2009-04-27 19:39:06 +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;
|
|
|
|
|
2010-02-26 07:59:54 +00:00
|
|
|
libpcap = (libpcap_t *)wth->priv;
|
2010-02-24 07:21:17 +00:00
|
|
|
phdr_len = pcap_process_pseudo_header(wth->random_fh, wth->file_type,
|
2010-04-21 20:51:22 +00:00
|
|
|
wth->file_encap, length, FALSE, NULL, pseudo_header, err, err_info);
|
2009-04-27 19:39:06 +00:00
|
|
|
if (phdr_len < 0)
|
|
|
|
return FALSE; /* error */
|
2002-06-06 09:18:28 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the packet data.
|
|
|
|
*/
|
2011-04-21 09:41:52 +00:00
|
|
|
if (!libpcap_read_rec_data(wth->random_fh, pd, length, err, err_info))
|
2002-08-07 06:59:49 +00:00
|
|
|
return FALSE; /* failed */
|
|
|
|
|
2011-09-01 19:58:25 +00:00
|
|
|
pcap_read_post_process(wth->file_type, wth->file_encap,
|
|
|
|
pseudo_header, pd, length, libpcap->byte_swapped, -1);
|
2002-08-07 06:59:49 +00:00
|
|
|
return TRUE;
|
2002-06-06 09:18:28 +00:00
|
|
|
}
|
|
|
|
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
/* Read the header of the next packet.
|
2000-09-15 07:52:43 +00:00
|
|
|
|
|
|
|
Return -1 on an error, or the number of bytes of header read on success. */
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
static int libpcap_read_header(wtap *wth, int *err, gchar **err_info,
|
|
|
|
struct pcaprec_ss990915_hdr *hdr)
|
2000-09-15 07:52:43 +00:00
|
|
|
{
|
|
|
|
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:
|
2005-08-30 09:43:47 +00:00
|
|
|
case WTAP_FILE_PCAP_NSEC:
|
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;
|
|
|
|
}
|
2011-04-06 06:51:19 +00:00
|
|
|
bytes_read = file_read(hdr, bytes_to_read, wth->fh);
|
1999-11-06 08:42:01 +00:00
|
|
|
if (bytes_read != bytes_to_read) {
|
2011-04-21 09:41:52 +00:00
|
|
|
*err = file_error(wth->fh, err_info);
|
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
|
|
|
*/
|
2011-12-13 09:53:50 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
if (err_info != NULL) {
|
|
|
|
*err_info = g_strdup_printf("pcap: File has %u-byte packet, bigger than maximum of %u",
|
2000-09-15 07:52:43 +00:00
|
|
|
hdr->hdr.incl_len, WTAP_MAX_PACKET_SIZE);
|
|
|
|
}
|
|
|
|
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.
|
|
|
|
*/
|
2011-12-13 09:53:50 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
|
|
|
if (err_info != NULL) {
|
|
|
|
*err_info = g_strdup_printf("pcap: File has %u-byte packet, bigger than maximum of %u",
|
2000-09-15 07:52:43 +00:00
|
|
|
hdr->hdr.orig_len, WTAP_MAX_PACKET_SIZE);
|
|
|
|
}
|
|
|
|
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;
|
2010-02-24 07:21:17 +00:00
|
|
|
libpcap_t *libpcap;
|
2003-10-24 23:55:34 +00:00
|
|
|
|
2010-02-26 07:59:54 +00:00
|
|
|
libpcap = (libpcap_t *)wth->priv;
|
2010-02-24 07:21:17 +00:00
|
|
|
if (libpcap->byte_swapped) {
|
1999-11-06 10:31:47 +00:00
|
|
|
/* 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);
|
|
|
|
}
|
|
|
|
|
2003-10-24 23:55:34 +00:00
|
|
|
/* Swap the "incl_len" and "orig_len" fields, if necessary. */
|
2010-02-24 07:21:17 +00:00
|
|
|
switch (libpcap->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-06 09:18:28 +00:00
|
|
|
static gboolean
|
2011-09-01 09:43:10 +00:00
|
|
|
libpcap_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err,
|
2011-04-21 09:41:52 +00:00
|
|
|
gchar **err_info)
|
2002-06-06 09:18:28 +00:00
|
|
|
{
|
|
|
|
int bytes_read;
|
|
|
|
|
|
|
|
errno = WTAP_ERR_CANT_READ;
|
2011-04-06 06:51:19 +00:00
|
|
|
bytes_read = file_read(pd, length, fh);
|
2002-06-06 09:18:28 +00:00
|
|
|
|
|
|
|
if (bytes_read != length) {
|
2011-04-21 09:41:52 +00:00
|
|
|
*err = file_error(fh, err_info);
|
2002-06-06 09:18:28 +00:00
|
|
|
if (*err == 0)
|
|
|
|
*err = WTAP_ERR_SHORT_READ;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
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 */
|
2011-04-12 00:44:44 +00:00
|
|
|
gboolean libpcap_dump_open(wtap_dumper *wdh, 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;
|
|
|
|
|
|
|
|
/* 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;
|
2005-08-30 09:43:47 +00:00
|
|
|
wdh->tsprecision = WTAP_FILE_TSPREC_USEC;
|
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_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;
|
2005-08-30 09:43:47 +00:00
|
|
|
wdh->tsprecision = WTAP_FILE_TSPREC_USEC;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case WTAP_FILE_PCAP_NSEC: /* same as WTAP_FILE_PCAP, but nsec precision */
|
|
|
|
magic = PCAP_NSEC_MAGIC;
|
|
|
|
wdh->tsprecision = WTAP_FILE_TSPREC_NSEC;
|
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;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2010-06-06 19:14:32 +00:00
|
|
|
if (!wtap_dump_file_write(wdh, &magic, sizeof magic, err))
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
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);
|
2010-06-06 19:14:32 +00:00
|
|
|
if (!wtap_dump_file_write(wdh, &file_hdr, sizeof file_hdr, err))
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
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,
|
2009-04-27 19:39:06 +00:00
|
|
|
const union wtap_pseudo_header *pseudo_header,
|
2011-09-01 09:43:10 +00:00
|
|
|
const guint8 *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;
|
2009-04-27 19:39:06 +00:00
|
|
|
int phdrsize;
|
2008-08-12 04:44:35 +00:00
|
|
|
|
2009-04-27 19:39:06 +00:00
|
|
|
phdrsize = pcap_get_phdr_size(wdh->encap, pseudo_header);
|
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
|
|
|
|
2007-03-21 01:32:50 +00:00
|
|
|
rec_hdr.hdr.ts_sec = (guint32) phdr->ts.secs;
|
2005-08-30 09:43:47 +00:00
|
|
|
if(wdh->tsprecision == WTAP_FILE_TSPREC_NSEC) {
|
|
|
|
rec_hdr.hdr.ts_usec = phdr->ts.nsecs;
|
|
|
|
} else {
|
|
|
|
rec_hdr.hdr.ts_usec = phdr->ts.nsecs / 1000;
|
|
|
|
}
|
2009-04-27 19:39:06 +00:00
|
|
|
rec_hdr.hdr.incl_len = phdr->caplen + phdrsize;
|
|
|
|
rec_hdr.hdr.orig_len = phdr->len + phdrsize;
|
2011-06-09 18:31:39 +00:00
|
|
|
|
|
|
|
if (rec_hdr.hdr.incl_len > WTAP_MAX_PACKET_SIZE || rec_hdr.hdr.orig_len > WTAP_MAX_PACKET_SIZE) {
|
2011-12-13 09:53:50 +00:00
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
2011-06-09 18:31:39 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
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:
|
2005-08-30 09:43:47 +00:00
|
|
|
case WTAP_FILE_PCAP_NSEC:
|
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;
|
|
|
|
}
|
|
|
|
|
2010-06-06 19:14:32 +00:00
|
|
|
if (!wtap_dump_file_write(wdh, &rec_hdr, hdr_size, err))
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
2001-12-04 07:32:05 +00:00
|
|
|
wdh->bytes_dumped += hdr_size;
|
2002-06-06 09:18:28 +00:00
|
|
|
|
2009-06-27 12:41:06 +00:00
|
|
|
if (!pcap_write_phdr(wdh, wdh->encap, pseudo_header, err))
|
2009-04-27 19:39:06 +00:00
|
|
|
return FALSE;
|
2002-06-06 09:18:28 +00:00
|
|
|
|
2010-06-06 19:14:32 +00:00
|
|
|
if (!wtap_dump_file_write(wdh, pd, phdr->caplen, err))
|
1999-12-04 05:14:39 +00:00
|
|
|
return FALSE;
|
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
|
|
|
}
|