Commit Graph

796 Commits

Author SHA1 Message Date
Jeff Morriss 5a0cd55e15 Remove references to the megaco plugin from the top level Makefiles.
svn path=/trunk/; revision=21198
2007-03-26 01:56:51 +00:00
Anders Broman 4c92cbef0e Use the latest GTK stuff.
svn path=/trunk/; revision=21122
2007-03-22 22:26:59 +00:00
Bill Meier 3b01588444 Even simpler: use 'rm -rf gtk2.tmp'
svn path=/trunk/; revision=21107
2007-03-22 02:51:21 +00:00
Bill Meier 001379b624 Use correct 'rm -f gtk2.tmp/*' so all files in dir get deleted
svn path=/trunk/; revision=21106
2007-03-22 02:44:52 +00:00
Ulf Lamping 45c8c7a843 fix MSVC warnings of / and set CFLAGS to block new warnings
svn path=/trunk/; revision=21098
2007-03-21 23:14:23 +00:00
Ulf Lamping 8d11a786e7 minor clean_setup target enhancements
svn path=/trunk/; revision=21040
2007-03-17 00:36:40 +00:00
Anders Broman 96838a7064 Use the latest GTK packages for Windows.
svn path=/trunk/; revision=21024
2007-03-14 07:12:55 +00:00
Ulf Lamping cd5aae8116 instead of putting the MSC_VER_REQUIRED test into the root Makefile (which would require to change ALL makefiles - the buildbot revealed it), simply put it in the wiretap generation. As wiretap is mandatory and one of the first things to be build this doesn't even sound like a bad idea anyway ...
svn path=/trunk/; revision=20646
2007-01-31 05:26:41 +00:00
Ulf Lamping 5698c994ca C preprocessor only handles integers for conditional compilation. Build MSC_VER_REQUIRED in config.nmake and compare it with _MSC_VER in config.h.win32
svn path=/trunk/; revision=20637
2007-01-31 02:23:06 +00:00
Ulf Lamping e9cf850201 As discussed on the devlist:
A clean_setup is done first now to ensure that the target dirs don't contain old files -  probably remaining from a previous setup run.

explicit removing of the gtk2 dir is no longer required therefore

svn path=/trunk/; revision=20497
2007-01-19 02:41:25 +00:00
Ulf Lamping 020e10eabb add the user-guide as a component to the setup target
svn path=/trunk/; revision=20495
2007-01-19 01:10:59 +00:00
Anders Broman ceb60b0a6d Update to use the latest GTK packages.
Win32-setup.sh changed to overwrite existing folders.

svn path=/trunk/; revision=20463
2007-01-17 19:14:11 +00:00
Ulf Lamping 2b15cb0156 don't generate zlib1.dll over and over again
svn path=/trunk/; revision=20396
2007-01-11 22:05:59 +00:00
Ulf Lamping a7e01a7dc8 fix some zlib build issues
svn path=/trunk/; revision=20382
2007-01-10 21:42:34 +00:00
Ulf Lamping 15d125cefc add a missing dependency to the zlib1.dll, so it will be generated before wiretap
svn path=/trunk/; revision=20362
2007-01-10 00:35:01 +00:00
Ulf Lamping 550c897251 the makefile dependencies are just killing me ;-) Maybe this is the right way to go ...
svn path=/trunk/; revision=20342
2007-01-08 07:42:26 +00:00
Ulf Lamping 50750f6ecd fix general compilation:
- compile wiretap unconditionally

fix .NET1.1 + PSDK compilation:
- lib.exe tool not available, build dll only (that's just enough)
- copy zlib1.dll.manifest file only if it's available, MSVC2003 doesn't generate it

svn path=/trunk/; revision=20340
2007-01-08 05:03:17 +00:00
Ulf Lamping e456b4fcd6 if we don't have MSVC6, download (using the setup target) the zlib source package instead of the dll one, and compile it in a temp dir before continuing with wiretap
svn path=/trunk/; revision=20337
2007-01-08 02:40:06 +00:00
Ulf Lamping 1a25d263d6 don't spread the AirPcap DevPack files over the libs dir, unzip files into: AirPcap_Devpack_1_0_0_594
svn path=/trunk/; revision=20324
2007-01-05 05:23:02 +00:00
Gerald Combs 7d0118ff10 Update to the latest Win32 libs: Net-SNMP 5.4 and GNUTLS 1.6.1. Enable
AirPcap.

svn path=/trunk/; revision=20321
2007-01-05 01:35:23 +00:00
Ulf Lamping 59cebb950f remove the PDB_FILE setting from config.nmake - there's no real need for this info
add some missing files to the clean targets

svn path=/trunk/; revision=20290
2007-01-03 05:41:11 +00:00
Ulf Lamping 0eec920b42 fix epan\crypt\crypt-md5.obj
svn path=/trunk/; revision=20289
2007-01-03 05:08:20 +00:00
Ulf Lamping 83072738c7 if exist, the install targets should copy pdb and manifest files along with the exe and dll ones
svn path=/trunk/; revision=20280
2007-01-03 00:10:57 +00:00
Gerald Combs 53689800e6 Move epan/crypt-md5.[ch] to epan/crypt. Remove
epan/crypt/airpdcap_md5.[ch].  Fix up whitespace.

svn path=/trunk/; revision=20277
2007-01-02 22:49:57 +00:00
Guy Harris 04ca66dfb1 Ehtereal[sic] -> Wireshark. :-)
Give a little more detail in the comment in the H.248 dissector about
"MEGACO" vs. "H.248".

svn path=/trunk/; revision=20262
2007-01-02 09:20:27 +00:00
Gerald Combs bd282b4114 Move the contents of airpdcap to epan/crypt. Try to fix the current
distcheck failure.  Move the nmake build targets for airpdcap from 
epan/dissectors to epan.  This will probably break the Windows build.

svn path=/trunk/; revision=20231
2006-12-28 17:22:12 +00:00
Anders Broman 0e063dc29c Use portaudio v19.
svn path=/trunk/; revision=20225
2006-12-27 22:21:46 +00:00
Bill Meier 81ab78cddb Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
I violated Murphy's nth law: thou shalt test fixes in an 
'out of the box' configuration *not* in one's customized configuration.
:(


svn path=/trunk/; revision=20221
2006-12-26 22:40:49 +00:00
Ulf Lamping 0d43782ae7 convert line endings (using dos2unix) of the win32_setup.sh file before using it
svn path=/trunk/; revision=20215
2006-12-26 12:40:37 +00:00
Gerald Combs b90006ac6f Update to GNUTLS 1.6.0.
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Bill Meier 42d5c2906f use 'rm -rf' so no error if directory already deleted (by 'clean_setup')
svn path=/trunk/; revision=20190
2006-12-22 00:38:53 +00:00
Anders Broman 686b41801c Update to use gtk 2.10.6 and friends.
svn path=/trunk/; revision=20188
2006-12-21 22:15:34 +00:00
Jörg Mayer e26860607d Get rid of UCD SNMP support (it's not longer supported and
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.


svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
Gerald Combs 8e397a2617 Don't define HAVE_AIRPDCAP if HAVE_AIRPCAP isn't defined. Fix a compiler
warning in the 802.11 dissector.

svn path=/trunk/; revision=20053
2006-12-06 20:29:54 +00:00
Gerald Combs a980d04783 From Davide Schiera and Giorgio Tino: Add initial WPA/WPA2 decryption
support.

WEP key preferences have been overloaded to allow WPA keys.  The
decryption code currently uses Windows-specific data types, but can be
converted to use glib equivalents.

Add a few text and whitespace fixups.

svn path=/trunk/; revision=20049
2006-12-05 19:24:25 +00:00
Bill Meier bf209eec73 Use 'igncr' as needed with Bash (workaround for bug report 1162);
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);


svn path=/trunk/; revision=20034
2006-12-04 05:41:53 +00:00
Ulf Lamping f5e8f21286 if the WIRESHARK_LIBS dir isn't already existing, create it
this fixes problems discussed earlier on the list with cygpath

svn path=/trunk/; revision=19934
2006-11-19 17:02:31 +00:00
Ulf Lamping 405813eb42 fix clean_setup target
svn path=/trunk/; revision=19933
2006-11-19 16:49:58 +00:00
Ulf Lamping 9fb143d508 add the /LARGEADDRESSAWARE to the link process of Wireshark(2) and Tshark. See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/memory/base/physical_address_extension.asp how to enable 3GB support on several Windows versions - I will update the OutOfMemory Wiki page accordingly
svn path=/trunk/; revision=19923
2006-11-17 22:48:21 +00:00
Anders Broman 09bd61c233 Update to use the latest gtk 2.8 glib and pango libraries.
Note from a mail on gtk dev list:
-rwxr-xr-x    1 tml      Administ   224510 Oct  3 18:35 libpango-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    37952 Oct  3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    58749 Oct  3 18:35 libpangowin32-1.0-0.dll

(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)

svn path=/trunk/; revision=19880
2006-11-12 22:18:50 +00:00
Ulf Lamping e13cec2560 don't copy mibs.txt files to mibs, but to snmp\mibs
svn path=/trunk/; revision=19856
2006-11-07 09:36:26 +00:00
Anders Broman 261a964be1 Remove the references to acn
svn path=/trunk/; revision=19835
2006-11-06 20:49:47 +00:00
Ulf Lamping 826b611290 fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO

svn path=/trunk/; revision=19715
2006-10-27 12:06:13 +00:00
Anders Broman c8ecc89dec Missed a change.
svn path=/trunk/; revision=19696
2006-10-26 07:34:10 +00:00
Anders Broman 0880bc54d0 Preparations for using the latest GTK 2.8 files for now only gettext is updated.
svn path=/trunk/; revision=19695
2006-10-26 07:25:07 +00:00
Bill Meier 658fbf4314 rdm now not a plugin - don't copy dll
svn path=/trunk/; revision=19600
2006-10-19 03:45:34 +00:00
Gerald Combs 3208402386 If .svn/entries exists, add it as a dependency to svnversion.h.
svn path=/trunk/; revision=19598
2006-10-18 20:30:15 +00:00
Ulf Lamping 9f62a052a4 distclean should remove wireshark-gtk1/2 dirs completely
svn path=/trunk/; revision=19509
2006-10-13 00:21:47 +00:00
Bill Meier cf20149616 If GTK1_DIR or GTK2_DIR not defined, then corresponding install-common-deps should not be invoked....
svn path=/trunk/; revision=19458
2006-10-09 02:07:44 +00:00
Graeme Lunt 012a218a51 Patch for clean, distclean and maintainer-clean targets for U3 packaging.
svn path=/trunk/; revision=19431
2006-10-04 18:08:51 +00:00
Ulf Lamping 0be3b04cb1 as noted by Anders Broman: the Win2000 version of copy don't like the /d switch
svn path=/trunk/; revision=19395
2006-10-02 19:07:01 +00:00
Ulf Lamping e3883affdd that wasn't a typo, xcopy can't rename files that way
svn path=/trunk/; revision=19372
2006-09-30 00:45:03 +00:00
Anders Broman fdd6b40b4b Fixa a typo copy -> xcopy
svn path=/trunk/; revision=19357
2006-09-29 05:53:47 +00:00
Gerald Combs 0678c4f7c4 Update GNUTLS to 1.5.1. This includes an updated libgcrypt, which should
fix bug 1096.

Switch back to fetching a date-stamped URL in win32-setup.sh.  This
ensures backward compatibility with previous releases and non-updated
SVN trees.

svn path=/trunk/; revision=19339
2006-09-27 18:02:40 +00:00
Luis Ontanon 354983d30d use luaforge's 5.1 dll to be able to link on windows. fix some mistakes
svn path=/trunk/; revision=19331
2006-09-27 00:45:55 +00:00
Luis Ontanon e13832cbe3 The forgotten files!
svn path=/trunk/; revision=19325
2006-09-26 03:36:31 +00:00
Ulf Lamping 4c6484334c fix a typo
svn path=/trunk/; revision=19303
2006-09-23 08:39:54 +00:00
Ulf Lamping 3fa7bc5f0c change the Win32 build environment, so we can create release zip files without the need of an installer - a feature requested from time to time. When this is matured, we might want to add these zip files (of GTK1 and GTK2 versions) to the released files.
config.nmake contains the target INSTALL1_DIR and INSTALL2_DIR. I guess you can retain the previous behaviour by using . for both DIRs, though I never tested this...

svn path=/trunk/; revision=19302
2006-09-23 01:39:07 +00:00
Ulf Lamping adb7fcedcf add a packaging_u3 target
rename gtk2_distclean -> clean_gtk2.tmp (as that's what it's really doing)

svn path=/trunk/; revision=19295
2006-09-22 23:16:31 +00:00
Jörg Mayer 5f9300b9e2 Makefile.nmake
config.h.win32
  - Use HAVE_LIBPORTAUDIO instead of HAVE_PORTAUDIO to make
    sure we use the same var everywhere (including sources
    and autofoo stuff).
  - Use PORTAUDIO_API_1 everywhere

version_info.c
  - Include <portaudio.h>
  - Add some , and breaks when printing version infos.

svn path=/trunk/; revision=19218
2006-09-12 18:43:56 +00:00
Ulf Lamping e8ddc809b5 fix the generation of config.h, some HAVE_... were wrong
svn path=/trunk/; revision=19216
2006-09-12 17:46:55 +00:00
Ulf Lamping 02b49da1b2 add a missing dependency from wiretap to the image dir, otherwise image/wiretap.res can't be generated for some targets
svn path=/trunk/; revision=19202
2006-09-12 08:24:01 +00:00
Ulf Lamping b16e2c43c5 Hmmm, don't optimize too much :-)
also fix the clean_setup

svn path=/trunk/; revision=19199
2006-09-12 01:04:35 +00:00
Ulf Lamping 04fe34d711 various nmake related build file cleanups
svn path=/trunk/; revision=19198
2006-09-12 00:27:03 +00:00
Ulf Lamping 9fee393b87 tweak the nmake build so the NET-SNMP library is in fact optional (as it is in the UNIX builds)
svn path=/trunk/; revision=19196
2006-09-11 22:47:57 +00:00
Bill Meier 9568b76a63 minor cleanup for making codecs
svn path=/trunk/; revision=19184
2006-09-10 13:37:42 +00:00
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
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
Gerald Combs db4f10408c Switch the Windows build environment to GTK 2.4.14. Enable GTK-Wimp by
default in the installer.

svn path=/trunk/; revision=13087
2005-01-17 16:45:15 +00:00
Gerald Combs 21e89ed1a4 Replace a "cp" with three "xcopy"s.
svn path=/trunk/; revision=12946
2005-01-04 17:25:38 +00:00
Gerald Combs 1007a85912 If bash is run as a non-login shell, it doesn't read /etc/profile. Under
Cygwin this has the side effect of making the Windows "find" command appear 
first in the path instead of Cygwin's "find" command.  Call /usr/bin/find
explicitly in win32-setup.sh.

svn path=/trunk/; revision=12639
2004-12-01 16:56:37 +00:00
Guy Harris ffebed7a16 From Francisco Alcoba: link with setargv.obj so that wildcards are
expanded in the command line.

svn path=/trunk/; revision=12635
2004-12-01 11:35:27 +00:00
Gerald Combs 236f1a9717 Update to GTK+ 2.4.13.
svn path=/trunk/; revision=12581
2004-11-23 17:31:16 +00:00
Gerald Combs 5c665d64a7 Update the Windows build to zlib 1.2.2.
Have win32-setup.sh download from "2004-11-02" tag directory.

svn path=/trunk/; revision=12474
2004-11-02 19:07:52 +00:00
Ulf Lamping 0f80fa5c7d renamed capinfo to capinfos, as the former name capinfo was already used in a program called tcprelay, so that might confuse packaging managers and users. Hopefully I got all the places need to be changed.
svn path=/trunk/; revision=12358
2004-10-20 18:50:58 +00:00
Guy Harris 7e1521119f From Graeme Hewson: make AUTHORS-SHORT not include formatting codes,
with AUTHORS-SHORT-FORMAT containing the formatting codes.

svn path=/trunk/; revision=12334
2004-10-17 23:03:11 +00:00
Ulf Lamping 8912ad524b update setup target to latest win32 libs
svn path=/trunk/; revision=12316
2004-10-16 11:17:57 +00:00
Gerald Combs 6c2fcd2c92 Updates to reflect revision 4 of ethereal-win32-libs.
svn path=/trunk/; revision=12305
2004-10-15 18:30:05 +00:00
Gerald Combs fee16ab377 Add support for decoding DES3/CBC/MD5 keys. Make it disabled by default.
Whitespace cleanup.

svn path=/trunk/; revision=12304
2004-10-15 15:36:12 +00:00
Ulf Lamping 86b776b46c update setup target to latest GTK library files
svn path=/trunk/; revision=12249
2004-10-09 07:48:13 +00:00
Guy Harris 981c68cd51 From Lars Roland: don't link EXTRA_OBJECTS unnecessarily with
ethereal.exe, tethereal.exe and dftest.exe.  Export mkstemp() from
libethereal.dll instead.

svn path=/trunk/; revision=12181
2004-10-02 01:54:35 +00:00
Guy Harris 444119dbcb From Lars Roland: add an option to link plugins with libethereal rather
than using the plugin address table.

svn path=/trunk/; revision=12139
2004-09-29 19:30:10 +00:00
Ulf Lamping 65f82a615f Use new win32 libs from anonsvn instead of webpage, including setup target. Use updated GTK 2.4.9 libraries. But still use wget.
svn path=/trunk/; revision=12086
2004-09-24 16:08:44 +00:00
Guy Harris 29753bf6b2 From Gisle Vanem: add support for pcap_datalink_val_to_name() for Win32.
Also add support for pcap_datalink_name_to_val(), and arrange that we
properly define HAVE_PCAP_DATALINK_NAME_TO_VAL and
HAVE_PCAP_DATALINK_VAL_TO_NAME for MSVC++ builds.

svn path=/trunk/; revision=12073
2004-09-23 17:54:49 +00:00
Ulf Lamping 0b30d8900b added a clean_setup target, to cleanup the unzipped files
svn path=/trunk/; revision=11977
2004-09-12 10:07:23 +00:00
Guy Harris 9c2ece3d96 From Graeme Hewson: translate accented UTF-8 characters to Pod E<>
escapes so they turn into *roff escapes and HTML entities in the output,
in case raw UTF-8 doesn't work.

svn path=/trunk/; revision=11975
2004-09-11 23:42:03 +00:00
Ulf Lamping 812bc6eade renamed REQUIRED_APPS to REQUIRED_TOOLS and verify_apps to verify_tools, as it seems much more appropriate
svn path=/trunk/; revision=11874
2004-09-01 11:53:28 +00:00
Gerald Combs 7d2c21e317 Bump the GTK+ 2.4 version up to 2.4.7, and bup GTK-Wimp up to 0.62.
svn path=/trunk/; revision=11842
2004-08-26 23:01:46 +00:00
Gerald Combs 490545d73f Update to GTK-Wimp 0.6.1.
svn path=/trunk/; revision=11721
2004-08-11 21:22:49 +00:00
Gerald Combs b1349d460d Change the "setup" target to download the updated GTK+ libraries described
at http://mail.gnome.org/archives/gtk-devel-list/2004-August/msg00058.html .

svn path=/trunk/; revision=11718
2004-08-11 20:34:42 +00:00
Gerald Combs 2cd81cb109 Update the "setup" target for GLib 2.4.5, GTK+ 2.4.4, and Pango-1.4.1.
svn path=/trunk/; revision=11612
2004-08-06 16:25:59 +00:00
Olivier Biot 26691ff1be From Lars Roland: MSVC make fixes.
Many people have recently reported many problems with the nmake build 
process. It seems that these problems come from using 
epan/makefile.nmake to compile the DISSECTOR_SUPPORT_SOURCES which are 
located in /trunk.

Nmake from MSVC6 puts the object code of the DISSECTOR_SUPPORT_SOURCES 
in /epan although Nmake expects the object code in /trunk when it 
checkes dependencies. Thus DISSECTOR_SUPPORT_OBJECTS are built every 
time even when they are already there.

Nmake Version 1.5 (MSVC 2003 Toolkit) puts the object code of the 
DISSECTOR_SUPPORT_SOURCES in /trunk instead.
This makes it impossible to use epan/makefile.nmake for compiling the 
DISSECTOR_SUPPORT_SOURCES and to make it work for both versions of nmake.

We have to use /trunk/makefile.nmake for compiling the 
DISSECTOR_SUPPORT_SOURCES to solve these issues.

It should also be possible to build ethereal without libethereal.dll again.

Once we have moved all DISSECTOR_SUPPORT_SOURCES into a subdirectory of 
epan we can get rid of this patchwork in the nmake makefiles.


svn path=/trunk/; revision=11562
2004-07-29 07:25:11 +00:00
Olivier Biot 028fd26a0e Add the MSWIN RC information for capinfo.
svn path=/trunk/; revision=11556
2004-07-28 21:13:27 +00:00
Olivier Biot cb6b29786b From Ian Schorr: capinfo - provides capture file information.
svn path=/trunk/; revision=11555
2004-07-28 20:51:29 +00:00
Guy Harris f28323ba39 From Graham Bloice: add resources to wiretap.dll.
svn path=/trunk/; revision=11476
2004-07-23 06:11:50 +00:00
Gerald Combs 83b366536a Add doxygen.cfg to the "clean" target.
svn path=/trunk/; revision=11464
2004-07-21 22:12:49 +00:00
Gerald Combs e20430f876 Fixes (and ugly hacks) for Windows compilation.
svn path=/trunk/; revision=11435
2004-07-19 21:18:40 +00:00
Ulf Lamping 5c008e38ba Fix the win32 nmake generation for now (it will compile/link/run again). This will need more cleanup if the movements of the dissector sources are finished. Hopefully this doesn't broke the unix build.
svn path=/trunk/; revision=11423
2004-07-18 23:46:07 +00:00
Ulf Lamping 4fdb830569 first attempt to make Win32 generation (nmake) ready for the dissector movings (but still incomplete)
svn path=/trunk/; revision=11415
2004-07-18 20:21:20 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Ulf Lamping 31b5d74f55 Changed dependencies, so image dir will be generated before epan, otherwise the libethereal.res file will not be available when needed to link libethereal.dll
svn path=/trunk/; revision=11394
2004-07-17 12:49:34 +00:00
Guy Harris 506605d771 From Graham Bloice: add resource information to libethereal.dll.
svn path=/trunk/; revision=11388
2004-07-17 09:49:32 +00:00
Gerald Combs 8106dc0862 Convert make-version.pl and the associated cvsversion.h and CVSVERSION
definition to Subversion.  "svn info" prints out the last changed date
of the repository, so we don't have to go hunting through "CVS/Entries"
files anymore.


svn path=/trunk/; revision=11379
2004-07-15 21:09:33 +00:00
Gerald Combs 26da520614 Both epan/doxygen.cfg and gtk/doxygen.cfg depend on the root doxygen.cfg.
Build it before going into those directories.

svn path=/trunk/; revision=11375
2004-07-13 19:30:02 +00:00
Guy Harris 7737b1382d From Laurent Rabret: replace "lib" with "link /lib"; "lib" is just a
wrapper around "link /lib", and not all Microsoft C compiler
distributions provide "lib".

svn path=/trunk/; revision=11242
2004-06-26 02:16:16 +00:00
Ulf Lamping 2a6da1361c Add experimental feature of opening a webbrowser, to show some of the
webpages from http://www.ethereal.com. This functionality is copied from
the Gimp.
Win32 will use ShellExecute to use the system registered webbrowser.
On unix builds, currently the mozilla browser is hardcoded, we still need a
preference setting for this (I will add this later).

svn path=/trunk/; revision=11206
2004-06-21 17:27:35 +00:00
Gerald Combs c10d97d8e3 Change to GLib 2.4.2 and GTK+ 2.4.3.
svn path=/trunk/; revision=11204
2004-06-21 15:57:50 +00:00
Ulf Lamping 3e66de1895 add GTK2.4 and alike libs to the setup target,
depending on settings in config.nmake

svn path=/trunk/; revision=11200
2004-06-20 20:22:09 +00:00
Ulf Lamping a85e91903a add merge.obj to the linking of mergecap.exe
svn path=/trunk/; revision=11193
2004-06-20 09:49:36 +00:00
Ulf Lamping 86246e6851 convert AUTHORS file to a shorter version (without the tasks done)
for the about dialog

svn path=/trunk/; revision=10944
2004-05-21 17:25:32 +00:00
Ulf Lamping 3508e88563 GTK Wimp has it's own setting: GTK_WIMP_DIR,
the setup target should use it accordingly

svn path=/trunk/; revision=10894
2004-05-14 16:23:38 +00:00
Olivier Biot d5a08cdf9f Fix a typo (seperate should be separate).
svn path=/trunk/; revision=10878
2004-05-13 20:54:39 +00:00
Guy Harris 15af0f656f From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
	libethereal.dll or not;

	remove "./wiretap" from PATH to prevent problems due to
	wrongly-loaded files;

	build dissector.lib with MSVC;

	move "print.c" and "ps.c" to the dissector helpers, as "print.c"
	imports variables from packet-frame.c and packet-data.c, which
	are in libethereal;

	move "g711.c" out of the dissector helpers, as they're used only
	by Ethereal in a tap, not in Tethereal or in any dissector;

	add a .def file for libethereal;

	arrange to declare global variables exported from libethereal
	with "__declspec(dllimport)" when building programs that import
	those variables;

	update the NSIS installer.

Make the "configure" script define ETH_VAR_IMPORT as "extern".

svn path=/trunk/; revision=10834
2004-05-09 10:03:41 +00:00
Olivier Biot 388aaadcb7 Get rid of epan/config.h.win32.
Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake.

svn path=/trunk/; revision=10807
2004-05-06 20:48:36 +00:00
Guy Harris e2dbc02713 From Lars Roland:
"make distclean" now removes "cvsversion.h";

	new "update_plugin_api" which just builds the "xyzzy" target in
	the plugins subdirectory but makes sure that "config.h" has been
	generated, added.

svn path=/trunk/; revision=10672
2004-04-23 05:19:49 +00:00
Ulf Lamping 55c3178e95 Modify the "setup" target to download the packages we've defined, so that we
don't download the GTK1 packages unless we have GTK1_DIR defined.

svn path=/trunk/; revision=10579
2004-04-10 07:29:14 +00:00
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
Ulf Lamping 6a597864f2 use the configured names from config.nmake for the required apps list
svn path=/trunk/; revision=10574
2004-04-09 07:38:38 +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
Gerald Combs 233dadebd3 From Lars Roland: Fix a couple of MSVC build problems.
svn path=/trunk/; revision=10439
2004-03-22 20:35:07 +00:00
Ulf Lamping f1df01f866 from Lars Roland: fix Makefiles.nmake after changes from Joerg
svn path=/trunk/; revision=10277
2004-03-02 18:55:30 +00:00
Jörg Mayer 4a6e73c84a Move the dissectors into libethereal (no static/shared lib changes):
- Create epan/Makefile.common
- Move dissector_src and helper files from Makefile.common to
  epan/Makefile.common
- Create register.c in epan/
- link all the files into libethereal
- put plugin_src into epan/Makefile.am

Try to make rpms build with rpm v4 again (sorry, I've forgotten who to
attribute this to).

svn path=/trunk/; revision=10273
2004-03-02 01:21:56 +00:00
Gerald Combs 5de3a44126 MSVC doesn't like having header files in .c=.obj targets.
Fix dftest compiling under Windows.

svn path=/trunk/; revision=10208
2004-02-23 22:45:24 +00:00
Ulf Lamping d830fd0f90 make the Makefile.common really common between automake and nmake,
as lot's of definitions were used in the automake process only

svn path=/trunk/; revision=10176
2004-02-22 08:30:41 +00:00
Gerald Combs 037c2c12e4 From Lars Roland: Add support for a combined GTK1/2 Windows installer.
svn path=/trunk/; revision=10098
2004-02-18 20:45:54 +00:00
Guy Harris 1ca41683a0 Now that Ethereal *itself* (not just Wiretap) can use libz (the Soulseek
dissector can use it), we have to link Ethereal, Tethereal, and dftest
with libz, as well as linking Wiretap with it.

We also probably need to link dftest with the PCRE library, as the
display filter code uses PCRE.

svn path=/trunk/; revision=10057
2004-02-13 02:03:14 +00:00
Guy Harris b2a64dc261 The top-level Makefile.nmake doesn't yet get all the source files from
Makefile.common, so we have to add alert_box.obj to the list of object
files for Ethereal.

svn path=/trunk/; revision=10037
2004-02-11 09:58:13 +00:00
Ulf Lamping 610ff1ee37 renamed GTK2 version from ethereal2.exe to ethereal-gtk2.exe,
as this is *not* the Ethereal version 2 already.
Some other cleanup done

svn path=/trunk/; revision=9998
2004-02-06 18:47:45 +00:00
Jörg Mayer bcd907a23d The last commit was only half complete
svn path=/trunk/; revision=9942
2004-02-01 10:11:51 +00:00
Jörg Mayer 591edcfd03 Move sourcelists into Makefile.common
svn path=/trunk/; revision=9941
2004-02-01 10:07:20 +00:00
Ulf Lamping 893624498e use identical depencies for gtk1 also for gtk2 target
svn path=/trunk/; revision=9922
2004-01-31 12:19:58 +00:00
Ulf Lamping c6201489da updated NSIS generation to build GTK version 1 or 2,
added new target "packaging" to root Makefile.nmake,
which will generate version 1 or 2 or both,
depending on config.nmake GTK?_DIR setting

svn path=/trunk/; revision=9866
2004-01-26 21:12:41 +00:00
Ulf Lamping 064d5e5e07 Added the ability to compile both GTK versions 1 and 2 at the same time.
svn path=/trunk/; revision=9827
2004-01-24 20:01:36 +00:00
Jörg Mayer 5abba20365 Move the list of dissectors (DISSECTOR_SRC) out of Makefile.am and
Makefile.nmake into a shared file named Makefile.common

svn path=/trunk/; revision=9772
2004-01-21 21:46:59 +00:00
Guy Harris 6757c92acc We need "cvsversion.h" in order to build stuff in the "gtk" directory.
svn path=/trunk/; revision=9736
2004-01-19 21:00:13 +00:00
Guy Harris 40d5a78175 Put the list of generated source files (well, generated header files,
really) into a BUILD_SOURCES macro, as is done in Makefile.am, and use
that in the "distclean" rule.

svn path=/trunk/; revision=9708
2004-01-18 03:55:02 +00:00
Ulf Lamping c8598a3057 cvsversion.h: added distclean target and dependencies
svn path=/trunk/; revision=9695
2004-01-17 18:52:07 +00:00
Jörg Mayer 1ae6e43f5d Integrate the "find . -name Entries" into make-version.pl, to make this
work with nmake too.

svn path=/trunk/; revision=9694
2004-01-17 13:09:00 +00:00
Jörg Mayer c66bbb0019 Try to genereate cvsversion.h
Note: I don't know anything about the limitations of nmake, so I don't know
whether the `find ...` will work and I can't test it, as I don't have a
Windows system with anything even remotely resembling a compiler on it.

svn path=/trunk/; revision=9687
2004-01-17 00:26:30 +00:00
Gerald Combs ba6b321e63 From Aaron Woo (via Jeff Weston): Optimized Link State Routing Protocol
(OLSR) support.

svn path=/trunk/; revision=9673
2004-01-16 04:37:54 +00:00
Olivier Biot 55f9271c3b Add support for MIME multipart dissection.
svn path=/trunk/; revision=9670
2004-01-16 01:32:20 +00:00
Guy Harris c66241700a From Yuriy Sidelnikov: ISO 8823 Presentation Protocol support.
svn path=/trunk/; revision=9649
2004-01-13 02:10:25 +00:00
Guy Harris 58f30e366e Fix a source file name that got added to the list of object files.
svn path=/trunk/; revision=9646
2004-01-12 08:55:38 +00:00
Guy Harris b97626862e Rename DISSECTOR_HELPER_{SRC,OBJECTS} to
DISSECTOR_SUPPORT_{SRC,OBJECTS}.

Add some additional files, required by dissectors, to those lists.

Extract the stuff to get version information strings for libraries and
the OS, which is *not* needed by dissectors, from "util.c", which
contains routines that *are* needed by dissectors, and put it into a
separate file.

Make "dftest" link only with the dissector support stuff, not with all
of the Ethereal common files.

svn path=/trunk/; revision=9645
2004-01-11 22:17:43 +00:00
Guy Harris 73d7a8e202 Move header files for stuff used by dissectors, and source files
containing helper routines, to DISSECTOR_HELPER_SRC.  Include
DISSECTOR_HELPER_SRC in ETHEREAL_COMMON_SRC, and include BUILT_SOURCES
in ETHEREAL_COMMON_SRC rather than repeating those headers directly.  Do
similar things with ETHEREAL_COMMON_OBJECTS and DISSECTOR_COMMON_OBJECTS
in Makefile.nmake.

Add "packet-x11-keysymdef.h" to "noinst_Headers", so it's built as part
of the tarball.

svn path=/trunk/; revision=9627
2004-01-10 04:09:14 +00:00
Olivier Biot f86edbffa1 Add support for a generic line-based text data dissector.
svn path=/trunk/; revision=9623
2004-01-10 02:38:39 +00:00
Olivier Biot d09e90c3b0 Add support for JFIF (JPEG File Interchange Format) media.
The JFIF dissector processes everything up to the start of scan as the data
thereafter is encoded and I didn't have the time to figure out how it is :)

TODO: fix the WTP dissector so it doesn't hand off unreassembled data to WSP.

svn path=/trunk/; revision=9541
2004-01-04 02:59:46 +00:00
Ulf Lamping dde0264c34 removed compilation of packet-slsk
svn path=/trunk/; revision=9499
2003-12-30 22:18:03 +00:00
Jörg Mayer f17f7e2937 New protocol: Enterasys Interswitch Message Protocol (ismp) and
edp (Enterasys Discovery Protocol)

svn path=/trunk/; revision=9496
2003-12-30 17:14:15 +00:00
Guy Harris d177c7d731 Nothing in "range.c" is GTK+-specific, so move it to the top-level
directory.

svn path=/trunk/; revision=9487
2003-12-29 22:43:33 +00:00
Olivier Biot 83b4a6158f Add support for GIF image dissection.
NOTE: I propose to use packet-MIME-TREE for future media types that will be
added to Ethereal (E.g., packet-image-png.c).

svn path=/trunk/; revision=9437
2003-12-24 02:06:26 +00:00
Guy Harris 75d6b95de1 Not all headers in HTTP, RTSP, SIP, etc. are entity headers; rename some
files, routines, data structures, etc..

svn path=/trunk/; revision=9428
2003-12-23 02:29:11 +00:00
Guy Harris 9ecc68568e Pull the code to do reassembly of the request/response line, entity
headers, and body into a separate routine, for use by other dissectors.

svn path=/trunk/; revision=9402
2003-12-22 00:57:34 +00:00
Guy Harris 2c531d5b0d From Ronnie Sahlberg: stub dissector for the Microsoft Distributed Link
Tracking Server Service (uuid and finction name from Jean-Baptiste
Marchand).

svn path=/trunk/; revision=9293
2003-12-16 05:07:49 +00:00
Guy Harris 6ded357e29 From Lars Roland: build the documentation at the end of the make
process.

svn path=/trunk/; revision=9286
2003-12-15 04:22:30 +00:00
Guy Harris 6892511e7f From Akira Endoh: IGAP support.
svn path=/trunk/; revision=9230
2003-12-10 19:21:55 +00:00
Guy Harris 15f863dc3c From Michael Lum:
new taps for GSM A-interface;

	fixes for ANSI A-interface taps.

svn path=/trunk/; revision=9220
2003-12-09 18:49:32 +00:00
Guy Harris 7e42113e2a Add a "doc" target, as per Ulf Lamping's comment.
svn path=/trunk/; revision=9212
2003-12-08 22:28:53 +00:00
Gerald Combs 409948eced Add PCRE support to the Windows build.
svn path=/trunk/; revision=9185
2003-12-07 00:04:32 +00:00
Gerald Combs c219943fc1 Switch over to Net-SNMP 5.1. A ZIP file of the Net-SNMP 5.1 sources plus
a static Windows library (netsnmp.lib) has been placed at

    http://www.ethereal.com/distribution/win32/development/

The Net-SNMP documentation recommends against using a DLL at the
present time.

svn path=/trunk/; revision=9177
2003-12-05 16:00:34 +00:00
Guy Harris 78191a09b5 From Felix Fei: GSM MAP support.
From Michael Lum:

	Modified for better TCAP separation, fixed EOC handling (a la
	TCAP).

	Added parameter parsing (although not dissection or naming).

svn path=/trunk/; revision=9160
2003-12-03 23:54:50 +00:00
Guy Harris ad0107ddf4 From Michael Lum:
add a message statistics tap for ANSI A interface for Tethereal;

	fix the BSSAP, BSMAP, and DTAP interface dissectors to call
	subdissectors even if no protocol tree is being built.

svn path=/trunk/; revision=9132
2003-12-01 23:05:09 +00:00
Guy Harris ff797aaf4a From Jamie Fournier: DCE RPC EPM version 4 support, and stub support for
BUDB, ICL RPC, and RS_PROP_ACCT DCE RPC-based protocols.

svn path=/trunk/; revision=9080
2003-11-25 08:10:57 +00:00
Ulf Lamping a24a6b7a37 bugfix: corrected clean and distclean targets
svn path=/trunk/; revision=9072
2003-11-24 17:41:33 +00:00
Guy Harris 0367782acf From Scott Hovis :CCSDS (Consultative Committee for Space Data Systems)
support.

svn path=/trunk/; revision=9071
2003-11-24 00:34:13 +00:00
Guy Harris 794858f6bf Include the BFD dissector when building with MSVC++.
svn path=/trunk/; revision=9069
2003-11-23 23:42:46 +00:00
Guy Harris 38ec601ae7 From Jamie Fournier: DCERPC RS_PLCY support.
svn path=/trunk/; revision=9053
2003-11-21 02:57:01 +00:00
Nathan Neulinger 403a9fd3f5 Add dissector for the SEBEK kernel read() data capture and/or rootkit tool
used as part of the HoneyNet project.

Info at:
http://project.honeynet.org/tools/sebek/

svn path=/trunk/; revision=9039
2003-11-19 22:13:29 +00:00
Guy Harris 374f0f1b93 From Dave Sclarsky: CPFI support.
svn path=/trunk/; revision=9028
2003-11-19 04:00:53 +00:00
Ulf Lamping 7cf8e7425d generate "static" help content
svn path=/trunk/; revision=9017
2003-11-18 23:40:12 +00:00
Ronnie Sahlberg 21313199e4 From Lars Roland Service Response times for H225 RAS
svn path=/trunk/; revision=8978
2003-11-16 23:11:20 +00:00
Guy Harris 979a02bbfa From Yuriy Sidelnikov: ISO 8327-1 Session Protocol support.
svn path=/trunk/; revision=8937
2003-11-11 08:29:34 +00:00
Guy Harris 4192ad9770 Let people configure whether to build with Zlib or not solely by
controlling whether ZLIB_DIR is defined or not in config.nmake.

svn path=/trunk/; revision=8911
2003-11-07 23:27:13 +00:00
Ronnie Sahlberg 482e9f24b3 New protocol: MS Kpasswd (RFC3244)
KPasswd is partially dissected for UDP.

It would be very useful if someone added dissection of the asn.1 encoded
AP_REQ and the KRB-PRIV blobs. I dont think I will add those.

svn path=/trunk/; revision=8905
2003-11-07 05:26:27 +00:00
Guy Harris 8e67a430e8 From Michael Lum:
GSM BSSMAP (GSM 08.08) support
	GSM DTAP (3GPP TS 24.008) support
	GSM SMS (3GPP TS 24.011) support
	GSM SS (3GPP TS 24.080) support
	GSM SMS TPDU (3GPP TS 23.040) support

svn path=/trunk/; revision=8826
2003-10-30 07:00:18 +00:00
Guy Harris c37d30442f From Dinesh Dutt:
- Dissector for FICON
	- Dissector for FC-SP (Security Protocol for Fibre Channel)
	- Patches to correct the reassembly of FC fragments.
	- Support for new MDS Port Analyzer Adapters that carry the
	  frame length for truncated frames.

svn path=/trunk/; revision=8823
2003-10-30 02:06:13 +00:00
Guy Harris 9c3e2720da From Giles Scott: Alteon/Nortel Transparent Proxy Control Protocol
support.

svn path=/trunk/; revision=8798
2003-10-28 06:44:21 +00:00
Guy Harris 1c5ed66f45 From Lars Roland: H.225 message and reason tag counter taps.
svn path=/trunk/; revision=8794
2003-10-28 00:31:17 +00:00
Guy Harris a1f7d525b7 From a suggestion by Jim McDonough: support for the INITSHUTDOWN service.
svn path=/trunk/; revision=8793
2003-10-27 23:31:54 +00:00
Guy Harris 8857c91a1d From Michael Lum:
BSSAP (GSM 08.06)/BSAP (IOS 4.0.1) support
	IOS 4.0.1 support
	Add Transport Layer support to ANSI IS-637-A dissector

svn path=/trunk/; revision=8751
2003-10-22 20:59:02 +00:00
Ronnie Sahlberg a3c545a45b From Jaime Fournier
New protocol DCERPC/RS_BIND

Added stub dissector for the RS_BIND protocol

svn path=/trunk/; revision=8747
2003-10-22 02:07:39 +00:00
Ronnie Sahlberg 26b0638b60 From Jaime Fournier
New protocol DCERPC BUTC
Stub dissector for the BUTC interface

svn path=/trunk/; revision=8746
2003-10-22 02:03:44 +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