Commit Graph

1084 Commits

Author SHA1 Message Date
Stephen Fisher 721e353447 Fix bug #1926: buffer overflow when parsing iseries files
svn path=/trunk/; revision=23232
2007-10-19 22:40:42 +00:00
Sake Blok 6bec9d3d9e From tmiller@hcjbtech.org : Spelling error on GDS DB protocol dissector: "Buffer lenght:"
(recursively grepped through the source and corrected all occurences, even 
the ones just in comments)



svn path=/trunk/; revision=23211
2007-10-16 23:42:33 +00:00
Guy Harris 4e6eec17b1 Bug 1704 is fixed in the main branch by the simpler expedient of not
using modf() and thus not requiring libm.  In addition, adding -lm to
the dependencies upsets the build on at least some platforms because
"-lm" isn't a pathname.

svn path=/trunk/; revision=23210
2007-10-16 19:01:58 +00:00
Jeff Morriss 0f82a3e7e8 From Paolo Abeni via bug 1751:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1751

The patch adds support to wiretap for a new libpcap DLT for bluetooth captures.
This DLT carries the direction information, which now can be displayed
correctly.
The hci H4 dissector is updated to handle also the newly introduced wtap encap.

svn path=/trunk/; revision=23208
2007-10-16 17:19:16 +00:00
Jeff Morriss 853e791444 Change more fopen() to eth_fopen() to finish fixing bug 1827:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1827

Update README.developer to tell developers not to use fopen() and friends
directly.

svn path=/trunk/; revision=23206
2007-10-16 15:43:18 +00:00
Bill Meier 3179e5cc6d Tighten up heuristic used to identify Ascend capture file....
svn path=/trunk/; revision=23152
2007-10-11 22:07:55 +00:00
Ulf Lamping 9e01356f7a minor updates
svn path=/trunk/; revision=23105
2007-10-09 05:37:34 +00:00
Anders Broman b9f9b33e0e From Florent DROUIN:
This is a replacement of the existing decoding of ERF files (Extensible Record
Format from Endace). 
For the decoding of the ERF files, according to the "type of record" given in
the ERF header, several decoders can be used. Up to now, the decoder is
determined according to an environment variable, or with a kind of heuristic.
And, all the treatment is done during the file extraction.

The new architecture, will separate the ERF file decoding, and the ERF record
decoding. The ERF records will be decoded with a specific dissector. This
dissector can be configured with options, to replace the environment variable.

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1839

svn path=/trunk/; revision=23092
2007-10-08 11:41:21 +00:00
Ulf Lamping 474bdf9687 fix some comments and sort functions by functionality
svn path=/trunk/; revision=23063
2007-10-03 17:59:33 +00:00
Ulf Lamping 0e400cafb4 update to changes in the source files
svn path=/trunk/; revision=23062
2007-10-03 17:57:57 +00:00
Sake Blok a2778dcb27 When reading NetScreen snoop output, only use WTAP_ENCAP_PER_PACKET
if there are packets with different encapsulationtype in the file.
Otherwise use the encapsulationtype of the packets in the file. 

This makes it possible to save the imported data as libpcap file
(or any other format that does not support per-packet encapsulation).

svn path=/trunk/; revision=23031
2007-09-29 07:55:25 +00:00
Bill Meier f4e9824c46 Add error checking for fwrites; replacement for the 2nd of the patches provided in bug #1864
svn path=/trunk/; revision=23015
2007-09-28 17:22:03 +00:00
Sake Blok 235ab1445a When reading NetScreen snoop output, allow the '.' in interface names
so that packets on subinterfaces are accepted too.

svn path=/trunk/; revision=23012
2007-09-28 14:37:15 +00:00
Sake Blok 0e4ae39920 From Martin Warnes:
Attached is a small patch that correct an issue with reading certain IBM
iSeries Comms traces.

Traces where data has been dropped for whatever reason now have the
packet number suffixed with an asterix "*", this causes the current
iSeries wiretap routine to report a "bad" header. The attached patch
simply scans the packet number field and removes any "* characters prior
to scanning, the fact that data may be missing is more than adequately
reported later by current wireshark packet processing.

Regards .. Martin


svn path=/trunk/; revision=23000
2007-09-27 18:36:17 +00:00
Bill Meier 90160079c0 Fix whitespace of newly added lines to match rest of file
svn path=/trunk/; revision=22965
2007-09-25 20:34:06 +00:00
Bill Meier 151a51d956 Add error checking for fwrites; replacement for one of patches provided in bug #1864
svn path=/trunk/; revision=22964
2007-09-25 19:59:50 +00:00
Sake Blok dc3fcc1c5b Allow the output of NetScreen VSI interfaces to be parsed.
svn path=/trunk/; revision=22947
2007-09-25 05:42:22 +00:00
Jörg Mayer f3c4a9def0 Add ascend-grammar.h explicitely to the generation rules, otherwise
make distclean on a really clean source tree will fail.


svn path=/trunk/; revision=22933
2007-09-24 06:58:23 +00:00
Jaap Keuter 42ee794742 From Pieter de Boer:
tshark can read a HP-UX nettl IP packet dump (written with 'nettl -traceon all
-entity ns_ls_ip -file dump'), but cannot convert it to a pcap raw IP packet
dump, with 'tshark -r dump.nettl -w dump.pcap'. A single-line patch to
wiretap/libpcap.c makes it possible to do this.

The input file uses encapsulation type WTAP_ENCAP_NETTL_RAW_IP.

svn path=/trunk/; revision=22849
2007-09-11 21:31:21 +00:00
Ulf Lamping 830c6e094a translate some german to english
svn path=/trunk/; revision=22832
2007-09-09 14:58:02 +00:00
Ulf Lamping 1366745e45 start an experiment to provide MS Visual Studio 2005 solution / project files for a lot easier debugging. They still use the underlying Makefile.nmake files for the actual build process.
svn path=/trunk/; revision=22831
2007-09-09 13:59:58 +00:00
Sake Blok 98be4e676e This patch solves two issue with the NetScreen wiretap routine:
- It accepts the "/" character in interface names
- It accepts EOF as delimiter for the last packet (when there is no more emptyline)

svn path=/trunk/; revision=22765
2007-09-01 11:14:01 +00:00
Stephen Fisher f76387ba1c From Scott Robinson:
Enhancement patch:
  http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1758

This change gives Wireshark the ability to read ATM captures saved by UpTime
Select traffic capture.


svn path=/trunk/; revision=22612
2007-08-23 22:11:39 +00:00
Jeff Morriss 4020fb9c39 Move wtap_pcap_encap_to_wtap_encap()'s definition to libpcap.h so packet-ppi.c can get access to it even when we don't HAVE_LIBPCAP (besides, it doesn't seem to be specific to capturing...)
svn path=/trunk/; revision=22591
2007-08-22 19:38:49 +00:00
Guy Harris 2c041a8fa4 Cast away shortening conversions that are presumed not to lose any data.
Use G_GINT64_CONSTANT() to make a 64-bit integral constant; not all
compilers we use support LL as a suffix for that (MSVC++ 6, for one).

svn path=/trunk/; revision=22580
2007-08-22 02:45:42 +00:00
Richard van der Hoff e6002deb3e From Shaun Jackman <sjackman@gmail.com> / bug 1753:
* asn1/mpeg/packet-mpeg-pes-template.c: Improved decoding of PES
        extension header and Pack header. Decode SCR, PTS, and DTS.
        * asn1/mpeg/mpeg-pes.asn (Pack): Remove.
        * epan/dissectors/packet-mpeg-pes.c: Regenerate.
        * wiretap/mpeg.c (mpeg_read): Decode the SCR using integer
        arithmetic instead of double float arithmetic to prevent rounding
        error.
        * wiretap/wtap-int.h (mpeg_t) <t0>: Use time_t instead of double.


svn path=/trunk/; revision=22577
2007-08-21 22:00:06 +00:00
Guy Harris c193066114 At least some LAPB Windows Sniffer captures have 4 bytes of extra stuff
at the ends of packets.

svn path=/trunk/; revision=22540
2007-08-17 20:04:31 +00:00
Sake Blok 47ec0bead9 (http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1717)
This patch adds support for the Juniper NetScreen snoop output format. 
It takes a text-dump op the captured packets and parses the headers 
and hex-data. Since the snoop files on a Junpiper NetScreen can be saved 
to a tftp-server, this patch makes it quite easy to use the snoop 
function of the Juniper NetScreen firewalls.

/* XXX TODO:
 *
 * o  Create a wiki-page with instruction on how to make tracefiles
 *    on Juniper NetScreen devices. Also put a few examples up
 *    on the wiki (Done: wiki-page added 2007-08-03)
 *
 * o  Use the interface names to properly detect the encapsulation
 *    type (ie adsl packets are now not properly dissected)
 *    (Done: adsl packets are now correctly seen as PPP, 2007-08-03)
 *
 * o  Pass the interface names and the traffic direction to either
 *    the frame-structure, a pseudo-header or use PPI. This needs
 *    to be discussed on the dev-list first
 *    (Posted a message to wireshark-dev abou this 2007-08-03)
 *
 */


svn path=/trunk/; revision=22533
2007-08-17 08:03:32 +00:00
Guy Harris adea9d1ffc Parenthesize macro arguments.
svn path=/trunk/; revision=22480
2007-08-09 22:50:16 +00:00
Jaap Keuter f0b944adc9 Fix for bug 1659:
Changed eth_dir_get_name(dirent) macro

svn path=/trunk/; revision=22478
2007-08-09 20:40:32 +00:00
Jaap Keuter 171efad2b8 Fix for bug 1704:
libm required if C library is not libc (like uclibc)

svn path=/trunk/; revision=22475
2007-08-09 06:52:13 +00:00
Luis Ontanon 96f81d7eba From: Shaun Jackman
This patch adds MPEG PES (packetized elementary stream) to the list of
magic types in wiretap/mpeg.c.


svn path=/trunk/; revision=22460
2007-08-06 22:34:26 +00:00
Guy Harris 5238bd07f1 One quote mark sufficeth.
svn path=/trunk/; revision=22451
2007-08-04 03:47:20 +00:00
Guy Harris b1e9777a81 1989 was quite a while ago. We use function prototypes extensively;
don't worry about YY_PROTO, which isn't defined with the newer shinier
versions of Flex.

svn path=/trunk/; revision=22450
2007-08-04 03:27:18 +00:00
Guy Harris 0f6b7b836e runlex.sh is in tools, not the top-level directory.
svn path=/trunk/; revision=22449
2007-08-04 03:14:00 +00:00
Guy Harris c2d8a39d95 Sigh, crufty old shells. The Solaris test(1) manual says that
1) "-e" isn't supported by good old /bin/sh, so we use "-r"
	   instead;

	2) "The algorithm for determining the precedence of the
	   operators and the return value that will be generated is
	   based on the number of arguments presented to test", so we
	   explicitly parenthesize.

svn path=/trunk/; revision=22448
2007-08-04 03:11:06 +00:00
Guy Harris 517d6d57e4 Oops, forgot to check in the script for running Flex/Lex.
svn path=/trunk/; revision=22447
2007-08-04 02:36:21 +00:00
Guy Harris 5be4499ad1 Add a script as a front-end for Flex, to work around various problems,
such as the fact that Flex strips all but the last component of the "-o"
argument, and that it doesn't generate a header file to declare routines
the generated lexical analyzer defines.  Use that script when building
lexical analyzers, and, for each lexical analyzer, include the generated
header file in the generated analyzer.

svn path=/trunk/; revision=22446
2007-08-04 02:13:52 +00:00
Guy Harris 46be54cee3 Add a Makefile.nmake.inc file, to hold rules etc. used by multiple
Makefile.nmake files; currently, it has the (F)lex-to-C rule and a
.SUFFIXES pseudo-rule to add .l to the list of suffixes.  Have
Makefile.nmake files with .l.c rules include Makefile.nmake.inc to get
that rule.

The names Makefile.am.inc and Makefile.nmake.inc aren't necessarily the
right names for the files in question.

Use $(PACKAGE) in the Mate plugin's Makefile, rather than "mate".

svn path=/trunk/; revision=22437
2007-08-01 22:20:38 +00:00
Guy Harris 159e795100 Add a Makefile.am.inc file, to hold rules etc. used by multiple
Makefile.am files; currently, it has the (F)lex-to-C rule.  Have
Makefile.am files with .l.c rules include Makefile.am.inc to get that
rule.

svn path=/trunk/; revision=22436
2007-08-01 20:35:05 +00:00
Guy Harris 61dd46fa9c Use a common .l.c rule for running Flex on .l files, just as is done on
UN*X.

svn path=/trunk/; revision=22434
2007-08-01 00:22:25 +00:00
Martin Mathieson 0a5437dc33 Add "igmp" -> "ip" mapping.
svn path=/trunk/; revision=22430
2007-07-31 13:53:45 +00:00
Guy Harris 968d363f11 Add comments to various %option items to explain what they're doing.
Move the %options to the beginning if they weren't already there, and
put them in the same order in all files.

Add "prefix=" options to .l files that don't already have them, so we
don't have to pass a "-P" option.

Add "never-interactive" and "noyywrap" options to our lexical analyzers,
to remove extra isatty() checks and to eliminate the need for yywrap()
from the Flex library.

Get rid of %option nostdinit - that's the default.

Add .l.c: rules to Makefile.am files, replacing the rules for specific
.l files.  Have those rules all check that $(LEX) is set.

Update the address for the FSF.

svn path=/trunk/; revision=22424
2007-07-30 20:22:37 +00:00
Guy Harris f104bfa2ad I think the intent, at least, is to allow people to build Wireshark from
a source release tarball without having Flex (think of a source release
tarball being as much a platform-independent distribution format for
people *not* interested in development, and who are on platforms for
which there aren't binary packages, as a way of getting the source to do
development).  Don't check Flex's capabilities in the configure script
(handling reentrant scanners would have to be done differently).

svn path=/trunk/; revision=22414
2007-07-27 18:52:05 +00:00
Guy Harris 96ef450636 Step 1 in adding support for reentrant Flex scanners if Flex supports
them - check whether Flex supports them.

svn path=/trunk/; revision=22410
2007-07-27 02:51:42 +00:00
Martin Mathieson 2cf2fed06a More space needed for wimax frames.
svn path=/trunk/; revision=22395
2007-07-24 15:15:02 +00:00
Guy Harris 90ab61d9f7 Fix another cast of the argument to a ctype.h macro.
svn path=/trunk/; revision=22305
2007-07-14 00:29:03 +00:00
Guy Harris 3ccd39aec7 Fix more ctype.h calls - casting to "int" suppresses the warning, but
doesn't fix the problem, as the sign extension is still done; you have
to cast to "guchar".

svn path=/trunk/; revision=22304
2007-07-13 23:20:02 +00:00
Guy Harris 7e95109118 "isdigit()" doesn't need to be cast to "int".
Its argument, however, needs to be cast to "guchar", so that if the
high-order bit is set, it doesn't get sign-extended.

svn path=/trunk/; revision=22303
2007-07-13 23:18:04 +00:00
Martin Mathieson c4ebb075e7 Worked out properly the silly way aal header is encoded!
svn path=/trunk/; revision=22300
2007-07-13 15:51:34 +00:00