Commit Graph

512 Commits

Author SHA1 Message Date
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Gerald Combs 1ddc8d2d45 ETHEREAL_LIBS -> WIRESHARK_LIBS
svn path=/trunk/; revision=18250
2006-05-30 01:26:47 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Guy Harris aa1e053ce6 If we have pcap_breakloop(), at least on UN*X we can stop the capture
with a pcap_breakloop() call - we don't need to call select() before
calling pcap_dispatch().

Even if we do need to call select(), we don't need to supply it with a
timeout - it's OK if we block indefinitely, as the signal will interrupt
select().

That also means we can pass -1 as the count to pcap_dispatch(), as
pcap_breakloop() will terminate the loop in pcap_dispatch().

Use sigaction() to catch SIGUSR1, so we can make sure that the signal
handler doesn't get reset when the signal is delivered, and that system
calls don't restart when we return from the signal handler.

svn path=/trunk/; revision=18201
2006-05-21 21:32:04 +00:00
Jaap Keuter 103ad0253f Change to address bug 933. See if this, after setup, includes the updated GTK-Wimp.
svn path=/trunk/; revision=18172
2006-05-16 15:49:03 +00:00
Ulf Lamping 39674fa532 if HHC_DIR is defined in config.nmake, link Ethereal with the required htmlhelp.lib
svn path=/trunk/; revision=17937
2006-04-20 20:35:58 +00:00
Gerald Combs acebebcd61 Update Lua.
svn path=/trunk/; revision=17847
2006-04-12 20:36:31 +00:00
Luis Ontanon e21b984570 One day I'll be able to do change something in windows in a single attempt
svn path=/trunk/; revision=17641
2006-03-15 22:58:40 +00:00
Anders Broman 8d92765c4b Add strptime.obj to outfiles as well.
svn path=/trunk/; revision=17623
2006-03-14 06:42:58 +00:00
Luis Ontanon 89c487756e missed to add strptime.obj to the editcap.
svn path=/trunk/; revision=17617
2006-03-14 00:17:22 +00:00
Luis Ontanon 25ff5cd787 Move init.lua and family to plugins/lua
svn path=/trunk/; revision=17600
2006-03-12 16:41:34 +00:00
Gerald Combs 050525cfb5 Add Lua support by default for Win32. Fix some compilation problems.
Add Lua information to the version paragraph.

svn path=/trunk/; revision=17440
2006-03-01 21:31:07 +00:00
Anders Broman fbf8c0b820 Add asn1 to the clean target
svn path=/trunk/; revision=17410
2006-02-25 09:31:35 +00:00
Guy Harris 8b09fb44e7 Add getopt.obj to the list of object files with which dumpcap is linked;
it's necessary on Windows (but not on most UN*Xes, so getopt.c shouldn't
be part of dumpcap_SOURCES).

svn path=/trunk/; revision=17312
2006-02-15 21:55:46 +00:00
Luis Ontanon 184349063f - disable print
- add a log facility to lua (so far just prints to stderr)
- add settings to disable lua even if installed, to load or not to load user scripts when superuser
- create a default /usr/local/share/ethereal/init.lua that blocks all the io/system calls when running as superuser



svn path=/trunk/; revision=17290
2006-02-13 22:13:31 +00:00
Gerald Combs 80e5e0fb15 Copy over the file open/save code from the Win32 native branch.
The Windows-native routines were integrated by inserting

#if GTK_MAJOR_VERSION >= 2 && _WIN32
  win32_native_routine(GDK_WINDOW_HWND(top_level->window));
  return;
#endif

at the beginning of each GTK+ file routine.  There's probably a prettier
way to do this.

Some of the sizes need to be tweaked in win32-file-dlg.rc, but everything
seems to work.

Fix up whitespace.

svn path=/trunk/; revision=17285
2006-02-13 21:25:43 +00:00
Lars Roland db0a70d039 When using GTK 2.8, we need the cairo dlls, so add them to the install-gtk2-deps target
svn path=/trunk/; revision=17245
2006-02-10 14:13:06 +00:00
Guy Harris ad3cb359b6 From Paolo Abeni:
Set up to build on Windows if we have GNU TLS.

	Define "ssl_data_set()" regardless of whether we have GNU TLS or
	not, as it's used in either case.

	Get rid of an extra #include of epan/gnuc_format_check.h.

svn path=/trunk/; revision=17177
2006-02-06 09:09:06 +00:00
Gerald Combs 306fbc3fdb Update to Net-SNMP 5.2.2.
svn path=/trunk/; revision=16907
2005-12-27 18:33:58 +00:00
Gerald Combs 18abcfc988 If "CLIENTNAME" is set (which indicates that we're using RDP) use
"not tcp port 3389" instead of "not ip host $CLIENTNAME", since it
seems to be more reliable.

Make sure we remove dumpcap.obj when we clean.

This also tests the content-type "text/plain; charset=utf-8" for commit
messages.  Maybe Stig B's name will show up correctly now.

svn path=/trunk/; revision=16826
2005-12-16 17:53:44 +00:00
Gerald Combs 253b96e81f Add support for GLib/GTK+ 2.8. Point to the latest tag.
svn path=/trunk/; revision=16802
2005-12-14 21:19:39 +00:00
Ulf Lamping 00777013b5 the verify_tool target should check for /usr/bin/find (I errorneously did changed it a while ago)
add a comment why we should check for exactly that version

svn path=/trunk/; revision=16753
2005-12-10 11:14:36 +00:00
Ulf Lamping 08a727307c both the buildbot and I have problems with setargv.obj
trying to comment it out, so the build should work again.

don't know what this file is all about :-( 

I just don't have that file and it doesn't seem to be generated ... 

svn path=/trunk/; revision=16697
2005-12-06 08:40:17 +00:00
Guy Harris 4f7478f3a0 Make $(command_line_OBJECTS) a dependency of the stuff that links with
it.

Link dumpcap with mkstemp.obj, as it needs mkstemp().

Make dumpcap depend only on its resource file, as we do with other
programs, not on all of them.

svn path=/trunk/; revision=16695
2005-12-06 06:03:34 +00:00
Ulf Lamping 792584c211 no more usage of Ethereal.lib in dumpcap any longer :-)
use capture_opts_trim()
output of command line usage and version "enhanced"

svn path=/trunk/; revision=16684
2005-12-05 21:28:34 +00:00
Ulf Lamping fc61a1de25 first steps towards a separated capture tool, working title "dumpcap"
personal backup only, not meant for public testing!

I've copied main.c into dumpcap.c and carved out all things not needed

currently won't work as a command line tool, capture_loop.c wants an input pipe
console output is also very ugly and the whole code needs a lot of further cleanup

shouldn't break the unix build as I've only changed the nmake files so far, but who knows ...

svn path=/trunk/; revision=16615
2005-11-28 08:54:52 +00:00
Ulf Lamping ede79e4d3c Win32: first steps towards using GTK2.6, add zipfile and dir name definitions
svn path=/trunk/; revision=16282
2005-10-21 18:47:04 +00:00
Ulf Lamping e6f26721f4 replace WinPcap devel pack 3.0 with current 3.1 version
svn path=/trunk/; revision=15972
2005-09-22 23:18:34 +00:00
Gerald Combs 33cfe1725a Sort each conversation column numerically. Fix up whitespace.
It looks like we can't put "COPYCMD=/Y" in config.nmake and expect nmake
to do the right thing.  Add a comment, and set COPYCMD explicitly in the
root Makefile.nmake.  The rest of the occurrences of xcopy will have to
be taken care of at some point.

svn path=/trunk/; revision=15840
2005-09-16 16:25:53 +00:00
Gerald Combs adce5ed6a5 Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT.  This should fix bug 403.

The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'".  They appear to work under XP, but if anything
broke I blame Larry Wall.

svn path=/trunk/; revision=15710
2005-09-07 13:26:23 +00:00
Gerald Combs 4ba88078f9 Move to the latest ethereal-win32-libs tag.
svn path=/trunk/; revision=15706
2005-09-06 19:48:57 +00:00
Gerald Combs 00f087b2f0 In doc/Makefile.nmake, use the "install-deps" target from the root
Makefile.nmake instead of doing our own XCOPYing.  Use the "clean-deps"
target when we're done instead of leaving DLLs lying around.

Normalize the use of underscores vs hyphens in the "clean-deps" target.

svn path=/trunk/; revision=15704
2005-09-06 18:41:25 +00:00
Ulf Lamping 2a2e994cb1 verify_tools:
- not only look for the cygwin tools, but also check the MSVC tools required like cl.exe, link.exe and nmake.exe

- I don't know why we should use /usr/bin/find but simply find, check for it instead. If there's a reason to use /usr/bin/find, we should use $(FIND) instead but I currently don't see a reason for this

svn path=/trunk/; revision=15220
2005-08-05 08:34:47 +00:00
Gerald Combs db5add1cc3 From Brice Augustin: Use the correct packet length in randpkt.
Build randpkt.exe by default under Windows.

svn path=/trunk/; revision=15092
2005-07-26 16:54:08 +00:00
Gerald Combs a64a4043c3 Revert back to GTK-Wimp 0.6.2. Move to WinPcap 3.1beta4.
svn path=/trunk/; revision=15091
2005-07-26 16:44:57 +00:00
Ulf Lamping d043a722ee Update to zlib 1.2.3
svn path=/trunk/; revision=15039
2005-07-24 13:54:19 +00:00
Gerald Combs e1c7558d93 Point to the latest Windows library tag and versions.
svn path=/trunk/; revision=14923
2005-07-15 20:50:34 +00:00
Gerald Combs 5b7df3128b Make sure "which" is present before we verify our tools. Add "env" to
the list of programs to check.  Make sure our python scripts start with
"#!/usr/bin/env python" as recommended at

  http://www.python.org/doc/faq/library.html#how-do-i-make-a-python-script-executable-on-unix

svn path=/trunk/; revision=14871
2005-07-07 21:26:09 +00:00
Lars Roland 692cd3d6db As suggested by Jaap Keuter:
Add generated files copied by "install-deps" to the
"clean" target

svn path=/trunk/; revision=14509
2005-05-31 20:42:15 +00:00
Ulf Lamping d817ddf513 win32 only: get interface details from WinPcap's packet.dll (direct access to NDIS specific driver information, lower first part)
svn path=/trunk/; revision=14406
2005-05-20 22:16:47 +00:00
Lars Roland 5bb4e926aa add the new target "install-plugins" to nmake makefile
in the plugins subdirectory. This target will copy all plugins to plugins/$(VERSION), thus (t)ethereal will
find and load the plugins when called from within the source tree.

call this target from the main nmake makefile after
installing other dependencies. call it from the nmake makefile
in the doc subdirectory before calling "tethereal -G".
This way "tethereal -G" will recognize the filterable
fields from the plugins, too.


svn path=/trunk/; revision=14284
2005-05-03 01:03:33 +00:00
Lars Roland 2f5fee9c99 Add an install-deps target to the nmake makefiles.
This target will copy all files, mainly dlls, which
are necessary to run (t)ethereal to the source tree.

After copying all necessary dlls to the source tree,
you can run (t)ethereal directly from the source tree.

svn path=/trunk/; revision=14259
2005-05-01 23:03:45 +00:00
Guy Harris 596a4f865b It doesn't matter whether, when building with WinPcap, we have
pcap_lib_version() in the WinPcap on the system on which we're building.

svn path=/trunk/; revision=13873
2005-03-23 01:55:11 +00:00
Guy Harris 46e1907f13 If we have "pcap_freecode()", use it to free the instructions for a BPF
filter after installing the filter.

Set HAVE_PCAP_LIB_VERSION if we're building with WinPcap 3.1; it's not
present in earlier versions, but is present in current 3.1 betas.

Check HAVE_PCAP_LIB_VERSION when building capture-wpcap.c.

svn path=/trunk/; revision=13872
2005-03-23 01:25:01 +00:00
Lars Roland af529a9fb0 Clean up.
Remove obsolete plugin address table and related files.
Remove related targets from various makefiles.

svn path=/trunk/; revision=13787
2005-03-17 00:10:23 +00:00
Guy Harris 6616a3770c Make the "maintainer-clean" rules get rid of some additional generated
files.  Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.

Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.

Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files.  In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).

Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.

svn path=/trunk/; revision=13402
2005-02-14 20:33:57 +00:00
Lars Roland f3294ee49a change nmake makefiles in /trunk and /trunk/epan so that
object code for libethereal.dll isn't generated by the
makefile in /trunk.

Having no code in /trunk linked into libethereal.dll
anymore, the definition of the macro _NEED_VAR_IMPORT_
can be moved from various source files in /trunk to /trunk/Makefile.nmake .
So do that, too.

svn path=/trunk/; revision=13389
2005-02-13 00:10:15 +00:00
Lars Roland 338bda08bd clean up makefiles.
especially /trunk/Makefile.nmake doesn't have to include
/trunk/epan/Makefile.common anymore.

svn path=/trunk/; revision=13368
2005-02-10 01:26:19 +00:00