From Thierry Martin: support for reading files from Accellent 5Views LAN
agents. svn path=/trunk/; revision=8093
This commit is contained in:
Guy Harris
parent
27edcee365
commit
2240c0668d
4
AUTHORS
4
AUTHORS
|
|
@ -1760,6 +1760,10 @@ Xuan Zhang <xz [AT] aemail4u.com> {
|
|||
eDonkey support
|
||||
}
|
||||
|
||||
Thierry Martin <thierry.martin [AT] accellent-group.com> {
|
||||
Support for reading files from Accellent 5Views LAN agents
|
||||
}
|
||||
|
||||
And assorted fixes and enhancements by the people listed above and by:
|
||||
|
||||
Pavel Roskin <proski [AT] gnu.org>
|
||||
|
|
|
|||
3
README
3
README
|
|
@ -1,4 +1,4 @@
|
|||
$Id: README,v 1.59 2002/07/31 19:27:39 guy Exp $
|
||||
$Id: README,v 1.60 2003/07/29 19:41:59 guy Exp $
|
||||
|
||||
General Information
|
||||
------- -----------
|
||||
|
|
@ -108,6 +108,7 @@ VMS's TCPIPtrace utility
|
|||
DBS Etherwatch for VMS
|
||||
Traffic captures from Visual Networks' Visual UpTime
|
||||
CoSine L2 debug output
|
||||
Output from Accellent's 5Views LAN agents
|
||||
|
||||
In addition, it can read gzipped versions of any of these files
|
||||
automatically, if you have the zlib library available when compiling
|
||||
|
|
|
|||
|
|
@ -34,14 +34,15 @@ B<nettl>, the dump output from B<Toshiba's> ISDN routers, the output
|
|||
from B<i4btrace> from the ISDN4BSD project, the output in B<IPLog>
|
||||
format from the Cisco Secure Intrusion Detection System, B<pppd logs>
|
||||
(pppdump format), the output from VMS's
|
||||
B<TCPIPtrace>/B<TCPtrace>B<UCX$TRACE> utilities, the text output from
|
||||
B<TCPIPtrace>/B<TCPtrace>/B<UCX$TRACE> utilities, the text output from
|
||||
the B<DBS Etherwatch> VMS utility, traffic capture files from Visual
|
||||
Networks' Visual UpTime and the output from B<CoSine> L2 debug. There
|
||||
is no need to tell B<Editcap> what type of file you are reading; it will
|
||||
determine the file type by itself. B<Editcap> is also capable of
|
||||
reading any of these file formats if they are compressed using gzip.
|
||||
B<Editcap> recognizes this directly from the file; the '.gz' extension
|
||||
is not required for this purpose.
|
||||
Networks' Visual UpTime, the output from B<CoSine> L2 debug, and the
|
||||
output from Accellent's 5Views LAN agents. There is no need to tell
|
||||
B<Editcap> what type of file you are reading; it will determine the file
|
||||
type by itself. B<Editcap> is also capable of reading any of these file
|
||||
formats if they are compressed using gzip. B<Editcap> recognizes this
|
||||
directly from the file; the '.gz' extension is not required for this
|
||||
purpose.
|
||||
|
||||
By default, it writes the capture file in B<libpcap> format, and writes
|
||||
all of the packets in the capture file to the output file. The B<-F>
|
||||
|
|
|
|||
|
|
@ -52,12 +52,13 @@ B<IPLog> format from the Cisco Secure Intrusion Detection System, B<pppd
|
|||
logs> (pppdump format), the output from VMS's
|
||||
B<TCPIPtrace>/B<TCPtrace>/B<UCX$TRACE> utilities, the text output from
|
||||
the B<DBS Etherwatch> VMS utility, traffic capture files from Visual
|
||||
Networks' Visual UpTime, and the output from B<CoSine> L2 debug. There
|
||||
is no need to tell B<Ethereal> what type of file you are reading; it
|
||||
will determine the file type by itself. B<Ethereal> is also capable of
|
||||
reading any of these file formats if they are compressed using gzip.
|
||||
B<Ethereal> recognizes this directly from the file; the '.gz' extension
|
||||
is not required for this purpose.
|
||||
Networks' Visual UpTime, the output from B<CoSine> L2 debug, and the
|
||||
output from Accellent's 5Views LAN agents. There is no need to tell
|
||||
B<Ethereal> what type of file you are reading; it will determine the
|
||||
file type by itself. B<Ethereal> is also capable of reading any of
|
||||
these file formats if they are compressed using gzip. B<Ethereal>
|
||||
recognizes this directly from the file; the '.gz' extension is not
|
||||
required for this purpose.
|
||||
|
||||
Like other protocol analyzers, B<Ethereal>'s main window shows 3 views
|
||||
of a packet. It shows a summary line, briefly describing what the
|
||||
|
|
@ -1853,6 +1854,7 @@ B<http://www.ethereal.com>.
|
|||
Jeff Rizzo <riz [AT] boogers.sf.ca.us>
|
||||
Christoph Wiest <ch.wiest [AT] tesionmail.de>
|
||||
Xuan Zhang <xz [AT] aemail4u.com>
|
||||
Thierry Martin <thierry.martin [AT] accellent-group.com>
|
||||
Pavel Roskin <proski [AT] gnu.org>
|
||||
Georgi Guninski <guninski [AT] guninski.com>
|
||||
Jason Copenhaver <jcopenha [AT] typedef.org>
|
||||
|
|
|
|||
|
|
@ -33,12 +33,13 @@ format from the Cisco Secure Intrusion Detection System, B<pppd logs>
|
|||
(pppdump format), the output from VMS's
|
||||
B<TCPIPtrace>/B<TCPtrace>/B<UCX$TRACE> utilities, the text output from
|
||||
the B<DBS Etherwatch> VMS utility, traffic capture files from Visual
|
||||
Networks' Visual UpTime, and the output from B<CoSine> L2 debug. There
|
||||
is no need to tell B<Mergecap> what type of file you are reading; it
|
||||
will determine the file type by itself. B<Mergecap> is also capable of
|
||||
reading any of these file formats if they are compressed using gzip.
|
||||
B<Mergecap> recognizes this directly from the file; the '.gz' extension
|
||||
is not required for this purpose.
|
||||
Networks' Visual UpTime, the output from B<CoSine> L2 debug, and the
|
||||
output from Accellent's 5Views LAN agents. There is no need to tell
|
||||
B<Mergecap> what type of file you are reading; it will determine the
|
||||
file type by itself. B<Mergecap> is also capable of reading any of
|
||||
these file formats if they are compressed using gzip. B<Mergecap>
|
||||
recognizes this directly from the file; the '.gz' extension is not
|
||||
required for this purpose.
|
||||
|
||||
By default, it writes the capture file in B<libpcap> format, and writes
|
||||
all of the packets in both input capture files to the output file. The
|
||||
|
|
|
|||
|
|
@ -53,12 +53,13 @@ ISDN4BSD project, the output in B<IPLog> format from the Cisco Secure
|
|||
Intrusion Detection System, B<pppd logs> (pppdump format), the output
|
||||
from VMS's B<TCPIPtrace>/B<TCPtrace>/B<UCX$TRACE> utilities, the text
|
||||
output from the B<DBS Etherwatch> VMS utility, traffic capture files
|
||||
from Visual Networks' Visual UpTime, and the output from B<CoSine> L2
|
||||
debug. There is no need to tell B<Tethereal> what type of file you are
|
||||
reading; it will determine the file type by itself. B<Tethereal> is
|
||||
also capable of reading any of these file formats if they are compressed
|
||||
using gzip. B<Tethereal> recognizes this directly from the file; the
|
||||
'.gz' extension is not required for this purpose.
|
||||
from Visual Networks' Visual UpTime, the output from B<CoSine> L2 debug,
|
||||
and the output from Accellent's 5Views LAN agents. There is no need to
|
||||
tell B<Tethereal> what type of file you are reading; it will determine
|
||||
the file type by itself. B<Tethereal> is also capable of reading any of
|
||||
these file formats if they are compressed using gzip. B<Tethereal>
|
||||
recognizes this directly from the file; the '.gz' extension is not
|
||||
required for this purpose.
|
||||
|
||||
If the B<-w> flag is not specified, B<Tethereal> prints a decoded form
|
||||
of the packets it captures or reads; otherwise, it writes those packets
|
||||
|
|
|
|||
|
|
@ -0,0 +1,469 @@
|
|||
/* 5views.c
|
||||
*
|
||||
* $Id: 5views.c,v 1.1 2003/07/29 19:42:00 guy Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "wtap-int.h"
|
||||
#include "file_wrappers.h"
|
||||
#include "buffer.h"
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
unsigned int Signature;
|
||||
int Size; /* Total size of Header in bytes (included Signature) */
|
||||
int Version; /* Identify version and so the format of this record */
|
||||
int DataSize; /* Total size of data included in the Info Record (except the header size) */
|
||||
int FileType; /* Type of the file */
|
||||
int Reserved[3]; /* Reserved for future use */
|
||||
}t_5VW_Info_Header;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
unsigned int Type; /* Id of the attribute */
|
||||
unsigned short Size; /* Size of the data part of the attribute (not including header size) */
|
||||
unsigned short Nb; /* Number of elements */
|
||||
}t_5VW_Attributes_Header;
|
||||
|
||||
|
||||
#define CST_5VW_INFO_HEADER_KEY 0xAAAAAAAA /* signature */
|
||||
|
||||
#define CST_5VW_INFO_RECORD_VERSION 0x00010000 /* version */
|
||||
|
||||
#define CST_5VW_DECALE_FILE_TYPE 24
|
||||
#define CST_5VW_SECTION_CAPTURES 0x08
|
||||
#define CST_5VW_CAPTURES_FILE (CST_5VW_SECTION_CAPTURES << CST_5VW_DECALE_FILE_TYPE) /* 0x08000000 */
|
||||
#define CST_5VW_FLAT_FILE 0x10000000
|
||||
#define CST_5VW_CAPTURE_FILEID (CST_5VW_FLAT_FILE | CST_5VW_CAPTURES_FILE)
|
||||
#define CST_5VW_FAMILY_CAP_ETH 0x01
|
||||
#define CST_5VW_FAMILY_CAP_WAN 0x02
|
||||
#define CST_5VW_DECALE_FILE_FAMILY 12
|
||||
#define CST_5VW_CAP_ETH (CST_5VW_FAMILY_CAP_ETH << CST_5VW_DECALE_FILE_FAMILY) /* 0x00001000 */
|
||||
#define CST_5VW_CAP_WAN (CST_5VW_FAMILY_CAP_WAN << CST_5VW_DECALE_FILE_FAMILY) /* 0x00002000 */
|
||||
#define CST_5VW_CAPTURE_ETH_FILEID (CST_5VW_CAPTURE_FILEID | CST_5VW_CAP_ETH)
|
||||
#define CST_5VW_CAPTURE_WAN_FILEID (CST_5VW_CAPTURE_FILEID | CST_5VW_CAP_WAN)
|
||||
|
||||
#define CST_5VW_CAPTURE_FILE_TYPE_MASK 0xFF000000
|
||||
|
||||
#define CST_5VW_FRAME_RECORD 0x00000000
|
||||
#define CST_5VW_RECORDS_HEADER_KEY 0x3333EEEE
|
||||
|
||||
typedef struct
|
||||
{
|
||||
t_5VW_Info_Header Info_Header;
|
||||
t_5VW_Attributes_Header HeaderDateCreation;
|
||||
unsigned long Time;
|
||||
t_5VW_Attributes_Header HeaderNbFrames;
|
||||
unsigned long TramesStockeesInFile;
|
||||
}t_5VW_Capture_Header;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
unsigned int Key; /* 0x3333EEEE */
|
||||
unsigned short HeaderSize; /* Actual size of this header in bytes (32) */
|
||||
unsigned short HeaderType; /* Exact type of this header (0x4000) */
|
||||
unsigned int RecType; /* Type of record */
|
||||
unsigned int RecSubType; /* Subtype of record */
|
||||
unsigned int RecSize; /* Size of one record */
|
||||
unsigned int RecNb; /* Number of records */
|
||||
unsigned long Utc;
|
||||
unsigned long NanoSecondes;
|
||||
unsigned int RecInfo; /* Info about Alarm / Event / Frame captured */
|
||||
}t_5VW_TimeStamped_Header;
|
||||
|
||||
|
||||
#define CST_5VW_IA_CAP_INF_NB_TRAMES_STOCKEES 0x20000000
|
||||
#define CST_5VW_IA_DATE_CREATION 0x80000007 /* Struct t_Attrib_Date_Create */
|
||||
#define CST_5VW_TIMESTAMPED_HEADER_TYPE 0x4000
|
||||
#define CST_5VW_CAPTURES_RECORD (CST_5VW_SECTION_CAPTURES << 28) /* 0x80000000 */
|
||||
#define CST_5VW_SYSTEM_RECORD 0x00000000
|
||||
|
||||
static gboolean _5views_read(wtap *wth, int *err, long *data_offset);
|
||||
static gboolean _5views_read_rec_data(FILE_T fh, guchar *pd, int length,int *err);
|
||||
static int _5views_read_header(wtap *wth, FILE_T fh, t_5VW_TimeStamped_Header *hdr, int *err);
|
||||
static gboolean _5views_seek_read(wtap *wth, long seek_off, union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err);
|
||||
|
||||
|
||||
static gboolean _5views_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
|
||||
const union wtap_pseudo_header *pseudo_header, const guchar *pd, int *err);
|
||||
static gboolean _5views_dump_close(wtap_dumper *wdh, int *err);
|
||||
|
||||
|
||||
int _5views_open(wtap *wth, int *err)
|
||||
{
|
||||
int bytes_read;
|
||||
t_5VW_Capture_Header Capture_Header;
|
||||
int encap = WTAP_ENCAP_UNKNOWN;
|
||||
|
||||
errno = WTAP_ERR_CANT_READ;
|
||||
bytes_read = file_read(&Capture_Header.Info_Header, 1, sizeof(t_5VW_Info_Header), wth->fh);
|
||||
if (bytes_read != sizeof(t_5VW_Info_Header)) {
|
||||
*err = file_error(wth->fh);
|
||||
if (*err != 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
wth->data_offset+=bytes_read;
|
||||
|
||||
/* Check whether that's 5Views format or not */
|
||||
if(Capture_Header.Info_Header.Signature != CST_5VW_INFO_HEADER_KEY)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Check Version */
|
||||
switch (Capture_Header.Info_Header.Version) {
|
||||
|
||||
case CST_5VW_INFO_RECORD_VERSION:
|
||||
break;
|
||||
|
||||
default:
|
||||
g_message("5views: header version %u unsupported", Capture_Header.Info_Header.Version);
|
||||
*err = WTAP_ERR_UNSUPPORTED;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Check File Type */
|
||||
if((Capture_Header.Info_Header.FileType & CST_5VW_CAPTURE_FILE_TYPE_MASK) != CST_5VW_CAPTURE_FILEID)
|
||||
{
|
||||
g_message("5views: file is not a capture file (filetype is %u)", Capture_Header.Info_Header.Version);
|
||||
*err = WTAP_ERR_UNSUPPORTED;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Check possible Encap */
|
||||
switch (Capture_Header.Info_Header.FileType) {
|
||||
case CST_5VW_CAPTURE_ETH_FILEID:
|
||||
encap = WTAP_ENCAP_ETHERNET;
|
||||
break;
|
||||
/* case CST_5VW_CAPTURE_WAN_FILEID:
|
||||
break;
|
||||
*/
|
||||
default:
|
||||
g_message("5views: network type %u unknown or unsupported",
|
||||
Capture_Header.Info_Header.FileType);
|
||||
*err = WTAP_ERR_UNSUPPORTED_ENCAP;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* read the remaining header information */
|
||||
bytes_read = file_read(&Capture_Header.HeaderDateCreation, 1, sizeof (t_5VW_Capture_Header) - sizeof(t_5VW_Info_Header), wth->fh);
|
||||
if (bytes_read != sizeof (t_5VW_Capture_Header)- sizeof(t_5VW_Info_Header) ) {
|
||||
*err = file_error(wth->fh);
|
||||
if (*err != 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
wth->data_offset+=bytes_read;
|
||||
|
||||
/* This is a 5views capture file */
|
||||
wth->file_type = WTAP_FILE_5VIEWS;
|
||||
wth->subtype_read = _5views_read;
|
||||
wth->subtype_seek_read = _5views_seek_read;
|
||||
wth->file_encap = encap;
|
||||
wth->snapshot_length = 0; /* not available in header */
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Read the next packet */
|
||||
static gboolean
|
||||
_5views_read(wtap *wth, int *err, long *data_offset)
|
||||
{
|
||||
t_5VW_TimeStamped_Header TimeStamped_Header;
|
||||
int bytes_read;
|
||||
guint packet_size;
|
||||
guint orig_size;
|
||||
|
||||
do
|
||||
{
|
||||
bytes_read = _5views_read_header(wth, wth->fh, &TimeStamped_Header, err);
|
||||
if (bytes_read == -1) {
|
||||
/*
|
||||
* We failed to read the header.
|
||||
*/
|
||||
return FALSE;
|
||||
}
|
||||
wth->data_offset += bytes_read;
|
||||
|
||||
if(TimeStamped_Header.Key != CST_5VW_RECORDS_HEADER_KEY)
|
||||
return FALSE;
|
||||
|
||||
if(TimeStamped_Header.RecSubType != CST_5VW_FRAME_RECORD) {
|
||||
if (file_seek(wth->fh, TimeStamped_Header.RecSize, SEEK_SET, err) == -1)
|
||||
return FALSE;
|
||||
wth->data_offset += TimeStamped_Header.RecSize;
|
||||
} else
|
||||
break;
|
||||
} while (1);
|
||||
|
||||
packet_size = TimeStamped_Header.RecSize;
|
||||
orig_size = TimeStamped_Header.RecSize;
|
||||
|
||||
*data_offset = wth->data_offset;
|
||||
|
||||
buffer_assure_space(wth->frame_buffer, packet_size);
|
||||
if (!_5views_read_rec_data(wth->fh, buffer_start_ptr(wth->frame_buffer),
|
||||
packet_size, err))
|
||||
return FALSE; /* Read error */
|
||||
|
||||
wth->data_offset += packet_size;
|
||||
wth->phdr.ts.tv_sec = TimeStamped_Header.Utc;
|
||||
wth->phdr.ts.tv_usec = TimeStamped_Header.NanoSecondes/1000;
|
||||
wth->phdr.caplen = packet_size;
|
||||
wth->phdr.len = orig_size;
|
||||
wth->phdr.pkt_encap = wth->file_encap;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static gboolean
|
||||
_5views_read_rec_data(FILE_T fh, guchar *pd, int length, int *err)
|
||||
{
|
||||
int bytes_read;
|
||||
|
||||
errno = WTAP_ERR_CANT_READ;
|
||||
bytes_read = file_read(pd, 1, length, fh);
|
||||
|
||||
if (bytes_read != length) {
|
||||
*err = file_error(fh);
|
||||
if (*err == 0)
|
||||
*err = WTAP_ERR_SHORT_READ;
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
/* Read the header of the next packet; if "silent" is TRUE, don't complain
|
||||
to the console, as we're testing to see if the file appears to be of a
|
||||
particular type.
|
||||
|
||||
Return -1 on an error, or the number of bytes of header read on success. */
|
||||
static int
|
||||
_5views_read_header(wtap *wth _U_, FILE_T fh, t_5VW_TimeStamped_Header *hdr, int *err)
|
||||
{
|
||||
int bytes_read, bytes_to_read;
|
||||
|
||||
bytes_to_read = sizeof(t_5VW_TimeStamped_Header);
|
||||
|
||||
/* Read record header. */
|
||||
bytes_read = file_read(hdr, 1, bytes_to_read, fh);
|
||||
if (bytes_read != bytes_to_read) {
|
||||
*err = file_error(fh);
|
||||
if (*err == 0 && bytes_read != 0) {
|
||||
*err = WTAP_ERR_SHORT_READ;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
return bytes_read;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
_5views_seek_read(wtap *wth, long seek_off,
|
||||
union wtap_pseudo_header *pseudo_header _U_, guchar *pd, int length, int *err)
|
||||
{
|
||||
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
||||
return FALSE;
|
||||
/*
|
||||
* Read the packet data.
|
||||
*/
|
||||
if (!_5views_read_rec_data(wth->random_fh, pd, length, err))
|
||||
return FALSE;
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static const int wtap_encap[] = {
|
||||
-1, /* WTAP_ENCAP_UNKNOWN -> unsupported */
|
||||
CST_5VW_CAPTURE_ETH_FILEID, /* WTAP_ENCAP_ETHERNET -> Ehernet Ethernet */
|
||||
-1, /* WTAP_ENCAP_TOKEN_RING -> unsupported */
|
||||
-1, /* WTAP_ENCAP_SLIP -> unsupported */
|
||||
-1, /* WTAP_ENCAP_PPP -> unsupported */
|
||||
-1, /* WTAP_ENCAP_FDDI -> unsupported */
|
||||
-1, /* WTAP_ENCAP_FDDI_BITSWAPPED -> unsupported */
|
||||
-1, /* WTAP_ENCAP_RAW_IP -> unsupported */
|
||||
-1, /* WTAP_ENCAP_ARCNET -> unsupported */
|
||||
-1, /* WTAP_ENCAP_ATM_RFC1483 -> unsupported */
|
||||
-1, /* WTAP_ENCAP_LINUX_ATM_CLIP -> unsupported */
|
||||
-1, /* WTAP_ENCAP_LAPB -> unsupported */
|
||||
-1, /* WTAP_ENCAP_ATM_PDUS -> unsupported */
|
||||
-1 /* WTAP_ENCAP_NULL -> unsupported */
|
||||
};
|
||||
#define NUM_WTAP_ENCAPS (sizeof wtap_encap / sizeof wtap_encap[0])
|
||||
|
||||
/* Returns 0 if we could write the specified encapsulation type,
|
||||
an error indication otherwise. */
|
||||
int _5views_dump_can_write_encap(int encap)
|
||||
{
|
||||
/* Per-packet encapsulations aren't supported. */
|
||||
if (encap == WTAP_ENCAP_PER_PACKET)
|
||||
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
|
||||
|
||||
if (encap < 0 || (unsigned) encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
|
||||
return WTAP_ERR_UNSUPPORTED_ENCAP;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on
|
||||
failure */
|
||||
gboolean _5views_dump_open(wtap_dumper *wdh, gboolean cant_seek _U_, int *err)
|
||||
{
|
||||
|
||||
/* We can't fill in all the fields in the file header, as we
|
||||
haven't yet written any packets. As we'll have to rewrite
|
||||
the header when we've written out all the packets, we just
|
||||
skip over the header for now. */
|
||||
if (fseek(wdh->fh, sizeof(t_5VW_Capture_Header), SEEK_SET) == -1) {
|
||||
*err = errno;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* This is a 5Views file */
|
||||
wdh->subtype_write = _5views_dump;
|
||||
wdh->subtype_close = _5views_dump_close;
|
||||
wdh->dump._5views = g_malloc(sizeof(_5views_dump_t));
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* Write a record for a packet to a dump file.
|
||||
Returns TRUE on success, FALSE on failure. */
|
||||
static gboolean _5views_dump(wtap_dumper *wdh,
|
||||
const struct wtap_pkthdr *phdr,
|
||||
const union wtap_pseudo_header *pseudo_header _U_,
|
||||
const guchar *pd, int *err)
|
||||
{
|
||||
|
||||
size_t nwritten;
|
||||
static t_5VW_TimeStamped_Header HeaderFrame;
|
||||
|
||||
/* Frame Header */
|
||||
/* constant fields */
|
||||
HeaderFrame.Key = CST_5VW_RECORDS_HEADER_KEY;
|
||||
HeaderFrame.HeaderSize = sizeof(t_5VW_TimeStamped_Header);
|
||||
HeaderFrame.HeaderType = CST_5VW_TIMESTAMPED_HEADER_TYPE;
|
||||
HeaderFrame.RecType = (unsigned int) (CST_5VW_CAPTURES_RECORD | CST_5VW_SYSTEM_RECORD);
|
||||
HeaderFrame.RecSubType = CST_5VW_FRAME_RECORD;
|
||||
HeaderFrame.RecNb = 1;
|
||||
|
||||
/* record-dependant fields */
|
||||
HeaderFrame.Utc = phdr->ts.tv_sec;
|
||||
HeaderFrame.NanoSecondes = phdr->ts.tv_usec*1000;
|
||||
HeaderFrame.RecSize = phdr->len;
|
||||
HeaderFrame.RecInfo = 0;
|
||||
|
||||
/* write the record header */
|
||||
nwritten = fwrite(&HeaderFrame, 1, sizeof(t_5VW_TimeStamped_Header), wdh->fh);
|
||||
if (nwritten != sizeof(t_5VW_TimeStamped_Header)) {
|
||||
if (nwritten == 0 && ferror(wdh->fh))
|
||||
*err = errno;
|
||||
else
|
||||
*err = WTAP_ERR_SHORT_WRITE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* write the data */
|
||||
nwritten = fwrite(pd, 1, phdr->caplen, wdh->fh);
|
||||
if (nwritten != phdr->caplen) {
|
||||
if (nwritten == 0 && ferror(wdh->fh))
|
||||
*err = errno;
|
||||
else
|
||||
*err = WTAP_ERR_SHORT_WRITE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
wdh->dump._5views->nframes ++;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean _5views_dump_close(wtap_dumper *wdh, int *err)
|
||||
{
|
||||
t_5VW_Capture_Header file_hdr;
|
||||
size_t nwritten;
|
||||
|
||||
if (fseek(wdh->fh, 0, SEEK_SET) == -1) {
|
||||
*err = errno;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* fill in the Info_Header */
|
||||
file_hdr.Info_Header.Signature = CST_5VW_INFO_HEADER_KEY;
|
||||
file_hdr.Info_Header.Size = sizeof(t_5VW_Info_Header); /* Total size of Header in bytes (included Signature) */
|
||||
file_hdr.Info_Header.Version = CST_5VW_INFO_RECORD_VERSION; /* Identify version and so the format of this record */
|
||||
file_hdr.Info_Header.DataSize = sizeof(t_5VW_Attributes_Header) + sizeof(unsigned long)
|
||||
+ sizeof(t_5VW_Attributes_Header) + sizeof(unsigned long); /* Total size of data included in the Info Record (except the header size) */
|
||||
file_hdr.Info_Header.FileType = wtap_encap[wdh->encap]; /* Type of the file */
|
||||
file_hdr.Info_Header.Reserved[0] = 0; /* Reserved for future use */
|
||||
file_hdr.Info_Header.Reserved[1] = 0; /* Reserved for future use */
|
||||
file_hdr.Info_Header.Reserved[2] = 0; /* Reserved for future use */
|
||||
|
||||
/* fill in the HeaderDateCreation */
|
||||
file_hdr.HeaderDateCreation.Type = CST_5VW_IA_DATE_CREATION; /* Id of the attribute */
|
||||
file_hdr.HeaderDateCreation.Size = sizeof(unsigned long); /* Size of the data part of the attribute (not including header size) */
|
||||
file_hdr.HeaderDateCreation.Nb = 1; /* Number of elements */
|
||||
|
||||
/* fill in the Time field */
|
||||
#ifdef _WIN32
|
||||
_tzset();
|
||||
#endif
|
||||
file_hdr.Time = time(NULL);
|
||||
|
||||
/* fill in the Time field */
|
||||
file_hdr.HeaderNbFrames.Type = CST_5VW_IA_CAP_INF_NB_TRAMES_STOCKEES; /* Id of the attribute */
|
||||
file_hdr.HeaderNbFrames.Size = sizeof(unsigned long); /* Size of the data part of the attribute (not including header size) */
|
||||
file_hdr.HeaderNbFrames.Nb = 1; /* Number of elements */
|
||||
|
||||
/* fill in the number of frames saved */
|
||||
file_hdr.TramesStockeesInFile = wdh->dump._5views->nframes;
|
||||
|
||||
|
||||
/* Write the file header. */
|
||||
nwritten = fwrite(&file_hdr, 1, sizeof(t_5VW_Capture_Header), wdh->fh);
|
||||
if (nwritten != sizeof(t_5VW_Capture_Header)) {
|
||||
if (nwritten == 0 && ferror(wdh->fh))
|
||||
*err = errno;
|
||||
else
|
||||
*err = WTAP_ERR_SHORT_WRITE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* Free the index table memory. */
|
||||
g_free(wdh->dump._5views);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
/* 5views.h
|
||||
*
|
||||
* $Id: 5views.h,v 1.1 2003/07/29 19:42:00 guy Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef __5VIEWS_H__
|
||||
#define __5VIEWS_H__
|
||||
|
||||
int _5views_open(wtap *wth, int *err);
|
||||
gboolean _5views_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err);
|
||||
int _5views_dump_can_write_encap(int encap);
|
||||
|
||||
#endif
|
||||
|
|
@ -17,3 +17,4 @@ Motonori Shindo <mshindo[AT]mshindo.net>
|
|||
Markus Steinmann <ms[AT]seh.de>
|
||||
Mark C. Brown <mbrown[AT]nosila.net>
|
||||
Martin Warnes <martin.warnes[AT]ntlworld.com>
|
||||
Thierry Martin <thierry.martin[AT]accellent-group.com>
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
# Makefile.am
|
||||
# Automake file for Wiretap
|
||||
#
|
||||
# $Id: Makefile.am,v 1.41 2003/04/27 09:16:36 jmayer Exp $
|
||||
# $Id: Makefile.am,v 1.42 2003/07/29 19:42:00 guy Exp $
|
||||
#
|
||||
# Ethereal - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@ethereal.com>
|
||||
# Copyright 1998 Gerald Combs
|
||||
#
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
#
|
||||
# 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.
|
||||
|
|
@ -84,7 +84,9 @@ libwiretap_a_SOURCES = \
|
|||
wtap.c \
|
||||
wtap.h \
|
||||
wtap-capture.h \
|
||||
wtap-int.h
|
||||
wtap-int.h \
|
||||
5views.c \
|
||||
5views.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
README.developer \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile.nmake,v 1.30 2003/06/14 20:45:29 guy Exp $
|
||||
# $Id: Makefile.nmake,v 1.31 2003/07/29 19:42:01 guy Exp $
|
||||
#
|
||||
|
||||
include ..\config.nmake
|
||||
|
|
@ -38,7 +38,8 @@ OBJECTS=ascend-grammar.obj \
|
|||
toshiba.obj \
|
||||
visual.obj \
|
||||
vms.obj \
|
||||
wtap.obj
|
||||
wtap.obj \
|
||||
5views.obj
|
||||
|
||||
|
||||
wiretap_LIBS = \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* file.c
|
||||
*
|
||||
* $Id: file.c,v 1.99 2003/05/27 10:42:22 guy Exp $
|
||||
* $Id: file.c,v 1.100 2003/07/29 19:42:01 guy Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
|
@ -68,6 +68,7 @@
|
|||
#include "dbs-etherwatch.h"
|
||||
#include "visual.h"
|
||||
#include "cosine.h"
|
||||
#include "5views.h"
|
||||
|
||||
/* The open_file_* routines should return:
|
||||
*
|
||||
|
|
@ -100,6 +101,7 @@ static int (*const open_routines[])(wtap *, int *) = {
|
|||
radcom_open,
|
||||
nettl_open,
|
||||
visual_open,
|
||||
_5views_open,
|
||||
|
||||
/* Files that don't have magic bytes at a fixed location,
|
||||
* but that instead require a heuristic of some sort to
|
||||
|
|
@ -442,6 +444,10 @@ static const struct file_type_info {
|
|||
/* WTAP_FILE_COSINE */
|
||||
{ "CoSine IPSX L2 capture", "cosine",
|
||||
NULL, NULL },
|
||||
|
||||
/* WTAP_FILE_5VIEWS */
|
||||
{ "Accellent 5Views capture", "5views",
|
||||
_5views_dump_can_write_encap, _5views_dump_open },
|
||||
};
|
||||
|
||||
/* Name that should be somewhat descriptive. */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* wtap-int.h
|
||||
*
|
||||
* $Id: wtap-int.h,v 1.35 2003/01/10 05:53:00 guy Exp $
|
||||
* $Id: wtap-int.h,v 1.36 2003/07/29 19:42:01 guy Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
|
@ -183,6 +183,10 @@ typedef struct {
|
|||
guint frame_table_size;
|
||||
} netmon_dump_t;
|
||||
|
||||
typedef struct {
|
||||
guint32 nframes;
|
||||
} _5views_dump_t;
|
||||
|
||||
struct wtap_dumper {
|
||||
FILE* fh;
|
||||
int file_type;
|
||||
|
|
@ -195,6 +199,7 @@ struct wtap_dumper {
|
|||
ngsniffer_dump_t *ngsniffer;
|
||||
netmon_dump_t *netmon;
|
||||
netxray_dump_t *netxray;
|
||||
_5views_dump_t *_5views;
|
||||
} dump;
|
||||
|
||||
subtype_write_func subtype_write;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* wtap.h
|
||||
*
|
||||
* $Id: wtap.h,v 1.138 2003/06/25 17:35:17 guy Exp $
|
||||
* $Id: wtap.h,v 1.139 2003/07/29 19:42:01 guy Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
|
@ -169,9 +169,10 @@
|
|||
#define WTAP_FILE_DBS_ETHERWATCH 31
|
||||
#define WTAP_FILE_VISUAL_NETWORKS 32
|
||||
#define WTAP_FILE_COSINE 33
|
||||
#define WTAP_FILE_5VIEWS 34
|
||||
|
||||
/* last WTAP_FILE_ value + 1 */
|
||||
#define WTAP_NUM_FILE_TYPES 34
|
||||
#define WTAP_NUM_FILE_TYPES 35
|
||||
|
||||
/*
|
||||
* Maximum packet size we'll support.
|
||||
|
|
|
|||
Loading…
Reference in New Issue