When testing if we can add things to LDFLAGS, don't set LDFLAGS to CFLAGS
if the test determines that the flag cannot be added to LDFLAGS.
(Simple typo: LDFLAGS_saved was being set to CFLAGS instead of LDFLAGS.)
svn path=/trunk/; revision=38434
If we don't find python-config, set want_python to no, so the
end-of-configuration message says we're not using the Python
interpreter. Also fix some cases where we were setting want_zlib rather
than want_python (cut-and-pasteo).
svn path=/trunk/; revision=37654
items.
Add some quoting to the zlib tests, just in case the argument contains
white space.
Clean up capitalization of Lua and Python.
Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.
svn path=/trunk/; revision=37652
need to use its presence in zlib as a proxy for "not the crufty old zlib
that comes with some versions of X11".
Do, however, check for inflatePrime() there, instead, just in case the
crufty old zlib that comes with some versions of X11 lack it; this is to
prevent the configure script from assuming a shiny new zlib by testing
with a non-X11 program, causing the build to fail when you build
Wireshark.
svn path=/trunk/; revision=36969
ac_supports_gcc_flags and ac_supports_W_linker_passthrough flags, the
first of which, for now, we set for GCC and clang, and the latter of
which we set for GCC, clang, and xlc (probably true for some other
compilers as well).
Rename AC_WIRESHARK_GCC_LDFLAGS_CHECK to AC_WIRESHARK_LDFLAGS_CHECK, as
it's not checking for anything GCC-specific. (Leave
AC_WIRESHARK_GCC_CFLAGS_CHECK unrenamed for now, as the flags we test
with it are originally GCC flags that clang also supports for GCC
compatibility.)
Fix some string-equality tests to use = rather than ==; the former is
what the test/[ command uses.
Don't turn on "-no-cpp-precomp" for clang - it whines if you do.
svn path=/trunk/; revision=36731
"supports GCC-style -W flags", etc., and may want to improve the check
for "is this clang", as well as deciding what other stuff should be done
if we have clang as well. clang should, I think, largely be
gcc-compatible at the command line.
svn path=/trunk/; revision=36729
ones; it appears that at least one user's -ligemacintegration has both
(see bug 4823), and we should choose the new ones in that case.
Also, always set have_ige_mac if we have the functions.
Fix tpyoes while we're at it.
svn path=/trunk/; revision=33106
Call the various flavors of OS X integration just "OS X integration",
not anything with "IGE" in it - it appears that, in some places,
"ige-mac-integration" refers only to the older Carbon-based functions,
although the library still appears to be called -ligemacintegration.
Update the URLs for the information about the OS X integration
libraries.
Clean up help message for --with-pcap-remote.
Clean up white space a bit.
Speaking of white space, it's "Mac OS X", not "MacOS X".
svn path=/trunk/; revision=32941
pcap_set_buffer_size() did as well, so there aren't any libpcap releases
with pcap_create() but not pcap_set_buffer_size().
Only do one check for pcap_create.
svn path=/trunk/; revision=32695
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
Using pcap create and pcap_activate should make it possible
to set the capture buffer size on Linux systems as well as Windows.
Help to implement it would be apreciated :-)
Ref:
http://seclists.org/tcpdump/2009/q3/151
svn path=/trunk/; revision=32687
substitute our own (I wrote them all, so I can steal them from the
BSD-licensed libpcap if I want :-)). This means that
linktype_name_to_val() and linktype_val_to_name() are always available,
and we don't need to #ifdef use of them.
Use pcap_datalink_val_to_description() to get the description for a
particular DLT_ value, rather than mapping the DLT_ value to a
WTAP_ENCAP_ value and getting the description for the latter.
svn path=/trunk/; revision=27074
back to what they were before the test (without GTK_LIBS).
This prevents tshark (and every other program) from unnecessarily linking
against GTK_LIBS.
svn path=/trunk/; revision=27056
GeoIP can map IP addresses to Countries, Cities, AS numbers, ISPs,
etc. If any library paths are defined AND any database files are found,
corresponding columns are added to the endpoint tables in the GUI.
To do:
- Add columns to the conversation list
- Add GeoIP info to "-z conv,..."
- Create a default UAT file.
svn path=/trunk/; revision=26571
only in the Gtk+ OS X framework, but also in the separate igemacintegration
library. Also add call to ite_mac_menu_set_menu_bar() to synchronize the
OS X menu bar with the Gtk menu bar in Wireshark. The Gtk menu bar in
Wireshark will remain there.
svn path=/trunk/; revision=26560
just leak the list returned by pcap_list_datalinks(), as there's no
guarantee that if you have a library built with one version of the
MSVC++ run-time library, and it returns a pointer to allocated data, you
can free that data from a program linked with another version of the
MSVC++ run-time library. (This is not an issue on UN*X.)
This should fix bug 2677.
svn path=/trunk/; revision=25668
That means that G_GINT64_MODIFIER will be defined, so don't check
whether it's defined.
We don't use the PRI[douxX]64 macros, as we use the GLib print routines
and thus use G_GINT64_MODIFIER instead. Get rid of the checks for
whether inttypes.h defines PRI[douxX]64; just check whether it exists at
all.
That means we don't set INTTYPES_H_DEFINES_FORMATS, so don't check for
it.
svn path=/trunk/; revision=25243
unusable; it'd only be unusable if we require that functions be declared
before they're used (i.e., if we check for that with -Wimplicit and if
we fail if the check produces a warning because we're using -Werror).
Always checking doesn't necessarily work if, for example, you're not
compiling with GCC, as -Werror and -Wimplicit might not be recognized by
other compilers.
svn path=/trunk/; revision=24287
- 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
In all the places where a cast to "long long" or "unsigned long long"
was done, use G_GINT64_MODIFIER and get rid of the cast, as
1) there's no guarantee that "%ll" works
and
2) there's no guarantee that "long long" works
(the latter definitely does *NOT* work with MSVC++; the former doesn't
work with regular printf in MSVC++, but it might work with the GLib
printf-based functions).
svn path=/trunk/; revision=21978
corresponding to the library version for pcap_breakloop. Issue a warning if the
pcap_breakloop is present but not usable.
svn path=/trunk/; revision=21498
might have been set to ifavailable, but other parts of the configure
script expect it to be "yes" or "no" after
AC_WIRESHARK_LIBPORTAUDIO_CHECK finishes.
svn path=/trunk/; revision=19606
is missing. Also I changed the behaviour to just disable
ucd snmp in case it was requested but no --with-ssl was
given instead of bailing out with an error.
svn path=/trunk/; revision=19335
actually do something useful except to print that the new API is not
supported.
Adapt acinclude.m4 to provide PORTAUDIO_API_1 and add back the
check_message to indicate *why* we are checking for the type.
svn path=/trunk/; revision=19148
one ourselves.
The documentation for autoconf isn't very clear on the "includes"
argument to AC_CHECK_TYPE - it's in the form of a list of #include
statements.
svn path=/trunk/; revision=19140
portaudio versions <= 18. At least Suse 10.1 provides a snapshot
of version 19, which, in turn has the brand new and incompatible
version 2.0 of the API. Change the error message to tell the
user that he needs portaudio <= 18.
svn path=/trunk/; revision=19133
Note: This check is currently carried out by checking that the include
defines PortAudioStream. If you know of any better check, please let
me know.
acinclude.m4:
Replace sequences of 8 spaces by tab
svn path=/trunk/; revision=19131
- 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
Provide one in aclocal-fallback. While I'm at it: Remove
the libgnutls.m4 stuff from acinclude and provide it in
aclocal-fallback as well.
svn path=/trunk/; revision=18475
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
- Fail if with-lua was given but liblualib is missing
- Make the test for liblualib succeed on my system
(make sure the test gets linked with liblua and libm).
svn path=/trunk/; revision=17198
I have developed an external plugin to enable ssl decryption in
ethereal.
Me
- Remove unnecessary $Id$ from acinclude.m4
- Added packet-ssl-utils.h to Makefile.common
- Fixed a few warnings
TODO
- Lots of warning fixes (see separate mail)
- Reformat function headers to read like the others do
(return value<newline>function-name...)
- Test on Windows platform
- Review the patch to packet-ssl.c and new files packet-ssl-utils.[hc]
svn path=/trunk/; revision=17156
filter after installing the filter.
Set HAVE_PCAP_LIB_VERSION if we're building with WinPcap 3.1; it's not
present in earlier versions, but is present in current 3.1 betas.
Check HAVE_PCAP_LIB_VERSION when building capture-wpcap.c.
svn path=/trunk/; revision=13872
Check whether krb5.h defines KEYTYPE_ARCFOUR_56 - not all versions do
(in particular, the Heimdal that comes with FreeBSD 4.6 doesn't).
packet-kerberos.h includes krb5.h if we hae Heimdal; we don't need to do
so in packet-spnego.c.
svn path=/trunk/; revision=13828
whatever reason, the changequote() hack doesn't seem to be working, at
least on OS X; the square brackets were simply being removed from the
messages).
Rename the "ifpresent" value for the --with variables to "ifavailable",
to match the help messages.
At least for the SNMP libraries, have the "checking" message just say
"whether to use XXX" and have the result message say "yes, if available"
if the user didn't explicitly specify "--with" or "--without", as the
default just leaves the library out if it doesn't work, but explicitly
specifying "--with" means you get an error if it doesn't work.
Make "--with-net-snmp" fail if the headers aren't present (if the user
explicitly asks for something, we should fail if we can't give it to
them, as they presumably really wanted it).
svn path=/trunk/; revision=13789
Note that the "=PATH" argument to "--with-net-snmp" is optional.
If "--with-net-snmp" is specified, give an error if Net-SNMP is found
but "--with-ssl" wasn't specified, as the user has specified that they
really want a version of Ethereal with Net-SNMP; if it's not specified,
just warn of that and drive on, as we did before.
svn path=/trunk/; revision=13786
make spnego able to decrypt data wrapped inside
GSSAPI/SPNEGO/KRB5 arcfour-hmac
This code will be more etherealified and evolve into being able to link with MIT as well.
svn path=/trunk/; revision=13659
<glib.h> when checking for the format for 64-bit integers, as, on
Solaris 2.5.1, <glib.h> ends up defining a function that requires stuff
from glib, and the test program isn't linked with glib - including
<glibconfig.h> is sufficient to get guint64 defined, and that's all we
need.
svn path=/trunk/; revision=12282
whether it requires -lresolv), restore LIBS after we're done regardless
of whether we found it or not - we use KRB5_LIBS in the Makefiles,
rather than adding the Kerberos libraries to LIBS directly.
svn path=/trunk/; revision=12134
find it's not, always report "no", even if we're going to give up
because the user specified --with-krb5, so the "sorry, you don't have
Heimdal" message shows up on a line of its own.
svn path=/trunk/; revision=12119
library, don't disable dissection and drive on, report an error and
stop; --with-krb5 means "build this with Kerberos", not "build this with
Kerberos if you can" (no -krb5 option at all means "build this with
Kerberos if you can").
If they *didn't* specify --with-krb5 and we don't have a usable Kerberos
library, set want_krb5 to "no", so that at the end of the configure
script we don't say we're building with the Kerberos library (otherwise,
want_krb5 is "ifpresent", but the stuff to print the configuration
options treats anything other than "no" as meaning "yes").
svn path=/trunk/; revision=12118
sprint_realloc_objid(), and the extra libraries we're using with the
tests, along the lines of what we do with the Kerberos 5 library.
svn path=/trunk/; revision=12108
of the test for sprint_realloc_objid() (so that a failure to find it
when we're not linking with extra libraries doesn't cause us to assume
we won't find it if we *do* link with extra libraries), so
"ac_cv_lib_snmp_sprint_realloc_objid" doesn't get set - set our own
variable for that.
Use AC_TRY_LINK rather than AC_CHECK_LIB in the Kerberos tests when
checking for krb_k5_resolve(), to avoid caching the results.
Improve the messages printed in the Kerberos tests to give more detail.
svn path=/trunk/; revision=12106
--with flags.
Report, in the messages at the end of the configure script, whether
we're building with the SSL library.
If we fail to find "sprint_realloc_objid()" when linking with a
particular library, and --with-ssl wasn't specified, try linking with
-lcrypto as well and, if that succeeds, fail with an indication that UCD
SNMP requires -lcrypto but --with-ssl wasn't specified.
svn path=/trunk/; revision=12105
user explicitly says to do so by using --with-ssl. However, we *still*
don't want to just blithely replace -lcrypto with SSL_LIBS, so, if
KRB5_LIBS contains "-lcrypto" but SSL_LIBS isn't set to a non-empty
string, we report an error (the user can than either configure without
Kerberos or with -lcrypto).
svn path=/trunk/; revision=12103
platforms, it's missing because it's not needed, which is good because
it's not even *present* on those platforms (the resolver functions are
built into libc). If there really are platforms where krb5-config is
broken to the extent that it doesn't list -lresolv when it's required,
the way to fix that is to try building a program with Heimdal and just
the krb5-config libraries and, if that fails, try building with those
libraries and -lresolv - if that works, add -lresolv to the list of
libraries.
Don't just replace -lcrypto with SSL_LIBS in KRB5_LIBS, as SSL_LIBS
might not contain any libraries - replace it only if SSL_LIBS is defined
as something.
svn path=/trunk/; revision=12099
will either have "heimdal", in all lower case, in the version string in
the header file, or will write out, when you run "krb5-config
--version", a version string with "heimdal" in all lower case, so we
don't need to do case-insensitive matching, which is good - not all
versions of "sed" support the "i" flag (although you can do
case-insensitive matching by using regular expressions, if necessary).
svn path=/trunk/; revision=11915
it's usable - one of the updates to OS X 10.3 updated libpcap to
0.8[.x], so that it had "pcap_findalldevs()", but didn't update
"pcap.h", so it didn't declare "pcap_if_t", so you couldn't actually
*use* it. You can work around that by installing the pcap.h (and
pcap-bpf.h) from the matching tcpdump.org release, but, as even when
that version of OS X is pre-installed rather than being the result of a
Software Update, you still don't get the new "pcap.h" (at least I didn't
get it on my PowerBook with 10.3.4). Therefore, we check whether a
program that calls "pcap_findalldevs()" *and* declares a "pcap_if_t *"
to pass to it can be compiled and linked with -lpcap, and only declare
HAVE_PCAP_FINDALLDEVS if we can.
Also, don't check for the functions added to libpcap after
"pcap_findalldevs()" was added unless we have a usable
"pcap_findalldevs()", as, if not, those functions won't be declared in
"pcap.h" either, so we'll get compiler warnings.
svn path=/trunk/; revision=11745
as those are what's used in Ethereal for 64-bit integers, and as there's
no guarantee that either of them will be defined on any particular
platform.
svn path=/trunk/; revision=11513
Jeff Morriss