Commit Graph

1897 Commits

Author SHA1 Message Date
Gerald Combs f1cb4f2f0a Modify the "setup" target to download the packages we've defined, so that we
don't download the GTK2 packages unless we have GTK2_DIR defined.

Fix some path checking in win32-setup.sh.

svn path=/trunk/; revision=10577
2004-04-09 16:54:07 +00:00
Gerald Combs a011fb14e2 Add a Makefile.nmake target called "setup" that uses the script
tools\win32-setup.sh to

  - Check for applications required to build Ethereal
  - Download and unpack required packages into $ETHEREAL_LIBS

Update ADNS to the latest version.

Make Python 2.3 the default.

svn path=/trunk/; revision=10567
2004-04-08 20:36:09 +00:00
Gilbert Ramirez 5cfc41fd88 If the LHS is a STRING or UNPARSED string, and the RHS is a FIELD,
then make sure that the FIELD can participate in the relation that
is expressed in the display filter.

Note that tvbuff's *should* be able to participate in == comparisons, etc.,
but those functions need to be added to ftype-tvbuff.c first.

svn path=/trunk/; revision=10175
2004-02-22 03:04:41 +00:00
Jörg Mayer 61581fb780 Fix a warning by using a function typedef
svn path=/trunk/; revision=9834
2004-01-25 09:49:50 +00:00
Jörg Mayer 76c7e98449 Fix some of the warnings when compiling with -Wstrict-prototypes
svn path=/trunk/; revision=9720
2004-01-18 15:53:43 +00:00
Guy Harris c4df6e6464 Give it an RCS ID and copyright notice.
svn path=/trunk/; revision=9481
2003-12-29 20:46:12 +00:00
Gilbert Ramirez c1d8c99fa2 Add a missing backslash for the EXTRA_DIST files.
svn path=/trunk/; revision=9477
2003-12-29 20:11:42 +00:00
Ulf Lamping d604209b21 removed some MSVC warnings (added type casts)
svn path=/trunk/; revision=9371
2003-12-21 00:16:54 +00:00
Gilbert Ramirez c7cee4331f -Tpdml and -Tps force -V. Thus, -V is no longer required when using -Tpdml.
Eventually, -Tps will not force -V, and will print summaries when -V is
not selected. However, work still has to be done there.

svn path=/trunk/; revision=9218
2003-12-09 05:56:31 +00:00
Gilbert Ramirez 058ef64db8 Add the ability to print packet dissections in PDML (an XML-based format)
to tethereal. It could be added to Ethereal, but the GUI changes to
allow the user to select PDML as a print format have not been added.

Provide a python module (EtherealXML.py) to help parse PDML.

Provide a sample app (msnchat) which uses tethereal and EtherealXML.py
to reconstruct MSN Chat sessions from packet capture files. It produces
a nice HTML report of the chat sessions.

Document tethereal's PDML and EtherealXML.py usage in doc/README.xml-output

Update tethereal's manpage to reflect the new [-T pdml|ps|text] option

svn path=/trunk/; revision=9180
2003-12-06 06:09:13 +00:00
Guy Harris be4197e744 From Ulf Lamping: add some missing "cd .."s. (I guess the current
directory in nmake files persists across targets; presumably all
commands, or, at least, all "cd" commands, are run in the same process.)

svn path=/trunk/; revision=8682
2003-10-13 19:04:56 +00:00
Guy Harris 02e1d2680a Give every Makefile.nmake file a "distclean" rule, and have "distclean"
recurse into subdirectories doing "nmake -f Makefile.nmake distclean".

Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean"
doesn't remove (such as Flex/Bison output and config.h files) - and have
"nmake -f Makefile.nmake distclean" remove stuff that "make distclean"
removes, including "tethereal-tap-register.c" and
"ethereal-tap-register.c".

svn path=/trunk/; revision=8672
2003-10-10 21:31:53 +00:00
Gilbert Ramirez 52338a3baf Add a "contains" operator for byte-strings, strings, and tvbuffs (protocols).
The search uses a naive approach; more work is required to add a
Boyer-Moore Search algorithm.

svn path=/trunk/; revision=8280
2003-08-27 15:23:11 +00:00
Gilbert Ramirez 086774b71f Add to the fundamental types passed between the scanner and the parser.
Besides "STRING", there is now "UNPARSED_STRING", where the distinction
is that "STRING" was a double-quoted string and "UNPARSED_STRING" is just
a sequence of characters that the scanner didn't know how to scan/parse,
so it's up to the Ftype to parse it.

This gives us more flexibility and prepares the dfilter parsing engine
for the upcoming addition of the "contains" operator.

In the process of doing this, I also re-did the double-quoted string
support in the scanner, so that instead of the naively-simple support we
used to have, double-quoted strings now can have embedded dobule-quotes,
embedded octal sequences, and embedded hexadecimal sequences:
    "\""    embedded double-quote
    "\110"  embedded octal
    "\x48"  embedded hex

Enhance the dfilter unit test script to be able to run a single collection
of tests instead of having to run all of them all the time.

svn path=/trunk/; revision=8083
2003-07-25 03:44:05 +00:00
Gilbert Ramirez 6a8701fb67 Script to unit-test ftype functions via dfilters passed to tethereal.
Uses text2pcap to create pcap trace files from hex-dumps embedded in the
test script.

svn path=/trunk/; revision=7996
2003-07-09 03:57:34 +00:00
Gilbert Ramirez bc2eac429c Handle diff lines that look like "Binary files".
svn path=/trunk/; revision=7841
2003-06-11 14:48:27 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris 6744433452 From Joerg Mayer: mark possibly-unused arguments as unused.
svn path=/trunk/; revision=5388
2002-05-04 10:19:20 +00:00
Guy Harris c942bebb4c From Joerg Mayer: get rid of an unused argument, and flag another as
unused.

svn path=/trunk/; revision=5387
2002-05-04 10:16:12 +00:00
Gilbert Ramirez ac8bc4249f Use the gdb "x" (examine memory) command instead of "print" to obtain
the packet data.  "print" will only show the first 200 members of an array,
whereas "x" doesn't seem to have a limit.

svn path=/trunk/; revision=4884
2002-03-06 06:14:21 +00:00
Gilbert Ramirez 736ac33a0c Add ability to pull packet from add_packet_to_packet_list() frame.
svn path=/trunk/; revision=4881
2002-03-06 03:34:50 +00:00
Guy Harris b4971b39bf From Joerg Mayer:
In the "configure.in" files, add

		-D_U_="__attribute__((unused))"

	to CFLAGS if we're using GCC, and add

		-D_U_=""

	otherwise, so _U_ can be used to mark arguments as unused.

Add -D_U_="" arguments to the Makefile.nmake files as well, so _U_ works
with Microsoft Visual C++ as well.

Add comments and RCS IDs to the Makefile.nmake files that don't already
have them.

svn path=/trunk/; revision=4824
2002-02-27 09:42:52 +00:00
Gilbert Ramirez d3b5ddbef1 Add first attempt at creating a tool to take a [t]ethereal core file
and using gdb, extract the packet that was being dissected when the
core file was created. It works in simple cases; it will probably
fail in many other cases. Right now it only creates libpcap files, and uses
text2pcap to do so.

svn path=/trunk/; revision=4767
2002-02-21 16:15:56 +00:00
Guy Harris d4017a1ee1 Fix up some type/size problems that showed up when compiling on Digital
UNIX on Alpha.

svn path=/trunk/; revision=4635
2002-01-30 22:55:15 +00:00
Guy Harris 5027073407 From Hamish Moffatt:
Add some missing files in the "clean" targets.

	Use pod2html rather than man2html to build HTML man pages.

	Fix ethereal.nsi.in for recent versions of NSIS, and fix a typo.

svn path=/trunk/; revision=4475
2002-01-04 06:57:10 +00:00
Guy Harris 39362af814 From Motonori Shindo:
fix a bogus batch mode inference rule of make, so that
	"vc60.pdb" files are created in the proper directory;

	delete ".pdb" files in a "nmake -f Makefile.nmake clean";

	include the text2pcap and mergecap ".pdb" files in the Windows
	binary distribution.

svn path=/trunk/; revision=4385
2001-12-12 01:29:13 +00:00
Gilbert Ramirez f14a6b8b91 Hopefully the last time I have to change my e-mail address.
svn path=/trunk/; revision=4199
2001-11-13 23:55:44 +00:00
Guy Harris f57a2329ec Remove "text2pcap-scanner.obj" and "tools\lemon\lemon.obj" when a "nmake
clean" is done.

svn path=/trunk/; revision=4188
2001-11-09 09:22:07 +00:00
Guy Harris 5881ffaf2a From Motonori Shindo: have CVS ignore some files generated by Win32
builds.

svn path=/trunk/; revision=3995
2001-10-04 21:08:11 +00:00
Guy Harris cc21ec8124 Do __attribute__ stuff if the GCC version number is greater than or
equal to 2, not just if it's equal to 2 - GCC 3.0 makes it 3, not 2....

svn path=/trunk/; revision=3765
2001-07-22 10:25:50 +00:00
Guy Harris 032f16e2eb If length arguments to "%*s" aren't of type "int", cast them to "int",
as that's what C requires them to be.

svn path=/trunk/; revision=3610
2001-06-26 20:52:19 +00:00
Guy Harris a39e4e8a5d Signed vs. unsigned fixes from Joerg Mayer.
svn path=/trunk/; revision=3372
2001-04-23 23:45:35 +00:00
Gilbert Ramirez 1ae90b3d24 nmake was compiling lemon.c twice; now let it use its default
rules, keeping it from over-compiling.

svn path=/trunk/; revision=3325
2001-04-18 04:55:36 +00:00
Gilbert Ramirez e79474408f Revert. MSVC is wrong. Thanks to Guy for pointing that out.
svn path=/trunk/; revision=3323
2001-04-18 04:52:51 +00:00
Gilbert Ramirez d61a474b93 Makefile.nmake pulls in settings from config.nmake
Move 'const' keyword to keep const qualifiers balanced... gets rid
of complaint from MSVC.

svn path=/trunk/; revision=3321
2001-04-18 03:02:57 +00:00
Guy Harris 64a43e1c0e Fixes to Lemon to get it to compile on platforms (such as some versions
of Tru64 UNIX) that define TRUE and FALSE.

Fixes to some Tru64 compiler warnings.

svn path=/trunk/; revision=3120
2001-03-09 04:35:25 +00:00
Gilbert Ramirez 4b6b3da4e7 Add some win32-specific targets in .cvsignore's.
Replace 'nmake' with $(MAKE) /$(MAKEFLAGS), from Mike Frisch.

svn path=/trunk/; revision=3108
2001-03-06 13:08:13 +00:00
Gilbert Ramirez b864c8d80d Move the location of cppmagic.h, since the lemon-flex include files
require it. It makes more sense to either put cppmagic with lemon, or
in yet another common directory. I'll just put it with lemon.

svn path=/trunk/; revision=3083
2001-02-27 20:34:09 +00:00
Gilbert Ramirez 58afc7c0b4 Add a little script which takes the output of "cvs diff", which is
a flattened recursive diff, and unflattens it, so that it can
be applied with "patch -p0". This has tested only against the output
of "cvs diff -u".

Usage:

cvs diff -u | cvsdiff-fix.py > file.diff

svn path=/trunk/; revision=3071
2001-02-23 16:30:51 +00:00
Guy Harris 7a47c7ef24 Don't cast the function argument to "qsort()" to the expected type, make
the function have the expected type.

Make the arguments to comparison functions used by the merge sort be
"const void *", not "void *", just as the arguments to the comparison
functions used by "qsort()" are "const void *".

svn path=/trunk/; revision=3040
2001-02-15 09:25:38 +00:00
Guy Harris 352eec3037 More prototype fun - make the Lemon parser allocate and free routines
take fully-prototyped function arguments with types appropriate to
"g_malloc()" and "g_free()", and change the calls to the functions
pointed to by those arguments not pass the extra __FILE__ and __LINE__
arguments.

svn path=/trunk/; revision=3039
2001-02-15 06:22:46 +00:00
Guy Harris 6eaa148b30 More paranoia - when compiling with GCC 2.x, do checks of the format
string argument and subsequent arguments to "ErrorMsg()".

Fix up the bugs the checks in question found.

svn path=/trunk/; revision=3038
2001-02-15 06:08:23 +00:00
Guy Harris efabd03215 Change "lemon" *NOT* to cast pointers to "int", as that doesn't work on
LP64 platforms.

Change "lemon" to use function prototypes and the official ANSI C style
of variable-argument-list functions, and to include various system
header files rather than to use non-prototype declaration of various
system functions, to do a lot more type checking.

svn path=/trunk/; revision=3037
2001-02-15 06:01:23 +00:00
Guy Harris 3ce594a981 Add a "-f" flag to the "rm", so that "make clean" won't get an error
(and cause a higher-level "make clean" to stop) if any of the files to
be removed aren't there.

svn path=/trunk/; revision=2991
2001-02-04 19:44:24 +00:00
Gilbert Ramirez 95e09f5ac3 Add Makefile.nmake files for new subdirs.
Add them to EXTRA_DIST in corresponding Makefile.am's so that they
get packaged with the distribution.

svn path=/trunk/; revision=2979
2001-02-02 04:03:43 +00:00
Guy Harris d12fb1f952 Rename the "optarg()" and "opterr()" functions to "get_optarg()" and
"get_opterr()" so they don't collide with "getopt()"s "optarg" and
"opterr" globals (Solaris 2.6's <stdio.h> declares both "optarg" and
"opterr", causing "lemon.c" not to compile).

Define "safe_isXXX()" macros to call "isXXX()" after casting the
argument to "unsigned char" to handle characters with the 8th bit set.
Make some "int" variables used only to hold characters "char" instead.

svn path=/trunk/; revision=2970
2001-02-01 21:46:48 +00:00
Gilbert Ramirez 8f1fff2e6a Create a more modular type system for the FT_* types. Put them
into epan/ftypes.

Re-write display filter routines using Lemon parser instead of yacc.
Besides using a different tool, the new grammar is much simpler, while
the display filter engine itself is more powerful and more easily extended.

Add dftest executable, to test display filter "bytecode" generation.
Add option to "configure" to build dftest or randpkt, both of which are not
built by default.

Implement Ed Warnicke's ideas about dranges in the new display filter and
ftype code.

Remove type FT_TEXT_ONLY in favor of FT_NONE, and have protocols registered
as FT_PROTOCOL. Thus, FT_NONE is used only for simple labels in the proto tree,
while FT_PROTOCOL is used for protocols. This was necessary for being
able to make byte slices (ranges) out of protocols, like "frame[0:3]"

Win32 Makefile.nmake's will be added tonight.

svn path=/trunk/; revision=2967
2001-02-01 20:21:25 +00:00