Commit graph

861 commits

Author SHA1 Message Date
Anders Broman
de3b8195c5 From Martin Mathieson:
This patch should hopefully remove any possible buffer overflows in 
parse_line() as reported by the current Coverity scan.  I'm not sure 
that the error it currently reports is valid (I think its confused by 
supposing that a condition that is being tested can be true, whereas it 
can't...), but this patch fixes a number of potential problems remaining 
in the function.

svn path=/trunk/; revision=17979
2006-04-24 19:08:52 +00:00
Anders Broman
8dd0e70722 Fix CID: 150
svn path=/trunk/; revision=17968
2006-04-23 18:05:23 +00:00
Anders Broman
b99bf25795 From Martin Mathieson:
Fix coverity bugs.

svn path=/trunk/; revision=17909
2006-04-19 18:57:25 +00:00
Guy Harris
87077ede81 The first item in the network load EIP appears to be the network
utilization, in units of .1%.

svn path=/trunk/; revision=17901
2006-04-19 03:42:06 +00:00
Anders Broman
375ba77274 From Martin Mathieson:
These patches:
- fix the bounds errors reported by coverity in bug 879
- fix a couple of other potential bounds errors (length checking 1st & 2nd lines in file)
- reorder catapult_dct2000_phdr so that normal protocol pseudo-header info is at the start.  This means that the stub dissector can avoid the nasty
(overlapped) memcpy
- a little whitespace fixing

svn path=/trunk/; revision=17886
2006-04-17 18:46:14 +00:00
Guy Harris
701b569104 Get rid of the unused WTAP_ENCAP value - holes in the number space cause
ugly printouts for "editcap -T".

svn path=/trunk/; revision=17873
2006-04-16 10:38:47 +00:00
Guy Harris
dc5f4a69e2 Add some missing little-endianizing.
Get rid of some unnecessary casts.

Multiply seconds by 10^9, not 10^6, to get nanoseconds.

svn path=/trunk/; revision=17872
2006-04-16 02:59:49 +00:00
Guy Harris
3a1b1fc8ff Add a loop to process TLVs in the file header.
Advertise nanosecond resolution.

svn path=/trunk/; revision=17871
2006-04-16 02:04:42 +00:00
Guy Harris
749faec6a3 Move file format definitions to the header file.
Put the code to read the packet header and the packet data into routines
(which also fixes some places where observer_seek_read() was using the
sequential file handle rather than the random file handle), make the
packet header reader skip over the TLVs,

Do some additional sanity checking.

Wiretap supports nanosecond resolution; provide nanosecond resolution
time stamps.

Rename some structure members to match their purpose (they're TLV
counts, not flags).

Remove the TLV header from the TLV structures (and eliminate TLV
structures if we don't have the contents or they're just a string); if
we process them, we'll probably end up reading the header and data
separately.

Add some information about some of the TLVs in expert information packets.

svn path=/trunk/; revision=17870
2006-04-16 00:52:36 +00:00
Jaap Keuter
b33cccd47f Sake Blok wrote....
I have taken a look at the trace myself and calculated the TpS to be 
20000000.0 for this particular trace. If I also discard the start_timestamp
like it has been done for other versions of the netxray format, then I get 
the proper results.

svn path=/trunk/; revision=17869
2006-04-15 19:00:42 +00:00
Anders Broman
518732d903 From Martin Mathieson:
Please find a patch to catapult_dct2000.c:
- doesn't use g_hash_table_new_full(), which is missing from earlier versions of glib
- fixed a couple of memory leaks
- hopefully cast away a few warnings I saw on the fedora and solaris buildbot logs


svn path=/trunk/; revision=17867
2006-04-15 15:16:26 +00:00
Ulf Lamping
f1553378e1 from Martin Mathieson: add catapult_dct2000.h
svn path=/trunk/; revision=17866
2006-04-14 13:46:19 +00:00
Anders Broman
69ea88e3f7 SVN properties...
svn path=/trunk/; revision=17863
2006-04-14 13:08:41 +00:00
Anders Broman
af554c2f75 From Martin Mathieson:
patch and new files provide support for Catapult DCT2000 
.out files to wiretap and ethereal.

This wiretap support (catapult_dct2000.c+h) appends a short header to 
each packet giving some context, and a corresponding ethereal dissector 
(packet-catapult-dct2000.c) parses this before passing the real payload 
onto an existing ethereal dissector (for ethernet, ip, lapd, ppp, 
frame-relay,...).

For now, there is only support for saving dct2000 files in their own 
format, although I may add support for converting between dct2000 and 
libpcap later.

updated version of these files and patch, now with support 
for MTP2.  Olivier's trace used the ANSI variant - the MTP2 and MTP3 
decode fine with the right preferences set (although the ISUP dissector 
reports a reserved/retired message type).

Witha a change to NOT to declare gboolean catapult_dct2000_board_ports_only;
as extern as MSVC choked on it.

svn path=/trunk/; revision=17862
2006-04-14 12:41:06 +00:00
Guy Harris
44aa78fe5e Skip non-data records. Fixes bug 767.
svn path=/trunk/; revision=17861
2006-04-14 10:22:29 +00:00
Anders Broman
901f07af60 From Martin Mathieson:
wiretap/README.developer
- the referenced default seek_read function doesn't exist now

wiretap/wtap.c
- a "hole" in encap_table was causing the wrong encap value for later 
types to be looked up (by name)

mergecap.c
- fix a couple of program name copy+paste errors from editcap.c

svn path=/trunk/; revision=17765
2006-03-30 04:58:06 +00:00
Jaap Keuter
9daa63d451 The header will be there, just make sure the date is put in.
Coverity bug 148

svn path=/trunk/; revision=17756
2006-03-29 16:06:57 +00:00
Anders Broman
2502e30bc1 From Martin Warnes:
> I've attached a fix that cleans up this code, actually since my last 
> update of this module the particular call in question was fairly 
> redundant so I just went ahead and removed it and updated the constant 
> that specifies the maximum possible line length instead.
>
> Thanks for bring this to my attention.

svn path=/trunk/; revision=17737
2006-03-27 18:24:26 +00:00
Gerald Combs
480818a431 Fix a possible NULL dereference (bug 827 / CID 145). Add an SVN
ID.  Fix up whitespace.

svn path=/trunk/; revision=17732
2006-03-27 16:09:47 +00:00
Anders Broman
70a045d772 From Mertin Wrnes:
Following my last submitted patch I did some further investigation on the different types of iSeries  Comms Traces, although the field formats are constant, things such as page throws and line spacing vary depending on the tool used to pull the trace form the iSeries spool.

This patch should better handle the different formats and more importantly exit in a graceful manner if an unknown format is encountered.


svn path=/trunk/; revision=17699
2006-03-22 17:37:04 +00:00
Jaap Keuter
a346237ffd From Martin Warnes:
Attached is a fix that addresses a problem reading certain IBM iSeries
Communications traces.


svn path=/trunk/; revision=17655
2006-03-17 06:59:27 +00:00
Luis Ontanon
9ed9299e17 Remove an entire horde of off-by-one errors pointed out by Coverity's CID: 83
(Coverity finds just one at a time...)


svn path=/trunk/; revision=17580
2006-03-11 11:48:35 +00:00
Gerald Combs
d910d8491b Fix a possible NULL dereference (Coverity CID 33).
svn path=/trunk/; revision=17556
2006-03-09 20:48:17 +00:00
Luis Ontanon
83296ec679 Another off by one error found by coverity (CID 83), using > instead of >= when comparing index against array size.
svn path=/trunk/; revision=17521
2006-03-08 10:20:09 +00:00
Luis Ontanon
3fa91ab7be Coverity's run 14 CID 82.
an off by one error (> vs >= in bounds check).


svn path=/trunk/; revision=17520
2006-03-08 10:14:51 +00:00
Anders Broman
497e0ec775 From Daniele Orlandi:
The attached patch adds support for LAPD frames captured using vISDN thru 
libpcap. The support has already been included in libpcap.

The patch adds a new wiretap encapsulation, the necessary glue to decode 
SLL-encapsulated frames, and some minor change in the LAPD dissector in order 
to support the remote-to-remote frames captured on the ISDN E-Channel.

Please apply ethereal-encap-table.diff before, as it fixes a misalignment in 
the encapsulation names table.

svn path=/trunk/; revision=17450
2006-03-02 21:28:05 +00:00
Anders Broman
38c1fab219 Add makefile.nmake
svn path=/trunk/; revision=17365
2006-02-22 06:06:21 +00:00
Ulf Lamping
58d9f6c3b1 even if we don't want to close stdout on wtap_dump_close(), we might at least try to flush it
svn path=/trunk/; revision=17326
2006-02-17 01:47:53 +00:00
Jaap Keuter
ca4000cbaf The attached patch to fix bug 663 allows Ethereal to read Windows
Sniffer V2 format capture files with captyp=5, timeunit=0.
The ticks_per_sec for this case apparently is 1e6.

Bill Meier

svn path=/trunk/; revision=17019
2006-01-12 15:02:25 +00:00
Ulf Lamping
76bbd4181b don't claim to be an erf file if it isn't (e.g. if the file_read call fails)
I don't know if this is the right way to fix it, but it seems at least better than before

svn path=/trunk/; revision=16971
2006-01-07 01:19:29 +00:00
Ulf Lamping
161d4d7efd code cleanup: use "-" for all places, where stdin/stdout is meant
tethereal internally converted the stdout capture filename "-" into "" which doesn't make any real sense and only complicated things.

To make things even more confusing, wiretap expected "" for dump output and "-" for offline reading ...

svn path=/trunk/; revision=16962
2006-01-06 01:06:46 +00:00
Ulf Lamping
548d44c041 Win32: set stdout to binary mode in wtap_dump_fdopen(), so tethereal is also able to write capture files to stdout using -w -
svn path=/trunk/; revision=16958
2006-01-05 22:24:09 +00:00
Ulf Lamping
851692e8fb bugfix to #649: first convert to microseconds, then eventually swap byte ordering (not the other way round)
svn path=/trunk/; revision=16925
2005-12-31 11:48:32 +00:00
Luis Ontanon
5113ab4d4a Add support for Juniper GGSN generated pcap files.
svn path=/trunk/; revision=16857
2005-12-19 19:18:20 +00:00
Guy Harris
2646996a82 Fail if *any* of the fields in the per-packet header of the first record
aren't sane, rather than requiring them *all* to have invalid values.

svn path=/trunk/; revision=16610
2005-11-27 12:10:03 +00:00
Anders Broman
00728fb587 From Martin Warnes:
Add Support for reading of IBM iSeries (AS/400) Comms traces

svn path=/trunk/; revision=16588
2005-11-25 20:30:42 +00:00
Ulf Lamping
c2c6475048 minor mkdir bugfix from Gisle Vanem
svn path=/trunk/; revision=16492
2005-11-12 16:44:54 +00:00
Guy Harris
17456c2e09 Include <unistd.h> if available, to get "close()" declared.
Update the big comment to reflect current reality.

svn path=/trunk/; revision=16453
2005-11-10 02:49:54 +00:00
Guy Harris
262a414f41 The problem wasn't that <sys/stat.h> wasn't being included, the problem
was that file_util.h wasn't in the distribution tarball, so it couldn't
be included - it handles including <sys/stat.h>.

svn path=/trunk/; revision=16423
2005-11-07 20:14:40 +00:00
Ulf Lamping
91e66afb84 add file_util.h so distcheck might work
svn path=/trunk/; revision=16422
2005-11-07 19:51:16 +00:00
Guy Harris
60c4c050d0 You need <sys/stat.h>, if present, to use fstat().
svn path=/trunk/; revision=16416
2005-11-07 17:18:52 +00:00
Guy Harris
688a256884 The standard <dirent.h> routines to rewind and close a directory are
rewinddir() and closedir().

Clean up indentation.

svn path=/trunk/; revision=16415
2005-11-07 17:12:43 +00:00
Guy Harris
7474bc0f13 If we're using libz, make file_open() construct the open() flag
argument, rather than requiring the caller to get the open() flag and
the fopen() flag in sync.  That also means that if we're *not* using
libz, it can just be a wrapper around eth_fopen().

We need to include <fcntl.h>, at least on UN*X, to get open() declared
and the O_ flags defined.

svn path=/trunk/; revision=16409
2005-11-07 02:45:19 +00:00
Ulf Lamping
937a50243c as mkstemp makes trouble and is only used once in util.c, move definition from file_util.h to util.c for now
this hopefully fixes the mkstemp problem

svn path=/trunk/; revision=16406
2005-11-07 00:20:20 +00:00
Guy Harris
5990cb095a Get rid of CRs and set svn:eol-style to native, so that Windows machines
get the CRs and UN*X machines don't.  Also set svn:keywords to Id to
expand RCS IDs.

svn path=/trunk/; revision=16405
2005-11-06 23:21:03 +00:00
Ulf Lamping
cc3d9cb78f Obviously, <glib/gstdio.h> is available since GLib version 2.6 only ...
svn path=/trunk/; revision=16404
2005-11-06 23:11:49 +00:00
Ulf Lamping
c3187174bf replace *a lot* of file related calls by their GLib counterparts. This is necessary for the switch to GTK 2.6 (at least on WIN32).
to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.

deleted related things from config.h.win32

As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.

svn path=/trunk/; revision=16403
2005-11-06 22:43:25 +00:00
Anders Broman
973bdcb507 From Mark C Brown,
Small patch correcting nettl.uid to unsigned and adding pduin/pduout as nettl.kind values...

svn path=/trunk/; revision=16320
2005-10-26 19:01:29 +00:00
Luis Ontanon
74d1997f40 forgot this from the last commit
svn path=/trunk/; revision=16297
2005-10-24 21:52:14 +00:00
Luis Ontanon
9008cf5cd9 - packet records with AAL5 Pdus or AAL2 Sdus contain VP/VC and CID info in the packet record, use that instead of the one in the intreface description record.
- Fix Timestamps that got broken with nanoseconds.
- Add some more disabled code for debugging.


svn path=/trunk/; revision=16294
2005-10-24 21:20:03 +00:00