osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
42,028 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

508 Commits

Author SHA1 Message Date
Anders Broman e48dcbaf15 Replace deprecated glib functions. 
set DG_DISABLE_DEPRECATED for windows build.

svn path=/trunk/; revision=38394
 2011-08-07 19:08:41 +00:00
Anders Broman 7bcc6dd237 - Get rid of deprecated functions. 
- Include pangocairo.

svn path=/trunk/; revision=38317
 2011-08-03 14:54:03 +00:00
Anders Broman 8f54d76a77 - Always build with GSEAL_ENABLE 
svn path=/trunk/; revision=38252
 2011-07-29 10:12:48 +00:00
Gerald Combs 1f497af628 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake 
use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119
 2011-07-19 18:22:46 +00:00
Gerald Combs e7fce8ccb8 Pull WIRESHARK_LIBS from the system environment if it's available. 
svn path=/trunk/; revision=38114
 2011-07-19 16:26:42 +00:00
Anders Broman 46bcd096a8 Include Cairo lib to be able to use caro functions. 
svn path=/trunk/; revision=38066
 2011-07-17 13:18:55 +00:00
Gerald Combs add36f416d Use the latest libsmi package. Note that we now support OID resolution 
on 64-bit Windows.

svn path=/trunk/; revision=37808
 2011-06-27 20:48:26 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not 
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
 2011-06-23 23:04:03 +00:00
Gerald Combs 8d88f3a790 Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or 
pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696
 2011-06-17 17:52:31 +00:00
Gerald Combs 6e040f6c0d Bump the wiretap version. 
svn path=/trunk/; revision=37571
 2011-06-06 16:29:23 +00:00
Anders Broman 4f525e3a78 Remove HAVE_AIRPDCAP 
svn path=/trunk/; revision=37495
 2011-05-31 21:38:39 +00:00
Gerald Combs 2c5e7ef953 FOP 0.95 → 1.0. 
svn path=/trunk/; revision=37300
 2011-05-19 19:03:22 +00:00
Gerald Combs 1c831b6343 1.5.2 → 1.7.0. 
svn path=/trunk/; revision=37148
 2011-05-14 20:17:37 +00:00
Anders Broman b699fa89ee Move MAIN_MENU_USE_UI_MANAGER outside of if win32. 
svn path=/trunk/; revision=37141
 2011-05-14 13:15:56 +00:00
Jakub Zawadzki b680407847 Conditional support for packet-editor [default=no]. 
svn path=/trunk/; revision=37084
 2011-05-12 17:14:59 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option. 
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
 2011-05-12 10:56:26 +00:00
Jeff Morriss 6ff4737f44 On Windows: don't (try but fail--the code did not work) to define 
HAVE_GZLCEARERR.  Define HAVE_INFLATEPRIME if we HAVE_LIBZ.

svn path=/trunk/; revision=36954
 2011-04-29 17:30:23 +00:00
Chris Maynard be832727cd Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The 
Windows-7-x64 buildbot doesn't like it and reports the following:
LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH'

svn path=/trunk/; revision=36730
 2011-04-20 05:21:32 +00:00
Gerald Combs b971a0ef5d Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS. 
svn path=/trunk/; revision=36722
 2011-04-19 19:20:03 +00:00
Anders Broman 25ab8f9594 Ok let's try GTK 2.22 on Win64 too - fix a typo. 
svn path=/trunk/; revision=36623
 2011-04-13 15:46:39 +00:00
Anders Broman 81e330976e Ok let's try GTK 2.22 on Win64 too. 
svn path=/trunk/; revision=36620
 2011-04-13 14:38:58 +00:00
Anders Broman 2d38d00656 Try out GTK 2.22 
svn path=/trunk/; revision=36619
 2011-04-13 13:42:41 +00:00
Anders Broman 8532a6f8af Restore defaults 
svn path=/trunk/; revision=36618
 2011-04-13 05:43:07 +00:00
Anders Broman 3db53e54ba Build win64 with a modified zlib (google is your friend). 
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0

First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.

svn path=/trunk/; revision=36616
 2011-04-13 04:47:38 +00:00
Bill Meier 8587721abb Fix nasm pathname: nasm-2.09-08\nasm.exe ==> nasm-2.09.08\nasm.exe 
svn path=/trunk/; revision=36596
 2011-04-12 17:53:23 +00:00
Anders Broman b5125be726 Build with zlib-1.2.5 for win32 
zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
 * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
 * wrong. So make sure any such macros misguidedly defined by the
 * user have no effect. Windows has large file support, but the
 * official zlib DLL has not been built to provide the 64-bit offset
 * APIs, sigh.  So we have just patched out the 64-bit offset API
 * from this header file.
 */

svn path=/trunk/; revision=36586
 2011-04-12 15:44:05 +00:00
Gerald Combs d7d45f8072 1.5.1 → 1.5.2. Reenable Babel. 
svn path=/trunk/; revision=36540
 2011-04-10 17:03:43 +00:00
Gerald Combs 92c8f32ff7 Use the latest library tag, which updates GNUTLS. Add code to check for 
libintl-8.dll and add the GNUTLS version if needed.

svn path=/trunk/; revision=36483
 2011-04-05 22:38:12 +00:00
Bill Meier dbc7c80782 Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer supports the old packet list) 
svn path=/trunk/; revision=36165
 2011-03-08 14:55:07 +00:00
Gerald Combs 2009cc6f17 Update some of the "Details" properties in the installer. Remove the 
32-bit BMPs from the installer icon; they don't appear to render properly.

svn path=/trunk/; revision=36113
 2011-03-01 19:40:51 +00:00
Gerald Combs 6095647db2 Fix a typo. 
svn path=/trunk/; revision=36021
 2011-02-21 18:42:19 +00:00
Bill Meier 4099dfa603 Update a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and WARNING_ARE_ERRORS 
svn path=/trunk/; revision=35952
 2011-02-15 16:56:31 +00:00
Bill Meier dcb5dfe207 Enable /analyze:WX- only if ENABLE_CODE_ANALYSIS is defined ... 
svn path=/trunk/; revision=35951
 2011-02-15 16:40:09 +00:00
Gerald Combs 7bd9a9c607 Enable Enterprise Code Analysis via the ENABLE_CODE_ANALYSIS environment 
variable.

svn path=/trunk/; revision=35946
 2011-02-14 18:58:37 +00:00
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup: 
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
 2011-02-02 01:19:53 +00:00
Gerald Combs 2b3eddb842 Add an option to enable Code Analysis for C/C++ (MSVC's static analyzer). 
svn path=/trunk/; revision=35688
 2011-01-28 18:42:49 +00:00
Gerald Combs 5d46856320 Use the correct processor architecture in our manifest. This lets us 
create a usable wireshark.exe for x64 using Visual C++ 10.  Change the
name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately
reflect what it's used for. Allow MSVC_VARIANT to be set from the
system environment, mainly to keep me from accidentally clobbering it
in the future.

svn path=/trunk/; revision=35687
 2011-01-28 00:21:05 +00:00
Gerald Combs 1635ef0ddf 1.5.0 → 1.5.1. 
svn path=/trunk/; revision=35639
 2011-01-24 19:27:38 +00:00
Chris Maynard 252861e6af Updates for Wireshark portable installer. Using nsis unicode now. 
svn path=/trunk/; revision=35300
 2010-12-29 20:41:53 +00:00
Stephen Fisher 52b99dc191 Remove "not tested" note on MSVC 2010's vcredist instructions 
svn path=/trunk/; revision=35040
 2010-11-27 18:52:02 +00:00
Stephen Fisher d1108eebab Remove comment stating that Microsoft Visual Studio 2010 doesn't work since the express edition does (and presumably the full edition does also) 
svn path=/trunk/; revision=35031
 2010-11-26 17:54:45 +00:00
Bill Meier a6c0c9738f From Michael Wells: Fix "missing path seperator in config.nmake" 
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5378

svn path=/trunk/; revision=34829
 2010-11-09 23:03:47 +00:00
Gerald Combs cfe3d49619 From g.khueny via bug 5346: 
If PYTHON_DIR is specificed in config.nmake the variable will be overritten by
PYTHON_DIR=C:\Python$(PYTHON_VER). 
It looks like the problem was created by revision 34246.

svn path=/trunk/; revision=34673
 2010-10-28 16:29:39 +00:00
Anders Broman b7d293bdc0 Target system changed by mistake. 
svn path=/trunk/; revision=34594
 2010-10-20 20:49:30 +00:00
Anders Broman 2f9403ab15 Prepartaions to use GTK 2.22 
svn path=/trunk/; revision=34593
 2010-10-20 20:41:39 +00:00
Anders Broman dd551b6585 Use the new GTK bundles. 
svn path=/trunk/; revision=34382
 2010-10-05 15:46:13 +00:00
Sake Blok 6c97a708c9 Make "bpf_image" available on Windows. This enables the "Compile BPF" button and "dumpcap -d" on Windows. 
svn path=/trunk/; revision=34357
 2010-10-03 22:42:27 +00:00
Sake Blok f3e94f6753 Retry of SVN 34338, now tested on my WinXP dev VM: 
Use pcap_open_dead instead of pcap_create for the compile BPF button. 



svn path=/trunk/; revision=34340
 2010-10-03 12:04:18 +00:00
Stephen Fisher d0244ffa9a Allow up to Python 2.7 now (was 2.6) and move Python build statements into same part of nmake file for ease of use. 
svn path=/trunk/; revision=34246
 2010-09-24 23:50:38 +00:00
Jeff Morriss d8310ff499 Assume we HAVE_GZCLEARERR on Windows and when using cmake 
svn path=/trunk/; revision=34192
 2010-09-23 05:50:10 +00:00
Gerald Combs a87bdf9660 Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy(). 
svn path=/trunk/; revision=34137
 2010-09-16 19:20:06 +00:00
Bill Meier 03b7c7b8fa I suspect the changes to config.nmake committed in SVN #33942 were not intended. 
Revert the changes (for now ?) so the Buildbot will run again.

svn path=/trunk/; revision=33945
 2010-08-26 23:40:27 +00:00
Anders Broman d4e0b348cf Doxygen fixes. 
svn path=/trunk/; revision=33942
 2010-08-26 20:31:09 +00:00
Gerald Combs 607b228df6 Add ws_load_library and ws_module_open, which respectively call 
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
 2010-08-25 20:30:59 +00:00
Jeff Morriss 43af5f6344 Update the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 on Win64 too (for consistency more than anything I think). 
svn path=/trunk/; revision=33923
 2010-08-25 18:20:56 +00:00
Jeff Morriss 44f8a8824e Change PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps builds to pick up WinPcap again. 
svn path=/trunk/; revision=33921
 2010-08-25 15:27:14 +00:00
Jaap Keuter 93497759a3 Remove experimental marker from NEW_PACKET_LIST. 
svn path=/trunk/; revision=33719
 2010-08-05 19:11:35 +00:00
Gerald Combs 349fac664b 1.3.6 -> 1.5.0 
svn path=/trunk/; revision=33138
 2010-06-07 16:43:09 +00:00
Gerald Combs fe79af8f42 From Kovarththanan Rajaratnam via bug 3500: 
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
 2010-06-01 22:20:15 +00:00
Gerald Combs 55c48a28ed Our default target platform is still win32. 
svn path=/trunk/; revision=32698
 2010-05-06 23:58:18 +00:00
Anders Broman f9981411f1 Checking in Stigs changes from 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475
BUT not activating the check for 
pcap_create()
pcap_set_buffer_size()
This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic.

The code for handling the 'B' option should be OK in any case.

svn path=/trunk/; revision=32688
 2010-05-06 18:34:30 +00:00
Gerald Combs e535271512 1.3.5 -> 1.3.6. 
svn path=/trunk/; revision=32667
 2010-05-05 00:28:24 +00:00
Bill Meier 0303dfbf9f Manifests are not needed when building with VC10. 
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

svn path=/trunk/; revision=32540
 2010-04-22 19:35:47 +00:00
Anders Broman f739b285c9 Add settings for "Microsoft Visual Studio 2010" note that 
Wireshark does not build with Visual studio 10 yet.

svn path=/trunk/; revision=32529
 2010-04-21 05:23:29 +00:00
Gerald Combs 6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link. 
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
 2010-04-09 21:42:51 +00:00
Bill Meier a5b180a3a8 Add coment about why 'links' fails if it is used to generate release-notes.txt 
svn path=/trunk/; revision=32387
 2010-04-05 19:42:07 +00:00
Gerald Combs ab71d9d92b 1.3.4 -> 1.3.5. 
svn path=/trunk/; revision=32345
 2010-03-31 22:54:07 +00:00
Gerald Combs 12e2df52e1 Update c-ares to 1.7.1. 
svn path=/trunk/; revision=32293
 2010-03-26 18:36:27 +00:00
Guy Harris 1e0bcd0740 Define HAVE_PCAP_LIST_DATALINKS, HAVE_PCAP_FREE_DATALINKS, and 
HAVE_PCAP_SET_DATALINK only if we have the WinPcap development package;
otherwise, don't define them - if you don't have the WinPcap development
package when building on Windows, we don't define HAVE_LIBPCAP, so we
won't include any of the code controlled by those ifdefs in any case,
and, if you do have the WinPcap development package, you'll need to have
the 4.1 version (you won't need WinPcap 4.1 at run time, but you will
need the 4.1 development package at build time).

svn path=/trunk/; revision=32230
 2010-03-17 22:09:19 +00:00
Guy Harris 42a9ea8eaa Use the right #define value to check whether WinPcap has 
pcap_free_datalinks().

*Set* that #define, while we're at it.

svn path=/trunk/; revision=32220
 2010-03-17 18:04:21 +00:00
Gerald Combs a5b39ae47a Use the latest GTK+ 2.16 bundle. For the Win32 build this means downgrading 
from GTK+ 2.18. According to https://bugzilla.gnome.org/show_bug.cgi?id=598299
we should probably hold off on using 2.18 for a while.

svn path=/trunk/; revision=31992
 2010-02-24 21:08:09 +00:00
Guy Harris 2b2879b098 Correct GTK+ package for Win64. 
svn path=/trunk/; revision=31890
 2010-02-15 23:46:39 +00:00
Anders Broman 72cfbf1e01 Use the latest GTK bundle (2.18.7) 
svn path=/trunk/; revision=31882
 2010-02-15 20:57:50 +00:00
Gerald Combs 7e9faae9d9 1.3.3 -> 1.3.4. 
svn path=/trunk/; revision=31865
 2010-02-11 16:38:42 +00:00
Stephen Fisher 490be8cf45 Remove comment stating that GTK 2.12 is being used since Wireshark 0.99.7. 
Gerald just changed it from 2.16 to 2.18.


svn path=/trunk/; revision=31603
 2010-01-21 16:53:41 +00:00
Gerald Combs 16c2a0b4b0 Use the correct GTK_INST_VERSION. 
svn path=/trunk/; revision=31602
 2010-01-21 16:41:20 +00:00
Gerald Combs f1958a48f9 Drop our requirement for MSVCR71.DLL. 
svn path=/trunk/; revision=31578
 2010-01-19 22:58:12 +00:00
Gerald Combs 7b42cf5135 Use the official kfw packages. 
svn path=/trunk/; revision=31355
 2009-12-23 00:22:12 +00:00
Gerald Combs 8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages 
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
 2009-12-21 21:06:01 +00:00
Gerald Combs 7046509b99 Use the WinPcap version of pcap_datalink_val_to_description if it's 
present.  Add an entry for DLT_PPI in case it's not.

svn path=/trunk/; revision=31316
 2009-12-18 20:36:36 +00:00
Gerald Combs a9e185a062 Disable PCRE in the Win32 build. GRegex uses a newer version than we do 
and this matches the Win64 configuration.

svn path=/trunk/; revision=31304
 2009-12-18 01:29:56 +00:00
Gerald Combs 7524c0b963 Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installer 
build.

svn path=/trunk/; revision=31301
 2009-12-17 22:01:13 +00:00
Anders Broman e1b992ef3b Use gtk+-bundle_2.18.5-20091215_win32 
svn path=/trunk/; revision=31288
 2009-12-17 06:36:37 +00:00
Anders Broman 65a85f0fba Use gtk+-bundle_2.16.6-20091215_win32 
svn path=/trunk/; revision=31285
 2009-12-16 20:54:40 +00:00
Gerald Combs e5be652056 Fix compilation under Windows. Allocate our hash buffer dynamically so 
that _chkstk doesn't throw a hissy fit. When hashing, open the file in
binary mode.

svn path=/trunk/; revision=31192
 2009-12-08 00:13:57 +00:00
Gerald Combs f08e18e9a5 Switch back to normal versioning. Bump the version to 1.3.3. 
svn path=/trunk/; revision=31064
 2009-11-24 05:57:05 +00:00
Gerald Combs 907bf4e36b Switch from individual GLib, GTK+, and related packages to the all-in-one 
versions.

svn path=/trunk/; revision=31023
 2009-11-19 20:27:08 +00:00
Gerald Combs 23df4e7f01 Update the AirPcap code for Win64 and enable AirPcap for the 64-bit build. 
svn path=/trunk/; revision=30945
 2009-11-12 23:48:11 +00:00
Tomas Kukosa 7f38b7b889 Update to the GnuTLS 2.8.5 
svn path=/trunk/; revision=30930
 2009-11-11 09:58:29 +00:00
Gerald Combs cc036df5ea Updates for FOP 0.95. 
svn path=/trunk/; revision=30913
 2009-11-10 01:32:59 +00:00
Gerald Combs 0ead6b73ff Switch the default Fop version to 0.95 and adjust custom_layer_pdf.xsl 
accordinglty. Tweak the print resolution on all of the images again. Add
a MIME type for one of the images.

svn path=/trunk/; revision=30909
 2009-11-09 18:41:21 +00:00
Anders Broman a9c313a864 Bump development version. 
svn path=/trunk/; revision=30750
 2009-10-29 06:15:52 +00:00
Anders Broman c5ce562d60 Use pango 1.26 
svn path=/trunk/; revision=30687
 2009-10-25 09:59:40 +00:00
Gerald Combs 0bbe1cb546 Make the new packet list the default on Win64. 
svn path=/trunk/; revision=30668
 2009-10-23 00:16:34 +00:00
Gerald Combs 839977fd7d Fix the WpdPack version on Win64. 
svn path=/trunk/; revision=30665
 2009-10-22 17:00:26 +00:00
Anders Broman 89e9745ed5 Use 2.22.2-1 
svn path=/trunk/; revision=30653
 2009-10-21 06:01:36 +00:00
Gerald Combs 09a0650607 Update WinPcap and the developer's pack to 4.1.1. 
svn path=/trunk/; revision=30652
 2009-10-21 03:13:42 +00:00
Kovarththanan Rajaratnam 0c75135ffd Cleanup comments wrt. /MP 
svn path=/trunk/; revision=30337
 2009-10-05 17:43:27 +00:00
Ulf Lamping ab99aaf732 be more verbose how to get VCREDIST_EXE 
svn path=/trunk/; revision=30247
 2009-10-02 09:26:52 +00:00
Jaap Keuter a8a62d3e8b Bump version number after release of first development snapshot. 
svn path=/trunk/; revision=30007
 2009-09-20 09:19:59 +00:00