Commit Graph

834 Commits

Author SHA1 Message Date
Stig Bjørlykke 558cb4ee83 Set PCAP_NG_DEFAULT correct in config.h on win32.
svn path=/trunk/; revision=37697
2011-06-17 18:40:07 +00:00
Gerald Combs a24687ce8e Move the Windows argument list conversion code to a common routine.
svn path=/trunk/; revision=37372
2011-05-24 00:07:56 +00:00
Gerald Combs 3e2a422a83 Update the User's Guide.
svn path=/trunk/; revision=37312
2011-05-19 21:09:29 +00:00
Gerald Combs 99d4de66e5 From Dirk Jagdmann via bug 5875:
My attachment adds a link to a XSLT file to the preamble of the PDML.
The XSLT will transform the PDML to a HTML page, and the HTML page
features a look similar to Wireshark. See
http://cubic.org/~doj/ebay/a.pdml for an example.

The patch also contains a small perl program which converts the
Wireshark colortable into javascript code which is used in the XSLT
file. If you want to use a different color scheme you would execute the
perl program and insert the generated javascript function into your XSLT
file.

To view the HTML you could either place the PDML and XSLT file on your
webserver and verify that your webserver sends the PDML file as
"text/xml".  Then your webbrowser will find the linked XSLT file,
download that as well and convert the PDML to HTML on the fly.

You could also use an XSLT processor like xsltproc to convert the PDML
and XSLT into a static HTML file.


From me:

Minor fixups.

svn path=/trunk/; revision=37298
2011-05-19 18:10:21 +00:00
Chris Maynard 10ed235707 WANT_PACKET_EDITOR fixups for Windows.
svn path=/trunk/; revision=37091
2011-05-12 17:46:54 +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 be240d1de6 Oops, the Windows HAVE_GZCLEARERR stuff did work; take out the rest.
svn path=/trunk/; revision=36956
2011-04-29 18:30:16 +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
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 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 16bacf2afc Comments have to be at the beginning of the line.
svn path=/trunk/; revision=36072
2011-02-25 17:17:41 +00:00
Anders Broman ee0df56d25 Verify tools fails if wireshark-win32-libs does not exist.
svn path=/trunk/; revision=36069
2011-02-25 15:10:35 +00:00
Guy Harris 0bb81b40d5 Apparently, if the argument to the cd command in an nmake file contains
spaces, it needs to be quoted, the fact that, if the argument to a cd
command typed at cmd.exe contains spaces, it *doesn't* need to be quoted
nonwithstanding.

svn path=/trunk/; revision=35987
2011-02-17 21:21:40 +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
Bill Meier 483b52c8e7 Compile text2pcap.c,mergecap.c,capinfos.c,editcap.c, & version_info.c with -WX;
(Treat warnings as errors);
Done by simplifing the dependency line for the objects so that the
 default .c.obj inference rule is used.

svn path=/trunk/; revision=35564
2011-01-16 23:24:15 +00:00
Gerald Combs 3bc1fc3802 On Windows, convert all of our command-line arguments from UTF-16 to
UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8
instead of utf_16to8. This should fix bug 5520.

svn path=/trunk/; revision=35411
2011-01-06 23:28:58 +00:00
Jaap Keuter bc31879963 Drop Python dissectors directory flag from programs that don't have dissectors.
Win32: remove superfluous dumpcap build dependancy on wiretap.

svn path=/trunk/; revision=35365
2011-01-04 22:12:25 +00:00
Jaap Keuter 3656ecb823 Free dumpcap from linking to wiretap.
svn path=/trunk/; revision=35353
2011-01-04 07:06:01 +00:00
Stephen Fisher 587bd2724f Move native Win32 code to its own directory and out of gtk directory (hopefully without breaking any builds)
svn path=/trunk/; revision=35032
2010-11-26 19:16:06 +00:00
Bill Meier cf794aea59 Prevent "MS-DOS style path detected" messages for several commands (when "nodosfilewarning" not set).
svn path=/trunk/; revision=35006
2010-11-22 17:17:46 +00:00
Gerald Combs b2a92a4c35 Use the latest User's Guide.
svn path=/trunk/; revision=34470
2010-10-11 16:01:48 +00:00
Jeff Morriss 81b5ece966 It seems it's quite hard to set and retrieve environment variables in nmake (at least I can't figure it out). So, just cd back to MAKEDIR after cleaning up. This should get the buildbots going again and fix bug 5275.
svn path=/trunk/; revision=34381
2010-10-05 15:33:07 +00:00
Stephen Fisher afebfa60ca Try to make r34375 work every time
svn path=/trunk/; revision=34378
2010-10-04 22:53:18 +00:00
Stephen Fisher 5abf2b2c9f Use spaces instead of tabs on two lines added in r34375
svn path=/trunk/; revision=34377
2010-10-04 22:04:49 +00:00
Stephen Fisher 7b35e1195c Stop the MS-DOS style path name warnings when compiling on Windows.
svn path=/trunk/; revision=34375
2010-10-04 22:00:50 +00:00
Gerald Combs 0721b1ff79 Don't remove the services file. It isn't built in the same way that
sminmpec.c is.

svn path=/trunk/; revision=34373
2010-10-04 20:47:50 +00:00
Gerald Combs 3e84ad5147 Copy make-sminmpec.pl to make-services.pl and modify it to fetch the
IANA port-numbers file and save it to "services". Use it to update
"services".

svn path=/trunk/; revision=34371
2010-10-04 18:53:39 +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
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
Jeff Morriss 4584a81149 Revert 34081 and 34093 in preparation for a cleaner fix.
svn path=/trunk/; revision=34121
2010-09-15 15:13:17 +00:00
Jeff Morriss a81a10a63a From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton
is always linked in before wsock32's.  This means that our Windows-7 Win64
builds (on which there is a native inet_pton in wsock32) will still work on
pre-Vista Win64's.

svn path=/trunk/; revision=34093
2010-09-10 13:52:42 +00:00
Jeff Morriss 875c97aedf Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
Move libwsutil forward in the list of Wireshark libraries so that our inet_pton
is always used.

svn path=/trunk/; revision=34081
2010-09-08 16:51:12 +00:00
Guy Harris a6bd4f554a capinfos.c includes gcrypt.h, so it needs the GNU TLS flags.
svn path=/trunk/; revision=33536
2010-07-15 09:41:34 +00:00
Guy Harris 4b6f53894a There shouldn't be any need to build stuff in the top-level directory
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.

However, libwireshark *does* require the Lua flags, so use them.

svn path=/trunk/; revision=33534
2010-07-15 03:31:51 +00:00
Guy Harris 2326b33f0a No need to link dumpcap with libgnutls.
svn path=/trunk/; revision=33533
2010-07-15 03:28:42 +00:00
Gerald Combs f4bb9209ae Add a target which creates a zip file containing our .pdb files.
svn path=/trunk/; revision=33460
2010-07-06 22:35:33 +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
Jeff Morriss 47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +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
Bill Meier 201c878a4e (Trivial) Escape a '?' in an error message.
svn path=/trunk/; revision=32504
2010-04-18 14:08:12 +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
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 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
Guy Harris 7923c40e07 Include inet_pton.obj when building TShark, as we now need it.
(But it built on the Win64 buildbot; did Microsoft add it in later
releases?  If so, should we include it only if it's needed?)

svn path=/trunk/; revision=32107
2010-03-04 02:42:07 +00:00
Bill Meier b96c45d391 Enable command-line wildcard expansion when invoking mergecap and capinfos
by linking those executables with setargv.obj.
See http://www.wireshark.org/lists/wireshark-users/201002/msg00194.html
  (and preceeding messages in the thread).


svn path=/trunk/; revision=31943
2010-02-21 22:06:50 +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 f1958a48f9 Drop our requirement for MSVCR71.DLL.
svn path=/trunk/; revision=31578
2010-01-19 22:58:12 +00:00
Stig Bjørlykke 229d8368bc Set correct locale in make-version.pl instead of in Makefiles.
Added back add_custom_command for svnversion.h.
Removed unnecessary text2pcap_CLEAN_FILES.
Fix indent for ps.c command.

svn path=/trunk/; revision=31525
2010-01-14 15:43:33 +00:00