Commit Graph

102 Commits

Author SHA1 Message Date
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
Guy Harris aa1e053ce6 If we have pcap_breakloop(), at least on UN*X we can stop the capture
with a pcap_breakloop() call - we don't need to call select() before
calling pcap_dispatch().

Even if we do need to call select(), we don't need to supply it with a
timeout - it's OK if we block indefinitely, as the signal will interrupt
select().

That also means we can pass -1 as the count to pcap_dispatch(), as
pcap_breakloop() will terminate the loop in pcap_dispatch().

Use sigaction() to catch SIGUSR1, so we can make sure that the signal
handler doesn't get reset when the signal is delivered, and that system
calls don't restart when we return from the signal handler.

svn path=/trunk/; revision=18201
2006-05-21 21:32:04 +00:00
Luis Ontanon de1c20ad4b Define HAVE_LUA_5_1 on windows as that what we have.
svn path=/trunk/; revision=17640
2006-03-15 22:30:28 +00:00
Gerald Combs 9406c5db24 Use Unicode for all native Win32 calls. Unicode Windows applications
use UTF-16 internally and GTK+ 2.x uses UTF-8, which means we have to
do a lots of conversions.

Add utf_8to16() and utf_16to8 convenience functions to strutil.c.

svn path=/trunk/; revision=17534
2006-03-08 20:55:32 +00:00
Gerald Combs 050525cfb5 Add Lua support by default for Win32. Fix some compilation problems.
Add Lua information to the version paragraph.

svn path=/trunk/; revision=17440
2006-03-01 21:31:07 +00:00
Jörg Mayer 83068a9b9d Paolo Abeni:
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm
>fixing it and cleaning a bit the windows side configuration. I hope to
>post soon the fix.


The attached patch should fix the issue. I missed to modify the
config.win32 file and I misstyped a few macros name.


svn path=/trunk/; revision=17200
2006-02-07 10:26:20 +00:00
Ulf Lamping c3187174bf replace *a lot* of file related calls by their GLib counterparts. This is necessary for the switch to GTK 2.6 (at least on WIN32).
to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.

deleted related things from config.h.win32

As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.

svn path=/trunk/; revision=16403
2005-11-06 22:43:25 +00:00
Guy Harris 3808fc02a1 Add PRIX64, as we now use it.
svn path=/trunk/; revision=15811
2005-09-15 06:04:33 +00:00
Ulf Lamping 994496a184 several times replacing:
sprintf -> g_snprintf
snprintf -> g_snprintf
vsnprintf -> g_vsnprintf
strdup -> g_strdup

svn path=/trunk/; revision=15412
2005-08-18 19:31:15 +00:00
Gerald Combs 200ff9dc52 Pick up some fixes and enhancements from
http://cvs.fedora.redhat.com/viewcvs/rpms/ethereal/FC-4/:

In the LPD dissector, make lpd_client_code a value_string so that we
don't segfault.  Do the same for lpd_server_code, although it's not
strictly necessary.

Check to see if htmlview is installed, and use it as our HTML viewer.

The Fedora RPM has other patches, but I'm not sure if they should
be applied.


svn path=/trunk/; revision=15143
2005-07-29 21:55:45 +00:00
Ulf Lamping f6831ab340 bugfix: mark pcap_freecode() as optional, as it's not available by WinPcap 2.3
add optional pcap_next_ex() which is currently unused

svn path=/trunk/; revision=14412
2005-05-21 09:59:49 +00:00
Gerald Combs 02032272ad When we dynamically discover a Kerberos key, it helps to add it to the
key list.  In the Nettle code, clear the key list and re-read the key
file when the key file preference changes.

Remove a redundant define in config.h.win32.

svn path=/trunk/; revision=12471
2004-11-01 23:54:05 +00:00
Gerald Combs fee16ab377 Add support for decoding DES3/CBC/MD5 keys. Make it disabled by default.
Whitespace cleanup.

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

svn path=/trunk/; revision=12139
2004-09-29 19:30:10 +00:00
Guy Harris 29753bf6b2 From Gisle Vanem: add support for pcap_datalink_val_to_name() for Win32.
Also add support for pcap_datalink_name_to_val(), and arrange that we
properly define HAVE_PCAP_DATALINK_NAME_TO_VAL and
HAVE_PCAP_DATALINK_VAL_TO_NAME for MSVC++ builds.

svn path=/trunk/; revision=12073
2004-09-23 17:54:49 +00:00