Commit Graph

116 Commits

Author SHA1 Message Date
Kovarththanan Rajaratnam 2547ce21bf We no longer support the old plugin API so remove it completely from the build system
svn path=/trunk/; revision=29821
2009-09-09 14:01:57 +00:00
Kovarththanan Rajaratnam 974849a9a0 Remove strcasecmp. We use g_ascii_strcasecmp exclusively
svn path=/trunk/; revision=29643
2009-08-31 19:47:50 +00:00
Kovarththanan Rajaratnam 612f839c1f Reorder (no functionality change)
svn path=/trunk/; revision=29640
2009-08-31 18:59:21 +00:00
Kovarththanan Rajaratnam dc958a440b Remove PRId64, PRIu64, PRIx64, PRIX64, and PRIo64 which are unused
svn path=/trunk/; revision=29638
2009-08-31 18:38:07 +00:00
Kovarththanan Rajaratnam 499695595e Remove superfluous config parameters
svn path=/trunk/; revision=29633
2009-08-30 18:30:14 +00:00
Kovarththanan Rajaratnam b4e821bf0f Remove outdated comments regarding ZLIB_DLL. We don't have to define this before including zlib.h. This is automatically done if _WIN32 is defined
svn path=/trunk/; revision=29632
2009-08-30 17:23:47 +00:00
Kovarththanan Rajaratnam 59a1af9c99 Add a couple of comments to HAVE_DIRECT_H, HAVE_WINDOWS_H and HAVE_WINSOCK2_H
svn path=/trunk/; revision=29631
2009-08-30 17:09:40 +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
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
Anders Broman ddad90c3e3 Make it possible to configure use of NEW_PACKET_LIST and fix
one compile error. It still fails in file.c trying to include gtk/gtk.h in new_packet_list.h

svn path=/trunk/; revision=28903
2009-07-01 08:23:32 +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 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 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 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
Anders Broman 79de16f83c Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
svn path=/trunk/; revision=25170
2008-04-25 06:42:37 +00:00
Guy Harris 947e70b4b7 Delete the *right* config.h.win32.
Copy the MSVC++-version-checking stuff from it into the top-level
config.h.win32, and try to set up config.nmake so that MSC_VER_REQUIRED
is defined in all Makefiles that include config.nmake.

svn path=/trunk/; revision=23802
2007-12-07 23:58:46 +00:00
Guy Harris 8b87d048e9 Deleted the wrong config.h.win32.
svn path=/trunk/; revision=23801
2007-12-07 23:52:42 +00:00
Guy Harris 034bdaeb9b That's not the right way to resuscitate a file.
svn path=/trunk/; revision=23800
2007-12-07 23:52:21 +00:00
Guy Harris af15ea1ca7 Deleted the wrong config.h.win32.
svn path=/trunk/; revision=23799
2007-12-07 23:48:18 +00:00
Guy Harris 8b14380c28 Run runlex.sh from the tools directory. Get rid of the extra copy in
the top-level directory.

Don't build config.h in the wiretap directory - it now uses config.h
from the top-level directory.  Get rid of the template config.h.win32 in
that directory.

Get rid of files that are no longer in the wiretap directory or are no
longer constructed in that directory.

svn path=/trunk/; revision=23797
2007-12-07 23:38:59 +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
Tomas Kukosa 25b1014599 remove forgotten @HAVE_NET_SNMP@
svn path=/trunk/; revision=22937
2007-09-24 12:46:02 +00:00
Guy Harris e6f1cf9384 Fix a comment.
svn path=/trunk/; revision=22810
2007-09-06 16:57:41 +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
Richard van der Hoff bea90e8c33 In keeping with all the other path variables (eg, libdir), don't resolve
plugindir at configure time. Instead leave it to be defined at make
time, which means it can then be changed by, eg, changing $prefix. This
also means moving the definition of PLUGIN_DIR from config.h to a -D in
CPPFLAGS.


svn path=/trunk/; revision=22617
2007-08-24 00:06:30 +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 3aec86adcb fix compiler version detection logic, sorry for the noise!
svn path=/trunk/; revision=20614
2007-01-29 22:40:52 +00:00
Anders Broman 5aff8deff1 Comment out Ulfs changes to be able to do a test build.
svn path=/trunk/; revision=20609
2007-01-29 20:58:46 +00:00
Ulf Lamping 88af5759da add a check if the MSVC_VARIANT setting and the current _MSC_VER #define matches - to avoid problems if a developer forgets to set MSVC_VARIANT in config.nmake corresponding to his environment
svn path=/trunk/; revision=20591
2007-01-28 20:58:50 +00:00
Bill Meier 09f508b57b A few more ethereal --> wireshark
svn path=/trunk/; revision=20559
2007-01-26 01:34:29 +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
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 af15bf7782 it's HAVE_LIBGNUTLS instead HAVE_GNUTLS
svn path=/trunk/; revision=19214
2006-09-12 17:34:41 +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
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 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
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
Ulf Lamping 5b4a4a7ea3 fix for bug #1025: It should be no longer necessary to use the I64x format string for Win32, simply use the llx format string as for the Unix variants, which should be safe as we only use GLib's g_snprintf() function instead of the MSVC one's from snprintf.h
The real cause of this: There's a bug in GLib's snprintf implementation which crashes with the I64x format string and certain (negative?) values.

svn path=/trunk/; revision=18883
2006-08-12 21:06:24 +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 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 cb1089a5b1 Remove remaining instances of NEED_SNPRINTF_H. Fix up whitespace.
svn path=/trunk/; revision=18775
2006-07-20 17:45:52 +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 c52c646842 Apply The Written Word's patch from bug 333, which changes HAVE_ICONV_H
to HAVE_ICONV.

svn path=/trunk/; revision=18758
2006-07-18 15:54:03 +00:00
Gerald Combs f7e38bd5e6 Change ETH_VAR_IMPORT to WS_VAR_IMPORT. Try to fix a duplicate variable
definition in the Catapult DCT2000 code.

svn path=/trunk/; revision=18524
2006-06-20 18:30:54 +00:00
Gerald Combs 8d6c73e567 More ethereal -> wireshark.
svn path=/trunk/; revision=18292
2006-05-31 22:34:21 +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