Commit Graph

970 Commits

Author SHA1 Message Date
Kovarththanan Rajaratnam 1b2498d074 Move make-tapreg-dotc to tools/make-tapreg-dotc
svn path=/trunk/; revision=30284
2009-10-04 08:10:54 +00:00
Kovarththanan Rajaratnam ac8f637590 Move rdps.py to tools/rdps.py
svn path=/trunk/; revision=30281
2009-10-04 07:50:36 +00:00
Gerald Combs 76a108ab01 Install the CRT DLLs using the Visual C++ Redistributable Package
(vcredist_x64.exe) on Win64. This should fix bug 4024.

svn path=/trunk/; revision=29977
2009-09-17 21:54:52 +00:00
Bill Meier ba2e9c002f (Trivial) Update a comment and an error message.
svn path=/trunk/; revision=29946
2009-09-16 16:27:37 +00:00
Anders Broman ef2d9da167 Use the latest GTK packages.
svn path=/trunk/; revision=29943
2009-09-16 13:34:37 +00:00
Kovarththanan Rajaratnam 499695595e Remove superfluous config parameters
svn path=/trunk/; revision=29633
2009-08-30 18:30:14 +00:00
Kovarththanan Rajaratnam 42c0ca3ca7 We require WinPcap > 3.0 so get rid of WPCAP_CONSTIFIED_CONFIG
svn path=/trunk/; revision=29616
2009-08-29 08:19:16 +00:00
Kovarththanan Rajaratnam 5417edcfdc Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
svn path=/trunk/; revision=29580
2009-08-27 05:04:29 +00:00
Gerald Combs 4c7f40f3f5 Add a compile-time option to use a separate thread for reading from
pipes. Enable this by default on Windows. Remove code that tried to
use WaitForSingleObject on a pipe (which Windows doesn't support). Use
native file handles and system calls on Windows (which fixes a problem
with partial reads I ran into during testing).

This should fix bug 1759.

svn path=/trunk/; revision=29574
2009-08-26 23:16:37 +00:00
Anders Broman 67d6f5976e Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmake
for MSVC variant 2008 only. As suggested by Bill Meier.

svn path=/trunk/; revision=29114
2009-07-16 08:27:18 +00:00
Anders Broman 91caa01090 Add /MP flag to make use of multi cores.
svn path=/trunk/; revision=29104
2009-07-15 20:55:31 +00:00
Gerald Combs 72a20c1695 Pull mkstemp() into tempfile.c. That's the only place we use it now, and
it's arguably the only place we _should_ use it. Add create_tempdir() to
tempfile.c and use it to create a temp directory for IP maps. This
should fix bug 3530.

(This still doesn't work on IE 8 / Vista here. IE gives an access denied
error in OpenLayers.js, but this is a separate issue).

svn path=/trunk/; revision=28920
2009-07-02 17:20:27 +00:00
Stig Bjørlykke 8324323784 Try to fix HAVE_NEW_PACKET_LIST handling.
svn path=/trunk/; revision=28905
2009-07-01 11:12:58 +00:00
Jeff Morriss c47eeae22b Move the generated documentation (man pages, AUTHORS-SHORT-FORMAT, and
AUTHORS-SHORT) into doc/.  This cleans up the top-level Makefile.am (no more
need to have rules for each man page in both files) and solves the
parallel-build problem described in:

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3494

svn path=/trunk/; revision=28784
2009-06-21 12:47:48 +00:00
Bill Meier c4e626904c clean: remove directory of previous upx301.
svn path=/trunk/; revision=28735
2009-06-15 12:40:53 +00:00
Bill Meier 26b029de66 Fix a typo.
svn path=/trunk/; revision=28723
2009-06-14 12:50:52 +00:00
Bill Meier ae434fdbe3 If Makefile.nmake/config.nmake updated: Check versions of individual library packages.
This is in addition to the "tag checking" and will catch cases where a library file
has been updated w/o changing the tag. This patch re-enables checking previously done
except that now updates to config.nmake will also trigger the check.

svn path=/trunk/; revision=28722
2009-06-14 12:39:47 +00:00
Graeme Lunt 6b64331033 Update to you the latest UPX executable/dll compressor.
svn path=/trunk/; revision=28718
2009-06-13 08:26:11 +00:00
Tomas Kukosa 40cc6f9108 Update to the GnuTLS 2.8.1
svn path=/trunk/; revision=28689
2009-06-10 21:08:01 +00:00
Gerald Combs 1d0ae8dadb Upgrade to KFW 3.2.2.
svn path=/trunk/; revision=28684
2009-06-10 01:30:49 +00:00
Gerald Combs cdae660d2a Update KFW to 2.6.5.
svn path=/trunk/; revision=28683
2009-06-09 23:54:07 +00:00
Bill Meier 0ea6bce6af Escape ? in echo text the Windows way ....
svn path=/trunk/; revision=28616
2009-06-02 22:02:13 +00:00
Bill Meier cb4f0a40c2 Prevent "echo ? ... " from expanding ? as a file name pattern;
(Trivial) Remove duplicate xcopy of libwireshark.dll;
(Trivial) xcopy $(MSVCR_DLL) ...  only if newer.

svn path=/trunk/; revision=28528
2009-05-29 20:11:17 +00:00
Gerald Combs 6e689b5adc Update the Windows library tags and documentation filename.
svn path=/trunk/; revision=28527
2009-05-29 18:45:24 +00:00
Bill Meier 96505bc99d Version 2: Fix bug: Makefile doesn't detect some out-of-date libraries.
The previous fix (SVN 28504) didn't quite work since
 nmake always errored out if the libraries were not up-to-date; this 
 prevented doing an nmake ... setup.

 This version of the fix:
 1. Gets the library status (checktag) at the beginning of the make.
 2. Effectively does the actual testing of the status whenever 
    a target with $(LIBS_CHECK) as a dependency is invoked.

 Result: nmake ... [all] will error-out while nmake .... setup will
  work properly.

 Note that nmake ... setup will now show an initial error message
  (from checktag) if the libraries are out of date; setup will still 
  proceed normally.
  This is a slight change from the current behavior wherein no
  error message occurs when nmake ... setup is invoked when the
  libraries are out of date.

svn path=/trunk/; revision=28516
2009-05-28 23:20:20 +00:00
Bill Meier 2223888b20 Add missing quote
svn path=/trunk/; revision=28505
2009-05-27 17:13:07 +00:00
Bill Meier 582e9cb3a4 Fix bug: Makefile doesn't detect some out-of-date libraries.
Reason:
 The makefile was coded to do the checktag and libverify checks
 only if makefile.nmake changed. It's now the case that some 
 library updates are reflected in config.nmake rather than in
 Makefile.nmake and thus were missed.

Solution:
 Do a checktag once at the beginning of the make.
 Do not do a libverify any more. I think that checking
  that the library 'tag' is correct is sufficient.
 (The libverify code has been effectively commented out for now. 
  It can be removed at a later date once we're comfortable
  with just using checktag).
 --This line, and those below, will be ignored--

M    Makefile.nmake

svn path=/trunk/; revision=28504
2009-05-27 17:07:51 +00:00
Tomas Kukosa 0a101aacf6 Make gtk/capture_if_details_dlg_win32.c compileable using MSVC6 with SDK
svn path=/trunk/; revision=28314
2009-05-08 19:53:41 +00:00
Gerald Combs 7b3b6ed3f9 Check for the existence of a couple of directories and add variables for DLL
names.

svn path=/trunk/; revision=28070
2009-04-16 21:34:44 +00:00
Gerald Combs e648060f0f Fix the last(?) of the Win64 compilation problems.
svn path=/trunk/; revision=28065
2009-04-16 04:05:39 +00:00
Anders Broman db6795dc82 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27796
2009-03-19 06:42:46 +00:00
Anders Broman e7ccbd26d1 Revert the changes, it blows up when resizeing windows...
svn path=/trunk/; revision=27764
2009-03-17 21:33:15 +00:00
Anders Broman 2a6752e050 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27762
2009-03-17 20:21:16 +00:00
Bill Meier b3f428acb4 Do checkAPIs for wireshark_SOURCES
svn path=/trunk/; revision=27754
2009-03-17 15:39:07 +00:00
Gerald Combs cf7fb3ea9c Port rdps from C to Python. This makes it easier to cross-compile
Wireshark on Windows. The GNU toolchain changes have not been tested.

svn path=/trunk/; revision=27704
2009-03-11 22:12:05 +00:00
Gerald Combs 0d446ae826 Use WIRESHARK_TARGET_PLATFORM instead of PLATFORM.
svn path=/trunk/; revision=27701
2009-03-11 16:13:17 +00:00
Bill Meier 0af6e6e23a Enable checkAPIs on gtk/...
(I believe all the errors for gtk/... have been fixed);
 Next up: Add the complete list of deprecated
   GTK APIs to checkAPIs.pl

svn path=/trunk/; revision=27681
2009-03-09 20:29:09 +00:00
Bill Meier a910aed306 gettext library setup: Fix a bug and adjust config slightly for win32 so
gettext setup works the way I think was intended.

svn path=/trunk/; revision=27644
2009-03-07 18:48:25 +00:00
Gerald Combs 2731028a0c Fix Win32 build breakage.
svn path=/trunk/; revision=27634
2009-03-07 03:25:01 +00:00
Gerald Combs 8f69ddeb00 Add preliminary support for Win64 compilation. Attempt to use the same
set of makefiles and scripts for each platform as much as possible.

svn path=/trunk/; revision=27633
2009-03-07 01:06:40 +00:00
Gerald Combs db37f3cecf Try using the MSVCRT version of Lua (lua5_1_4_Win32_dll6_lib) for
all builds.

svn path=/trunk/; revision=27465
2009-02-16 17:27:12 +00:00
Ulf Lamping f8e5b17dbd add support for a simple GeoIP based IP Location Map, more details will follow on the dev-list
svn path=/trunk/; revision=27433
2009-02-11 20:25:17 +00:00
Ulf Lamping 67efa1ca84 we don't need to copy rawshark.exe.manifest, as this manifest is integrated using mt.exe
svn path=/trunk/; revision=27403
2009-02-09 19:38:15 +00:00
Tomas Kukosa fe53605ff9 Update GnuTls to gnutls-2.6.4-1
svn path=/trunk/; revision=27398
2009-02-09 09:38:58 +00:00
Anders Broman 7c48128948 Revert previous checkin.
svn path=/trunk/; revision=27356
2009-02-02 22:16:46 +00:00
Anders Broman d92ab193f5 Use Python to build tshark-tap-register.c
svn path=/trunk/; revision=27355
2009-02-02 21:22:01 +00:00
Ulf Lamping 7eae5480fb trying to "inject" commands into xcopy doesn't work on international windows version. You simply can't answer the question "Datei oder Verzeichnis" with the key 'f' ;-)
Replace this with the triple: "copy, if exist delete, rename" which isn't very nice but at least works on all machines

svn path=/trunk/; revision=27325
2009-01-29 01:31:11 +00:00
Anders Broman 2b3540be16 Use Glib 2.18-4 GTK+ 2.14.7 and Cairo 1.8.6.
svn path=/trunk/; revision=27226
2009-01-13 23:21:19 +00:00
Tomas Kukosa e22d7c79eb display runtime versions of GnuTLS and Gcrypt libraries
svn path=/trunk/; revision=27194
2009-01-08 13:24:04 +00:00
Gerald Combs 8395f0ef02 As suggested by Joerg a while back, get rid of FAQ in the build directory.
Copy help/faq.txt to FAQ in the NSIS and zip packages.

Add "help" to the dependency list for "all". Fix a couple of minor bugs
in the top-level Makfile.nmake.

svn path=/trunk/; revision=27173
2009-01-06 21:47:19 +00:00
Anders Broman 57d4f179fd Use the install-plugins target.
svn path=/trunk/; revision=27125
2008-12-29 15:12:04 +00:00
Anders Broman 960cd2feee Use GTK+ 2.14.6
svn path=/trunk/; revision=27121
2008-12-27 16:24:16 +00:00
Gerald Combs c30c410fa5 Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion.

svn path=/trunk/; revision=27098
2008-12-23 18:56:31 +00:00
Gerald Combs c9c32db187 Remove lynx as a dependency on Windows. By default, create the FAQ using
html2text.py. You can override this by adjusting config.nmake or by setting
HTML2TXT.

svn path=/trunk/; revision=27041
2008-12-17 21:11:20 +00:00
Tomas Kukosa 408d562a5c Update GnuTls to gnutls-2.6.3-1
svn path=/trunk/; revision=26998
2008-12-15 11:52:06 +00:00
Bill Meier 9a411f5ddf Rework FAQ target & etc so it works; Is there a better way ?
svn path=/trunk/; revision=26984
2008-12-13 03:46:57 +00:00
Gerald Combs 9dcdec852b Try to get the FAQ targets working on Windows. Add lynx to the list of
required tools.

svn path=/trunk/; revision=26982
2008-12-13 02:59:42 +00:00
Bill Meier 4f170baf7e Delete the prior version of c-ares (1.5.3) in clean_setup
svn path=/trunk/; revision=26963
2008-12-11 00:49:17 +00:00
Gerald Combs e137f6cb76 Use c-ares 1.6.0.
svn path=/trunk/; revision=26961
2008-12-10 22:16:09 +00:00
Anders Broman 8a1b0a0414 Use GTK 2.14.5 and glib 2.18.2
Overview of Changes from GLib 2.18.2 to GLib 2.18.3
===================================================

* Build with libtool 2.x

* Bugs fixed:
 557087 mem leak in g_content_types_get_registered
 558185 'parent' variable in g_local_file_get_child_for_display_name()
         hits g_object_unref(NULL) assertion
 557210 g_compute_checksum_for_* asserts with less than 2 bytes
 528320 Incorrect icons displayed for files with custom mimetype icons
 557592 Missing include in gwinhttpfile.c
 556415 Crash on Windows 2000 in g_winhttp_vfs_init()
 556910 Memory leak: sub
 561352 Leak of icon description
 561375 Leaks mountpoint description
 560569 gkeyfile doesn't use the set list_separator in some cases
 560568 gkeyfile docs buglet
 559413 g_option_group_set_error_hook docs buglet

Overview of Changes from GTK+ 2.14.4 to 2.14.5
==============================================

* Bugs fixed:
 556578 GIMP windows stay on top of other windows
 557059 crash when compositing emblems with icon
 557266 Window Management Problem
 528320 Incorrect icons displayed for files with custom mimetype icons
 557894 Wrong return value for gdk_pointer_grab_info_libgtk_only
 557316 GtkLinkButton should consider user-defined tooltip
 558323 glitches when popping up combos in treeviews
 558278 Crash when calling a callback set by
gdk_add_client_message_filter
 557212 Problem with which window gains focus and is visible
 541391 Unfocussable Treeview swallows focus
 552956 Should check composite extension version
 554567 warning fixes (missing format specifiers and NULL vs 0)

svn path=/trunk/; revision=26960
2008-12-10 20:30:34 +00:00
Ulf Lamping 152ba2075c add mt.exe to the REQUIRED_TOOLS (if we're not using MSVC6)
svn path=/trunk/; revision=26932
2008-12-08 18:28:40 +00:00
Balint Reczey d343f41bcf Remove old lua5.1 dir when performing clean_setup.
From Christopher Maynard.
This fixes bug 3072 (with commit 26810).

svn path=/trunk/; revision=26811
2008-11-19 13:49:31 +00:00
Balint Reczey aaee3d38eb delete lua5.1.4 dir when performing clean_setup
svn path=/trunk/; revision=26810
2008-11-19 13:44:04 +00:00
Anders Broman f9f80c330e Update GTK packages.
svn path=/trunk/; revision=26786
2008-11-15 16:36:27 +00:00
Gerald Combs b55a53fe02 Create a manifest for rawshark.exe.
svn path=/trunk/; revision=26437
2008-10-13 18:32:49 +00:00
Anders Broman bc7779c4c4 Use LUA 5.1.4
svn path=/trunk/; revision=26329
2008-10-01 19:38:27 +00:00
Bill Meier f5ef397375 Windows Vista: Fix so 'touch --reference ...' file mod time is always gt Makefile.nmake time
svn path=/trunk/; revision=26292
2008-09-29 17:05:46 +00:00
Anders Broman b8140ea604 Yet another GTK+ update...
Overview of Changes from GTK+ 2.14.2 to 2.14.3
==============================================

* Revert problematic GtkAdjustment changes

* Bugs fixed: 
 552837 mem leak in gtkimmulticontext
 553000 incorrect i18n header in gtkfilesystem.c
 553135 eog crash: assertion failed
 552545 leaks GpImage

svn path=/trunk/; revision=26273
2008-09-25 20:32:00 +00:00
Anders Broman 04b710049c Use the latest GTK packages, changes:
Overview of Changes from GLib 2.18.0 to GLib 2.18.1
===================================================

* Bugs fixed:
 550433 g_test_init doesn't recognize --help
 523463 Core dump in gmain.c:2482:IA__g_main_context_check
 551228 G_STRFUNC on recent Sun compiler should be expanded...
 551410 gtestutils.c: using printf without prototype
 551731 g_date_set_time[_t] docs should mention what timezone
 548321 <string.h> is not included in gi18n-lib.h
 551149 xdgmime mem leak
 550647 synchronous pipe I/O when reading mount reply
 551887 Docs for g_desktop_app_info_new_from_filename aren't...
 551681 g_content_type_guess() too naive with filenames
 552352 g_app_info_launch doesn't work if "Path" key...
 551408 gmodule.def generated to builddir...
 552359 g_file_info_get_icon should return GThemedIcon, and...

Overview of Changes from GTK+ 2.14.1 to 2.14.2
==============================================

* Don't use XRRGetScreenResources, since it doesn't work well

* Bugs fixed:
 551063 deprecated marking without a link to what new code should use
 319849 gtkcalendar look in RTL locales
 550989 gdk_display_put_event should call g_main_context_wakeup
 550062 Small update in gdk/gdkkeysyms.h
 551325 Reference to wrong parameter in gtk_editable_insert_text
 551386 gtk_printer_set_is_default() always sets TRUE
 550676 Memory leak, update keyboard layout data structure
 551699 gtk_scrolled_window_destroy() is broken
 551567 DND mark broken
 551378 Print dialog: should try UDS when fetching PPD for localhost
 536542 gtk_list_store_set() documentation doesn't say whether...
 552153 GtkModules loading with XSettings doesn't work...
 552001 gtkimcontextsimple.c: variable is declared at middle...
 551987 GtkPaned redrawing problem
 551722 gtk_widget_set_scroll_adjustments() should check...
 552107 Small libtool fixes
 552500 GtkPrintSettings API doc not precise enough
 408154 Change GtkEntryCompletion max-items to style property
 329593 Entering characters on a line very cpu intensive and slow
 552667 gtkimage containing gicon leaks memory
 552668 format not a string literal and no format arguments...
 346903 gtk_enumerate_printers needs events to complete
 550969 fix a typo which breaks the static build
 517233 Calling gdk_pixbuf_loader_close causes "GError set over...
 551063 deprecated marking without a link to what new code should use
 540967 docs build slowly because of entities

svn path=/trunk/; revision=26255
2008-09-23 20:32:40 +00:00
Gerald Combs ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +00:00
Anders Broman 987a618d98 Add libgail.dll
svn path=/trunk/; revision=26165
2008-09-08 07:14:52 +00:00
Anders Broman ead74543b3 Fix a typo.
svn path=/trunk/; revision=26150
2008-09-06 18:01:47 +00:00
Anders Broman ad54e4ed0e Use GTK+ 2.14.1
What's new in GTK+ 2.14
=======================

GTK+ 2.14 adds new functionality while maintaining source and binary 
compatibility with GTK+ 2.12. Highlights of new features and
improvements in GTK+ 2.14 are:

New widgets and objects

 * GdkAppLaunchContext, provides startup notification with 
   g_app_info_launch()
 * GtkMountOperation, can ask for passwords when mounting 
   volumes with g_volume_mount()
 * GtkToolShell, an interface for containers of GtkToolItems

Noteworthy new APIs
 
 * gtk_show_uri(), a replacement for gnome_vfs_url_show() and
   gnome_url_show()
 * gtk_widget_get_snapshot(), using pixmap redirection to render 
   snapshots of widgets

Changes in the file chooser

 The file chooser uses GIO directly, loadable backends are no longer 
 supported. Autocompletion in the file chooser entry has been improved.

Changes in printing support
 
 The print dialog displays printer status information. Support for
 rearranging pages when printing multiple pages per sheet has been
 added to the cups backend. 

Accessibility support
 
 The gail module is shipped with GTK+, GtkBuilder supports
 accessibility attributes and GtkStatusIcon supports keyboard
 navigation.

Internationalization support

 The compose sequences understood by GTK+'s builtin input method
 have been synchronized with recent X.org compose sequences, adding
 a large number of new sequences. GTK+ no longer uses translations
 when an application is not translated to the current locale.

gdk-pixbuf changes

 * Support loading OS X icns format
 * Support loading JPEG 2000 images
 * Support loading and saving to GIO streams
 * Use GIO for mime information
 
GDK changes

 GDK uses Xrandr instead of Xinerama to provide more (and dynamic)
 monitor information. Font configuration changes are now picked up
 at runtime, without an application restart.

For more details and lists of fixed bugs, see the
announcements for the 2.13.x development releases:

http://mail.gnome.org/archives/gtk-devel-list/2008-February/msg00079.html
http://mail.gnome.org/archives/gtk-devel-list/2008-May/msg00112.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00033.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00158.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00044.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00182.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00023.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00153.html

svn path=/trunk/; revision=26148
2008-09-06 15:25:23 +00:00
Anders Broman 0535580316 Use latest glib.
svn path=/trunk/; revision=26141
2008-09-05 05:58:25 +00:00
Gerald Combs 85fb7e2305 _MSC_VERs 1400 and greater require manifests. Check against
MSC_VER_REQUIRED when we run mt.exe instead of checking for each
individual MSVC_VARIANT. This fixes the current buildbot test failures
on Windows, which resulted from a missing check for MSVC2008. This
also keeps us from having to mess with a bunch of makefiles when we add
support for new Visual C++ versions.

svn path=/trunk/; revision=26052
2008-08-21 18:12:47 +00:00
Gerald Combs 5906f69b88 On Windows, if we're running anything but plain Visual C++ 6 (including
VC6 plus a platform SDK), set INET6. Use that to figure out if we need
to define socklen_t for c-ares. This should fix bug 2797.

svn path=/trunk/; revision=25985
2008-08-11 21:59:59 +00:00
Gerald Combs 021a926793 Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS
code slightly.

This is not supported (yet) on the UNIX side.

svn path=/trunk/; revision=25953
2008-08-07 21:41:48 +00:00
Gerald Combs 811724ce01 Add --settag and --checktag arguments to win32-setup.sh, which respectively
save and verify the current download tag. Add --settag and --checktag calls
to the process_libs target. (This should automatically notify everyone when
wireshark-win32-libs is updated, which I tend to forget to do.)

svn path=/trunk/; revision=25931
2008-08-05 17:00:34 +00:00
Gerald Combs 7d8e29f501 From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

svn path=/trunk/; revision=25921
2008-08-04 23:05:32 +00:00
Anders Broman 2207fb2aff Use the latest GTK libraries for GTK+ 2.12.11
svn path=/trunk/; revision=25777
2008-07-21 10:03:47 +00:00
Gerald Combs e26c414928 Use the latest wireshark-win32-libs tag (updated zlib).
svn path=/trunk/; revision=25745
2008-07-15 16:27:30 +00:00
Bill Meier dbc6a778a8 From: Kovarththanan Rajaratnam; Add Windows browse file makefile target
svn path=/trunk/; revision=25665
2008-07-03 00:16:28 +00:00
Jeff Morriss 83f9ecf96f Move privileges.c and unicode-utils.c from epan to wsutil (so things like
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules).  Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.

svn path=/trunk/; revision=25640
2008-06-30 17:16:29 +00:00
Gerald Combs 72965329b0 Remove a lot of vestigal GTK-Wimp stuff. It's been included with
GTK+ since version 2.8, when its name was changed to the "GTK MS
Windows-Engine."

Simplify the Windows installer by removing the GTK-Wimp option (which
means the "Wireshark" item can be an entry instead of a group). Move
Rawshark to the "Tools" group.

(If anyone wants to disable the MS Windows Engine they can still do so
after installation by disabling or removing libwimp.dll.)

svn path=/trunk/; revision=25611
2008-06-26 16:42:07 +00:00
Gerald Combs 48c21706f2 Add TurboCap-related changes from /trunk-1.0:
From Dustin Johnson: Add support for TurboCap.
  - packet-ppi.c: Add aggregation and 802.3 extended information.
  - capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.

Make pcap_list_datalinks and pcap_set_datalink mandatory on Windows.

svn path=/trunk/; revision=25593
2008-06-24 21:16:22 +00:00
Bill Meier 46386986fa Use editcap_SOURCES and capinfos_SOURCES in Windows Makefile
svn path=/trunk/; revision=25524
2008-06-22 15:13:08 +00:00
Bill Meier 7ed148d6ec Fix editcap Windows build problem.....
svn path=/trunk/; revision=25501
2008-06-21 13:03:18 +00:00
Anders Broman 69be6a73f2 Use GTK+ 2.12.10
svn path=/trunk/; revision=25437
2008-06-10 05:35:38 +00:00
Anders Broman 2640b786f4 Fix run checkapi for more targets.
svn path=/trunk/; revision=25414
2008-06-03 05:35:19 +00:00
Anders Broman 4f9cd6c27d Fix run checkapi for more targets.
svn path=/trunk/; revision=25380
2008-05-26 17:09:03 +00:00
Anders Broman 36d89bb79c Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25368
2008-05-23 05:55:34 +00:00
Jeff Morriss a5cee04fad Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.

svn path=/trunk/; revision=25354
2008-05-22 15:46:27 +00:00
Anders Broman c5b4b98a8f Let the buildbot run a some of the checkapi targets.
svn path=/trunk/; revision=25348
2008-05-21 20:27:15 +00:00
Bill Meier aaeee9acca Create temporary empty checkapi target so no Windows buildbo build error
svn path=/trunk/; revision=25334
2008-05-20 23:50:10 +00:00
Jeff Morriss 58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Tomas Kukosa b202c984e3 Update GnuTls to gnutls-2.3.8-1
svn path=/trunk/; revision=25309
2008-05-16 06:53:15 +00:00
Tomas Kukosa a1d164a5da Update to Portaudio pa_stable_v19_20071207
svn path=/trunk/; revision=25285
2008-05-13 07:39:23 +00:00
Tomas Kukosa 27ccd63ce7 Update to WpdPack 4.0.2 and NASM 2.02
svn path=/trunk/; revision=25278
2008-05-12 19:13:55 +00:00
Jaap Keuter cacee64927 From Hans-Peter Bock:
Attached to this post you find a patch for integration into wireshark that adds
a dissector for SERCOS III, ethertype 0x88cd.

svn path=/trunk/; revision=25270
2008-05-10 14:44:32 +00:00
Anders Broman 3d39efc2c3 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25248
2008-05-07 05:26:40 +00:00
Anders Broman 8fbe2f530a Use cairo-1.6.4-1 and pango-dev-1.20.2
svn path=/trunk/; revision=25165
2008-04-24 19:45:29 +00:00
Anders Broman a0866910ef Use Libsmi 0.4.8
svn path=/trunk/; revision=25147
2008-04-22 19:28:44 +00:00
Anders Broman 5d068af3c6 Use latest Glib version.
svn path=/trunk/; revision=25136
2008-04-21 19:16:22 +00:00
Ulf Lamping d1c7021840 try to fix adns build on MSVC2003 and alike
svn path=/trunk/; revision=25051
2008-04-15 20:26:51 +00:00
Ulf Lamping 2e505267a8 as we can't easily (re)build adns on msvc6, create and use compiler specific dirs (e.g. MSVC2005EE/adns) to place the compiler specific dll/lib files into
svn path=/trunk/; revision=25000
2008-04-13 21:21:25 +00:00
Ulf Lamping 27b9b6cb8e we can't easily (re)build ADNS on MSVC6, because iphlpapi.h is needed (sic!)
-> so don't do the delete/rebuild on MSVC6 machines

svn path=/trunk/; revision=24997
2008-04-13 18:46:47 +00:00
Ulf Lamping f2012542c0 attempt to build ADNS on none MSVC6 systems - with the same mechanism as done with ZLIB
Unfortunately, both dep and rc files need to be patched, so I added the patched files

It's an ugly solution but it seems to work ...

svn path=/trunk/; revision=24996
2008-04-13 17:58:04 +00:00
Ulf Lamping 075a4d5dad disable ADNS stuff for now
svn path=/trunk/; revision=24981
2008-04-13 15:20:00 +00:00
Ulf Lamping 35681c074c first preparations to build ADNS_DLL
svn path=/trunk/; revision=24978
2008-04-13 14:45:43 +00:00
Ulf Lamping 22045b4a54 lot's of GTK1 related code cleanup in the Win32 build process
svn path=/trunk/; revision=24854
2008-04-09 03:48:16 +00:00
Ulf Lamping 73c84a7d7b remove more GTK1 stuff from the Win32 build process (incomplete)
svn path=/trunk/; revision=24780
2008-04-05 01:22:53 +00:00
Anders Broman 533063e063 Use the latest GTK libraries.
svn path=/trunk/; revision=24711
2008-03-21 16:15:21 +00:00
Anders Broman 5d7eef17d3 Get the Windows build going again.
svn path=/trunk/; revision=24705
2008-03-20 20:41:23 +00:00
Gerald Combs d4ba88b677 Use libgmodule-2.0-0.dll 2.14.5 for the GTK+1 version of Wireshark.
svn path=/trunk/; revision=24703
2008-03-20 00:30:47 +00:00
Gerald Combs d3f4acf0c0 Update to the latest User's Guide.
svn path=/trunk/; revision=24684
2008-03-18 02:11:03 +00:00
Gerald Combs 7519d12f8f Make sure the Infiniband plugin is properly built and packaged.
svn path=/trunk/; revision=24634
2008-03-14 21:53:16 +00:00
Bill Meier de432167c8 From Chris Maynard: Add missing clean_setup items;
svn path=/trunk/; revision=24497
2008-02-28 14:54:05 +00:00
Bill Meier 6dd33f26f6 Add rawhark_OBJECTS to clean: target
svn path=/trunk/; revision=24375
2008-02-18 13:22:00 +00:00
Bill Meier 69a44d1cb8 Clean-up: remove obsolete references to GTK libraries, ETHEREAL_EUG_DIR, etc
svn path=/trunk/; revision=24365
2008-02-16 21:07:19 +00:00
Anders Broman 363524d728 Use gtk+ 2.12.8 glib 2.12.6-2 and pcre 7.0.
( Problem seemed to be with pxbuffloaders).

svn path=/trunk/; revision=24357
2008-02-16 16:35:49 +00:00
Gerald Combs 98bacb3556 Add rawshark, a utility that, when given raw pcap-formatted packets and
a list of fields, prints the field values found in each packet.

Packet data can be specified as a libpcap DLT, e.g. "EN10MB" or an upper-layer protocol, e.g. "http".

svn path=/trunk/; revision=24339
2008-02-15 23:20:32 +00:00
Bill Meier 718b14c7ce Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
Bill Meier 1401a76e91 For Windows: Update to use Gtk+ 2.12.6; Use latest Glib 2.14.5 again;
Gtk 2.12.6 fixes bugzilla.gnome.org bug #503326 which thus means that
Wireshark no longer needs a work-around for Wireshark bug #2066. 
(See svn #24219).

svn path=/trunk/; revision=24221
2008-01-29 18:55:28 +00:00
Sake Blok c024c88a0b Revert GTK+/GLIB to GTK+ 2.12.1 with GLib 2.14.3 for Windows installs
as a workaround for bug 2066. We should stick to these versions until
bug report #503326 on bugzilla.gnome.org has been fixed.


svn path=/trunk/; revision=24219
2008-01-29 10:48:53 +00:00
Anders Broman 2e5732b7ae New gettext-runtime
svn path=/trunk/; revision=24206
2008-01-27 14:26:11 +00:00
Bill Meier fa83e20a08 dumpcap link: remove duplicate epan/unicode-utils.obj
svn path=/trunk/; revision=24111
2008-01-16 04:40:18 +00:00
Anders Broman cd93b15841 Use New GTK packages:
Overview of Changes from GLib 2.14.4 to GLib 2.14.5
===================================================

* Bugs fixed:
 482313 gregex: no way to tell why compilation failed
 315437 extern inline -> static inline
 480122 g_module_open fails to open modules with ".la" extension
 495589 gspawn.c failing to set FD_CLOEXEC
 500638 gkeyfile speedup ...
 503029 g_time_val_from_iso8601 parse non-ISO8601 dates
 503420 gkeyfile leaks a hash table 

Overview of Changes from GTK+ 2.12.3 to 2.12.4
==============================================

 * Bugs fixed:
 494667 gdkpixloader jpeg loader problems with some files
 496546 Tooltips may crashe because a window is destroyed
 503824 gtk_paned_find_neighbours aborts with assertion failure
 388321 gtk_notebook_remove_tab_label
 503190 Doesn't build with directfb >= 1.0
 491847 gtk-builder-convert --root option doesn't work for GtkWin...
 492977 Setup autorelease pool automatically in each mainloop ite...
 499951 GtkAssistant remove_page may leave current_page as a dang...
 502250 Leak in gtkfilechooserdefault.c:shortcuts_reload_icons()
 503569 Leak in GtkTreeViewColumn
 504753 Destroyed subviews are not removed from the view hierarchy
 504804 Typo in TEST_EXPAND_ROW signal
 504984 Problems with hiding/showing transient windows
 505708 compatibility macros for signals has wrong type.
 506107 mem leak in print dialogue
 502850 gtk-builder-convert program not found
 504749 gtk-builder-convert and GtkMenu 

GTK+ 2.12.5
This release fixes an incomplete icon cache that was
accidentally shipped in 2.12.4.

svn path=/trunk/; revision=24101
2008-01-15 20:18:04 +00:00
Stig Bjørlykke e189eb8887 Added copy of ethercat.dll, as pointed out by Peter Johansson.
svn path=/trunk/; revision=24088
2008-01-14 12:05:33 +00:00
Anders Broman 6fbf8be77d Build with assembler support (NASM).
svn path=/trunk/; revision=23947
2007-12-25 15:55:19 +00:00
Stig Bjørlykke 18b230372f Ensure we make $(INSTALL_DIR)/plugins on windows.
svn path=/trunk/; revision=23864
2007-12-14 17:52:53 +00:00
Anders Broman e0d9497f1c Use:
GTK+ 2.13.3
Overview of Changes from GTK+ 2.12.2 to 2.12.3
==============================================

 * Win32:
 - Respect viewable drive restrictions 

 * Bugs fixed:
 499868 fix for crash during DnD on Quartz
 500804 null pointer dereference in quartz drawing function
 144269 GtkHPaned flickers and leaves widgets in child panels unr...
 495124 Valgrind error with windows of type GTK_WINDOW_POPUP
 501583 Root window not fully initialized

 * Updated translations:
 Estonian (et)
 French (fr)
 Irish (ga)

svn path=/trunk/; revision=23771
2007-12-05 18:09:44 +00:00
Tomas Kukosa 08bbd29c71 Support for RPCAP features in GUI (from Boris Misenov, see Bug 1366)
- retrieving the list of remote PCAP interfaces
  - password authentication support
  - UDP data fransfer
  - packet sampling (available in WinPcap 4.x)
  etc.

fix problem if non-default rpcap port is used

svn path=/trunk/; revision=23750
2007-12-04 11:19:29 +00:00
Ulf Lamping 99d60cce59 first steps to support MSVC 2008 Express Edition
svn path=/trunk/; revision=23691
2007-11-30 22:01:05 +00:00
Anders Broman 26c07ee766 Update to gtk+ 2.14.2 and glib glib-2.14.4
svn path=/trunk/; revision=23674
2007-11-29 21:34:38 +00:00
Bill Meier 7f9585782d Fixes for Windows build w/o ZLIB
svn path=/trunk/; revision=23651
2007-11-28 20:06:21 +00:00
Tomas Kukosa ff7c20938e Various changes with focus to startup speedup
The startup timeout on Win32 is reduced to 80% without assembler and to 50% with assembler usage (which is optional)
proto.c
 - do not look up in filed tree and inserts in two steps but do it at once
 - next few small speedups
 - some often called elementary functions can be optionally implemented in assembler
 - dispart some functions to see more exact result from profiling
packet-tpnc.c
 - do not reallocate memory for each filed

svn path=/trunk/; revision=23643
2007-11-28 10:18:16 +00:00
Graeme Lunt 24f27a48ec Support for the automatic configuration of the UPX dll/exe packer.
config.nmake - default UPX to the downloaded version in $WIRESHARK_LIBS
win32-setup.sh - updated to also add executables bit to exes - and also use new tag
Makefile.nmake - to download UPX (and also use new version of user-guide)


svn path=/trunk/; revision=23562
2007-11-24 11:45:51 +00:00
Anders Broman 21e67b4fa1 Use glib-2.14.3
svn path=/trunk/; revision=23440
2007-11-13 06:11:24 +00:00
Anders Broman 405be3098f From Valery Sigalov:
New dissector for TPNCP protocol.
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1853

svn path=/trunk/; revision=23428
2007-11-11 13:23:17 +00:00
Graeme Lunt cea89f8c12 Initial Portable Apps (www.portableapps.com) packaging to produce a "Wireshark Portable" (WSP) distribution.
This allows Wireshark to be run from any USB stick, unlike the U3 packaging which must be installed on a specific U3 device.

The packaging basically builds upon the U3 distribution so new libraries/config only need to be added to the U3 makefile to update both distributions.

It still takes a "dumb" approach to WinPcap - installing it if it is not already installed and removing it (if WSP installed it) when Wireshark quits. (This is worse than the U3 packaging which only uninstalls WinPcap when the device is removed.) Really must talk to the WinPcap guys to see how we can make this less intrusive.

I am talking to John Haller (the Portable Apps guy) about fine tuning the distribution. 


svn path=/trunk/; revision=23340
2007-11-02 13:47:23 +00:00
Bill Meier 488ca683ad Fix Windows build error if not using LUA; Bug #1950
svn path=/trunk/; revision=23296
2007-10-28 13:46:20 +00:00
Gerald Combs 8f05294027 For the Wireshark/TShark -> dumpcap signal pipe on Windows, use a named
pipe instead of stdin.  Add an argument (currently the parent PID) back
to the "-Z" flag and use it to construct the pipe name.  This lets us
pass the parent's stdin handle to dumpcap, which lets us capture from
stdin on Windows.  Add a comment about checking for the parent process.

In capture_loop.c, remove the wait_forever argument from cap_pipe_select()
since it was always FALSE.  Set the timeout under Windows to 250 ms
instead of 250000 ms.

svn path=/trunk/; revision=23279
2007-10-26 16:32:28 +00:00
Martin Mathieson db530cf7af Allow wimaxasncp plugin to be found in Windows dev build.
svn path=/trunk/; revision=23235
2007-10-22 10:03:22 +00:00
Anders Broman 4f35e112ac Use gtk 2.12.1
svn path=/trunk/; revision=23229
2007-10-18 21:29:19 +00:00
Bill Meier 2ec096726e Oops: Backout the library updates until libraries configured for download... (??)
svn path=/trunk/; revision=23228
2007-10-18 19:47:45 +00:00
Bill Meier d56cc3d7fc Updated GTK/Glib/Pango Libraries
svn path=/trunk/; revision=23227
2007-10-18 19:30:56 +00:00
Jeff Morriss b33945ca1f text2pcap now depends on libwiretap (for eth_fopen()) but only on Windows. Make it depend on libwiretap on *NIX, too, only to keep things in sync.
svn path=/trunk/; revision=23209
2007-10-16 18:28:27 +00:00
Anders Broman 3c419f798c Make MGCP a builtin dissector to reduce the number of plugins.
(Leave the MGCP plugin dir for now).

svn path=/trunk/; revision=23190
2007-10-15 18:57:10 +00:00
Bill Meier 4644ce7263 Fix Windows maintainer-clean/distclean/clean to recurse thru subdirs only once (instead of worst-case 1+2+3 times)
svn path=/trunk/; revision=23187
2007-10-15 16:44:31 +00:00
Bill Meier f287f6c40f fix 'nmake ... clean' to include dumpcap specific objects
svn path=/trunk/; revision=23144
2007-10-11 01:24:36 +00:00
Anders Broman 6b4a7ba74d Use GTK+ 2.12
svn path=/trunk/; revision=22955
2007-09-25 16:09:58 +00:00
Jörg Mayer 094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Bill Meier 257215ffbd Fix my earlier typo.
svn path=/trunk/; revision=22835
2007-09-10 14:00:12 +00:00
Ulf Lamping 82823c4e1e don't try to put a ## comment after the touch call, this will end up in a few strange new files generated
svn path=/trunk/; revision=22830
2007-09-09 13:09:14 +00:00
Ulf Lamping 8329489054 - "quote" source dir of packaging_zip1 and packaging_zip2, so it also works with spaces in this path
- epan now depends on zlib and wiretap, add dependencies accordingly

svn path=/trunk/; revision=22799
2007-09-05 23:09:39 +00:00
Bill Meier c2d927e6a2 Verify existence of required downloaded library packages during make after Makefile.nmake updated
svn path=/trunk/; revision=22769
2007-09-02 20:53:15 +00:00
Ulf Lamping a8d0136ed8 always compile zlib.dll from source (even on MSVC6 now), this simplifies the makefiles a bit and (more important) removes an annoying behaviour if you switch between compiler versions - you'll need to run the setup target each time you switch
svn path=/trunk/; revision=22714
2007-08-28 20:31:48 +00:00
Luis Ontanon 15948507ae Get smi_modules in the distrib
svn path=/trunk/; revision=22694
2007-08-27 22:06:47 +00:00
Luis Ontanon 088ba70162 libsmi was missing from the CFLAGS
svn path=/trunk/; revision=22676
2007-08-26 21:35:17 +00:00
Anders Broman ef9971610c Use config and makefile from Chris Maynard and Luis instead.
svn path=/trunk/; revision=22672
2007-08-26 20:03:23 +00:00
Anders Broman d4e158db74 Download libsmi
svn path=/trunk/; revision=22671
2007-08-26 19:17:03 +00:00
Richard van der Hoff e184617c04 complete the death of the h223 plugin
svn path=/trunk/; revision=22635
2007-08-24 13:44:59 +00:00
Jaap Keuter b65cc92385 Add the UNISTIM plugin to Wireshark.
svn path=/trunk/; revision=22558
2007-08-20 20:50:29 +00:00
Ulf Lamping 0a4e09493a add IANA port-numbers file as a file named "services", with some minor explanations from me at the top of that file
add it to the distributed files, to the Win32 NSIS and U3 packages. UNIX packages will still miss this (optional) file.

svn path=/trunk/; revision=22487
2007-08-12 20:54:30 +00:00
Anders Broman 8ae37d9391 Use the latest GTK2 packages
svn path=/trunk/; revision=22482
2007-08-10 11:42:31 +00:00
Gerald Combs f60e81aaac Fix compilation under VS6 (hopefully without breaking compilation
anywhere else).  Instead of using getaddrinfo() and getnameinfo(),
promote inet_pton.c and inet_ntop.c to the top level and use those
routines instead.

(It's 2007, for crying out loud.  Why is this even an issue?)

svn path=/trunk/; revision=22075
2007-06-11 18:26:09 +00:00
Gerald Combs a491fec183 From Mike Harvey: Support for WiMAX and the WiMAX M2M encapsulation protocol.
Add support for WiMAX and M2M to various makefiles and installer files.  Add
basic support for M2M to randpkt.

svn path=/trunk/; revision=21945
2007-05-25 23:40:42 +00:00
Luis Ontanon 11f06217ce Have editcap and capinfos loading the wiretap plugins.
epan/filesystem.c
   have get_plugin_dir() calling init_plugin_dir() if necessary

epan/epan.c and epan/report_err.c
   move the report_failure family into the new report_err.c file, have epan_init() calling the initializer

epan/plugins.h and epan/proto.c
   do not have init_plugins() calling the proto_reg functions instead do it in init_proto()

gtk/main.c and tshark.c
   init_plugin_dir() has become suprefluous

capinfos.c and editcap.c
   load the wiretap plugins

Makefiles
   do what's needed to build withe the above changes.




svn path=/trunk/; revision=21935
2007-05-25 17:22:32 +00:00
Gerald Combs 55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Gerald Combs 253eee10e2 Update to the latest Win32 libraries.
svn path=/trunk/; revision=21770
2007-05-14 17:07:34 +00:00
Ulf Lamping dd8feca514 from Gerhard Gappmeier (ascolab):
new dissector for OPCUA protocol

svn path=/trunk/; revision=21760
2007-05-14 13:58:54 +00:00
Ulf Lamping 6ace4fef21 fix manifest dll error
svn path=/trunk/; revision=21736
2007-05-09 06:35:13 +00:00
Ulf Lamping 0abc3ba979 instead of copying the MSVC 2005 manifest files around, embed them into the .exe / .dll files - this way is easier to handle while packaging and alike, and probably will solve some problems. We might want to do this for the plugins as well later.
svn path=/trunk/; revision=21696
2007-05-06 09:17:19 +00:00
Gerald Combs 161c7f8b8c If MSVCR_DLL or VCREDIST_EXE are defined, add them to the zip packages.
Zip the entire directory instead of just the top-level contents.

svn path=/trunk/; revision=21378
2007-04-10 21:30:40 +00:00
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