Commit graph

1065 commits

Author SHA1 Message Date
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
Jaap Keuter
6d6affd859 From Jim Paris:
The encap_table_base in wcap.c is missing an entry.
This causes e.g. "dumpcap -i usb3 -L" to output:
  Data link types (use option -y to set):
    USB_LINUX
   (MPEG)

svn path=/trunk/; revision=22292
2007-07-12 19:55:12 +00:00
Guy Harris
3242580dfa Check %l[doux] first, when looking for the format to use with 64-bit
integral data types, so we handle LP64 platforms if "gint64" is just a
"long int".

svn path=/trunk/; revision=22281
2007-07-09 20:27:38 +00:00
Jaap Keuter
668689a69d Now it really can read MP3 files, without SIGABRT.
svn path=/trunk/; revision=22261
2007-07-06 22:27:03 +00:00
Martin Mathieson
1d477c802c - Map gre -> IP
- Change a value string value to help an easily-frightened colleague

svn path=/trunk/; revision=22224
2007-06-29 16:16:57 +00:00
Martin Mathieson
1b8fccbc9d Don't create & leak a hash table during unsuccessful open()
svn path=/trunk/; revision=22150
2007-06-21 17:30:13 +00:00
Gerald Combs
d1a745f27b Add support for PPI (the Per-Packet Information header), described at
http://www.cacetech.com/documents/PPI_Header_format_1.0.pdf .

svn path=/trunk/; revision=22094
2007-06-13 22:36:58 +00:00
Luis Ontanon
e3fc848842 turns out that wtap_pkthdr was not exportable!
nm on my mac says it is there...


svn path=/trunk/; revision=22093
2007-06-13 19:43:26 +00:00
Luis Ontanon
df05be6cf4 Export all that's exportable from libwiretap.dll
svn path=/trunk/; revision=22092
2007-06-13 19:06:19 +00:00
Luis Ontanon
d24ceffe73 Fix coverity bug 244, [WS Bug 1649]
svn path=/trunk/; revision=22091
2007-06-13 19:05:03 +00:00
Bill Meier
68cdbd4e65 Note invalidity of realtick for
captypes ETH_CAPTYPE_OTHERPOD2 and
ETH_CAPTYPE_GIGPOD2 in comments for
the associated TpS tables.

svn path=/trunk/; revision=22074
2007-06-11 15:50:03 +00:00
Guy Harris
230c951306 From Stephen Donnelly of Endace:
The code for reading ERF files has not been significantly
	updated since 2004.  This patch brings it up to date with a
	number of changes.

	1) Increase number of decodable ERF types from 7 to 12. This
	   covers newer DAG card models and firmware updates.

	2) Fix timestamp conversion. Was calculating only microsecond
	   precision, now displaying with nanosecond resolution.  Hardware
	   precision is 7.5 to 30 ns depending on model.

	3) Allow the user to specify HDLC encapsulation as 'chdlc',
	   'ppp_serial', 'frelay' or 'mtp2'.  This is needed because the
	   ERF HDLC capture formats do not include information on what
	   protocol is used at the next level.  This is currently done via
	   an environment variable 'ERF_HDLC_ENCAP' and is analagous to the
	   existing 'ERF_ATM_ENCAP' variable.

	   If the user does not specify an HDLC encapsulation it tries to
	   guess, and falls back to MTP2 for backwards compatibility with
	   Florent's existing behaviour.

	   I know environment variables are ugly, suggestions are welcome.

	4) When reading HDLC captures as MTP2, use
	   WTAP_ENCAP_MTP2_WITH_PHDR rather than WTAP_ENCAP_MTP2.  This
	   allows us to put the 'Multi-Channel ERF' record 'channel
	   number' field into the MTP2 pseudo header > 'link_number'
	   field.  This is then displayed in Frame information, and can
	   be filtered on.  (Would be nice if it could be made a display
	   column?)

	Because the ERF record does not specify whether Annex A is used
	or not, we pass MTP2_ANNEX_A_USED_UNKNOWN and allow the existing
	user preference to decide.

Move the MTP2_ANNEX_A_ definitions into Wiretap, make the annex_a_used
field a guint8, and change MTP2_ANNEX_A_USED_UNKNOWN to 2 so it fits in
a guint8.  (This means that if you can save an ERF MTP2 file as a
libpcap file, the pseudo-header will have MTP2_ANNEX_A_USED_UNKNOWN in
it.)

svn path=/trunk/; revision=22067
2007-06-08 17:06:13 +00:00
Luis Ontanon
475916db3c Actually implement wtap_register_file_type() and have it returning the ID of the new file type.
Add few functions to wiretap's exported API.



svn path=/trunk/; revision=22060
2007-06-06 20:56:38 +00:00
Guy Harris
35546bfcc8 Note the version numbers in NetMon 3.0 files.
svn path=/trunk/; revision=22050
2007-06-05 17:17:22 +00:00
Guy Harris
ef511c0bbc Note realtick's invalidity for ETH_CAPTYPE_OTHERPOD in the comment for
TpS_otherpod[].  Ask about its validity for ETH_CAPTYPE_OTHERPOD2 and
ETH_CAPTYPE_GIGPOD2.

svn path=/trunk/; revision=22016
2007-05-31 05:51:15 +00:00
Guy Harris
aa3ac312b2 My comment is redundant with Bill's more-detailed comment; remove it.
svn path=/trunk/; revision=22015
2007-05-31 05:46:45 +00:00
Bill Meier
e88e33d5e2 Update Comments
svn path=/trunk/; revision=22005
2007-05-30 15:32:31 +00:00
Guy Harris
70a9743831 Update a comment.
svn path=/trunk/; revision=21998
2007-05-30 00:36:32 +00:00
Guy Harris
cba6441fa4 Give more detail on a captype of 6 for an Ethernet capture.
svn path=/trunk/; revision=21997
2007-05-29 23:35:45 +00:00
Guy Harris
acde0f9f8a It's pretty clear that hdr.captype's interpretation depends on the
network type; there's no "presumably" about it.

Suggest that "realtick" might have the right time stamp in other cases
(if not, a comment should explicitly indicate that, so that in all cases
where we either know that realtick is wrong or have a lot of evidence to
show that it's right, we note that fact).

svn path=/trunk/; revision=21996
2007-05-29 23:31:03 +00:00