Commit Graph

137 Commits

Author SHA1 Message Date
Sebastien Tandel a265df648d update of AC_WIRESHARK_PCAP_CHECK to detect if pcap header version is
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
2007-04-22 13:38:50 +00:00
Sebastien Tandel 706627f882 adding AC_(WIRESHARK|WIRETAP)_GCC_CFLAGS_OPTION macro to test whether gcc
supports the options passed as arguments. If the options are supported, they
are added to CFLAGS.


svn path=/trunk/; revision=21493
2007-04-22 09:27:21 +00:00
Luis Ontanon 093a98d5c0 the -lm flag might be needed to link lua
svn path=/trunk/; revision=20315
2007-01-04 22:45:43 +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
Jeff Morriss 51143fa1ef Bug 1246: From Eric Hall, fix typo: s/NETSNMPCNFIG/NETSNMPCONFIG/
svn path=/trunk/; revision=19984
2006-11-26 08:28:09 +00:00
Jörg Mayer 6cd3bd1202 Don't include /usr/local if usage of /usr/local has been disabled via
configure option.

svn path=/trunk/; revision=19706
2006-10-26 14:50:03 +00:00
Guy Harris 11d3c15ca0 Set want_portaudio to yes if we'll be building with libportaudio; it
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
2006-10-19 09:16:49 +00:00
Jörg Mayer 6bdaea253b Change some messages when ucd snmp is found but --with-ssl
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
2006-09-27 11:03:22 +00:00
Guy Harris 1ae3d4e86e AC_CHECK_TYPE already prints a "checking for" message; don't bother
printing another one before calling it.

svn path=/trunk/; revision=19223
2006-09-12 20:24:42 +00:00
Jörg Mayer 72651ba02d rtp_player.c will now compile with the new API, although it will not
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
2006-09-05 09:17:55 +00:00
Guy Harris 6b70649f74 AC_CHECK_TYPE outputs a "Checking..." message; we don't need to issue
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
2006-09-04 22:47:16 +00:00
Jörg Mayer 2b6f72aa98 After some reading it is clear that the code was written for
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
2006-09-04 14:16:50 +00:00
Jörg Mayer 56934c59cb Use portaudio if it's there. Check that we have the right version.
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
2006-09-04 13:34:48 +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
Anders Broman aa98f8dadd From Bálint Réczey
- Added support for versioned lua libnames to aclocal.m4
- create generated elua_register.h from Makefile

svn path=/trunk/; revision=18769
2006-07-19 19:20:58 +00:00
Jörg Mayer 60a546c1cf autofoo will fail on systems that lack libgcrypt.m4.
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
2006-06-15 20:25:01 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14: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
Guy Harris 134c7734b3 Check several sets of additional libraries that libpcap might need
(-lcfg -lodm on AIX with the current tcpdump.org libpcap, -lpfring with
the ring buffer stuff on Linux).

svn path=/trunk/; revision=17996
2006-04-25 18:01:43 +00:00
Jörg Mayer 97d857e20b Recent checkins lost a change to make the liblualib check succeed on
Suse 9.3 (original checkin r17198).

svn path=/trunk/; revision=17353
2006-02-19 11:02:20 +00:00
Luis Ontanon d9462b4a45 Prepare for lua 5.1
svn path=/trunk/; revision=17346
2006-02-18 04:03:24 +00:00
Jörg Mayer 325f8b88ba lua autofoo:
- 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
2006-02-07 09:49:38 +00:00
Jörg Mayer 9ba6da080a Paolo Abeni
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
2006-02-04 23:44:05 +00:00
Luis Ontanon c8dd927e0c It was hard.. but at the end I won (or at least i believe so...).
After install hello_world.lua works.


svn path=/trunk/; revision=17137
2006-01-31 22:22:05 +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
Guy Harris d5bad28951 Use "pcap_get_selectable_fd()" if we have it, and if it returns -1,
don't do a "select()".

svn path=/trunk/; revision=14358
2005-05-12 03:31:33 +00:00
Guy Harris 46e1907f13 If we have "pcap_freecode()", use it to free the instructions for a BPF
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
2005-03-23 01:25:01 +00:00
Guy Harris 0af4492612 Don't try to run net-snmp-config if we don't find it.
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
2005-03-20 19:29:22 +00:00
Guy Harris 61c7ec6534 Fix the display of help information for various --with arguments (for
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
2005-03-17 05:09:42 +00:00
Guy Harris da00482b66 Capitalize "Net-SNMP" the way the Net-SNMP project capitalizes it.
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
2005-03-16 23:53:49 +00:00
Ronnie Sahlberg 58269e6e95 we dont need to link with gssapi.a any more
svn path=/trunk/; revision=13666
2005-03-08 21:36:04 +00:00
Ronnie Sahlberg 6e6e082d34 when HEIMDAL is linked with :
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
2005-03-08 09:45:19 +00:00
Jörg Mayer 927f53301c Dectect MIT-Kerberos as well
svn path=/trunk/; revision=12302
2004-10-15 06:51:48 +00:00
Guy Harris 78c036980e From Albert Chin: in a test program, include <glibconfig.h> rather than
<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
2004-10-12 18:00:39 +00:00
Jörg Mayer d18c4821e2 At least on Suse, the linking flags are obtained via krb5-config --libs,
not --cflags.

svn path=/trunk/; revision=12147
2004-09-30 07:14:18 +00:00
Guy Harris 54e48e1dbf Use the right name in the Checking... messages.
svn path=/trunk/; revision=12137
2004-09-29 17:45:48 +00:00
Guy Harris 46ba180b03 Put back the $KRB4_CONFIG call to set KRB5_LIBS.
svn path=/trunk/; revision=12136
2004-09-29 17:38:53 +00:00
Guy Harris 649ecd7e8c When testing whether the Heimdal library has krb5_kt_resolve (and
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
2004-09-29 09:58:22 +00:00
Guy Harris 9d71c8da5b If, when checking whether the Kerberos library is Heimdal or not, we
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
2004-09-28 04:47:10 +00:00
Guy Harris 242499c091 If the user specified --with-krb5 but we don't have a usable Kerberos
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
2004-09-28 04:41:57 +00:00
Guy Harris f62467ec34 Explicitly indicate when we're doing tests to see if UCD SNMP contains
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
2004-09-26 22:30:46 +00:00
Guy Harris f3381337cc In the SNMP tests, we're using AC_TRY_LINK to avoid caching the results
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
2004-09-26 20:30:44 +00:00
Guy Harris aa580a0cca Clean up a bunch of cruft in --with-ssl; make it more resemble other
--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
2004-09-26 04:00:20 +00:00
Guy Harris 64124c3adb Explicitly test whether we need -lresolv in order to link with -lkrb5.
Include -lresolv if we do, and don't include it if we don't.

Clean up some other things in the -lkrb5 macro.

svn path=/trunk/; revision=12104
2004-09-26 00:26:06 +00:00
Guy Harris b1bde8fe6a For annoying licensing reasons, we don't want to use -lcrypto unless the
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
2004-09-25 23:58:42 +00:00
Guy Harris d0842822ad Don't just add "-lresolv" to KRB5_LIBS if it's missing - on some
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
2004-09-25 09:33:53 +00:00
Guy Harris cdb4a5f4d5 From Marten Svantesson: according to Tomas Anders, all versions of Heimdal
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
2004-09-06 19:49:54 +00:00
Guy Harris f7190ff4c7 Fix a typo.
svn path=/trunk/; revision=11747
2004-08-16 02:23:41 +00:00
Guy Harris 334a55a2ce For "pcap_findalldevs()", don't assume that just because it's in -lpcap
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
2004-08-16 01:11:23 +00:00