Commit Graph

530 Commits

Author SHA1 Message Date
Anders Broman 1129da54e8 Handle PORTAUDIO_API_1 and add clean-deps target to distclean.
svn path=/trunk/; revision=19159
2006-09-05 20:35:41 +00:00
Anders Broman 2a7bfe21f4 Fix a typo for rtp_player
svn path=/trunk/; revision=19137
2006-09-04 18:11:02 +00:00
Anders Broman 0eba6491bd Include codecs in the all target.
svn path=/trunk/; revision=19123
2006-09-02 16:55:31 +00:00
Anders Broman 9ea41277f9 Fix path and name.
svn path=/trunk/; revision=19120
2006-09-02 14:18:47 +00:00
Guy Harris 0ec3e5661f Move the codecs into a top-level "codecs" subdirectory; there's no
guarantee that all programs using the codecs will necessarily be using
GTK+.

svn path=/trunk/; revision=19117
2006-09-02 06:39:43 +00:00
Ulf Lamping 2f9fe3a928 fix a suspected typo of the portaudio commit
svn path=/trunk/; revision=19095
2006-08-30 22:26:34 +00:00
Anders Broman 7eac3c2879 From Alejandro Vaquero:
- Change the "listen_rtp" to "rtp_player"
- Change from a plugin to be part of the core
- By default it will not compile with the rtp_player. In order to 
compile it is necessary to:
       + For windows: uncomment the line 
"PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1" in config.nmake
       + For linux: using the "--with-portaudio=yes"

svn path=/trunk/; revision=19094
2006-08-30 21:51:31 +00:00
Guy Harris 46bcd17054 Fix cut-and-pasteo.
svn path=/trunk/; revision=18953
2006-08-19 00:24:40 +00:00
Gerald Combs f9661850d1 Add support for AirPcap, an upcoming wireless product from CACE. Support
is disabled by default, and can be enabled by setting AIRPCAP_CONFIG
in config.nmake.  The code is currently limited to Windows, but should
be adaptable to other platforms.

The official announcement won't come until next week, so you'll have to
read the source for details.  :)

svn path=/trunk/; revision=18928
2006-08-16 18:01:25 +00:00
Gerald Combs 4f16b6b178 Point to the newest (1.5.0-1) GnuTLS package. Since it contains
libgcrypt, enable it in the Windows build.

In packet-ipsec.c:

  - Remove non-constants from variable declaration initializations.
  - Use ep_alloc() in a couple of places.
  - Fix an off-by-one error.
  - Reduce the number of SAs in the preferences from 4 to 2.  4 made the
    preferences window absolutely enormous.  This is probably the wrong
    way to fix this.
  - Fix up whitespace.

svn path=/trunk/; revision=18856
2006-08-09 02:00:05 +00:00
Ronnie Sahlberg 0238e4a076 enable kerberos for windows for the win32 build
svn path=/trunk/; revision=18852
2006-08-08 07:52:15 +00:00
Gerald Combs 0213f60e4b Add GNUTLS to the Windows build.
In packet-ssl.c, move ssl_set_debug() up a bit so that we can debug key
file parsing.

svn path=/trunk/; revision=18850
2006-08-07 19:52:18 +00:00
Ronnie Sahlberg 02002f6ef6 if KFW is enabled, we need to temporarily copy the two required DLLs to the build directory since they are required during the build
svn path=/trunk/; revision=18839
2006-08-05 04:41:42 +00:00
Ronnie Sahlberg db179bb768 config and makefile magic we need when we integrate kerberos for windows with the w32 build
disabled for now


svn path=/trunk/; revision=18838
2006-08-05 04:32:57 +00:00
Gerald Combs 80fdf2f263 Fix editcap compilation under Windows.
svn path=/trunk/; revision=18801
2006-07-27 17:59:05 +00:00
Ronnie Sahlberg 950bd73948 we dont need our own snprintf any more since we always use g_snprintf() instead.
svn path=/trunk/; revision=18771
2006-07-20 10:19:47 +00:00
Gerald Combs 68b631ac45 Switch to Net-SNMP 5.3.1.
svn path=/trunk/; revision=18744
2006-07-17 14:11:42 +00:00
Gerald Combs 6cda517c79 Update to Net-SNMP 5.3.0.1.
svn path=/trunk/; revision=18673
2006-07-06 19:52:48 +00:00
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