Commit Graph

164 Commits

Author SHA1 Message Date
Gerald Combs 7d22c0fb7f Rename geoip.[ch] to geoip_db.[ch] so we don't collide with GeoIP.h. Rename
some functions to match.

Add GeoIP lookups to the IP dissector. Add a preference for GeoIP lookups,
which is disabled by default.

svn path=/trunk/; revision=27063
2008-12-19 23:49:03 +00:00
Stig Bjørlykke 097002bb0d Detect Windows Server 2008 in the runtime version info.
svn path=/trunk/; revision=26979
2008-12-13 00:02:34 +00:00
Stig Bjørlykke 0470fff9fe Added info about GeoIP. Only dump info about ADNS if without c-ares.
svn path=/trunk/; revision=26578
2008-10-27 18:01:48 +00:00
Bill Meier afd857957a Fix a few Emacs "file variables" to have "safe" values.
That is: indent-tabs-mode: tabs --> indent-tabs-mode: t
Also: fix a typo: set-tabs-mode --> indent-tabs-mode

svn path=/trunk/; revision=26113
2008-09-02 11:17:03 +00:00
Guy Harris bee3c109d5 Fix a typo in a comment.
svn path=/trunk/; revision=26061
2008-08-23 01:40:00 +00:00
Stig Bjørlykke 6bea15f3cb Added c-ares version string.
svn path=/trunk/; revision=25988
2008-08-12 10:34:46 +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
Jeff Morriss 83f9ecf96f Move privileges.c and unicode-utils.c from epan to wsutil (so things like
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules).  Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.

svn path=/trunk/; revision=25640
2008-06-30 17:16:29 +00:00
Anders Broman 3d39efc2c3 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25248
2008-05-07 05:26:40 +00:00
Stig Bjørlykke 3b5f1bce7b Don't add newline before LIBCAP, as this is done correct in end_string().
svn path=/trunk/; revision=24563
2008-03-05 09:59:15 +00:00
Gerald Combs 626cd5efaa Add a POSIX capabilities blurb to get_compiled_version_info().
svn path=/trunk/; revision=24561
2008-03-04 23:57:55 +00:00
Stig Bjørlykke 5b87422976 Bump date
svn path=/trunk/; revision=24096
2008-01-15 14:34:03 +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
Stephen Fisher 432aa1788a Add MacOS X version next to the Darwin version in version outputs.
svn path=/trunk/; revision=23418
2007-11-10 00:57:41 +00:00
Guy Harris ea22a35acd We don't use NetSNMP any more.
svn path=/trunk/; revision=23021
2007-09-29 00:58:20 +00:00
Gerald Combs d2d4fcd903 Add routines under Windows to check if npf.sys is running, and to
fetch the major OS version.  If we're running Windows >= 6 (Vista)
_and_ npf.sys isn't running, warn the user in Wireshark and TShark.
Add a recent prefs item to disable the warning in Wireshark.

svn path=/trunk/; revision=22877
2007-09-15 00:18:17 +00:00
Luis Ontanon 088ba70162 libsmi was missing from the CFLAGS
svn path=/trunk/; revision=22676
2007-08-26 21:35:17 +00:00
Anders Broman 6c7f768c01 Fix a typo
svn path=/trunk/; revision=22675
2007-08-26 21:19:18 +00:00
Anders Broman c2c385fc9f Minor tweeks.
svn path=/trunk/; revision=22674
2007-08-26 21:01:13 +00:00
Jeff Morriss 0c17bfd3a8 From Eric Hall to fix bug 1289:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1289

Rename 'svnversion' to 'wireshark_svnversion' to resolve a symbol conflict with
GTK 2.10.6 (hmm, shouldn't GTK not be exporting that symbol or at least naming
it so as to prevent such collisions? Well, so should we, so...)

From Andreas Fink: change #ifdef for size_t in airdcap_interop.h to fix
compile on MacOS X.


svn path=/trunk/; revision=20726
2007-02-06 02:27:59 +00:00
Bill Meier 09f508b57b A few more ethereal --> wireshark
svn path=/trunk/; revision=20559
2007-01-26 01:34:29 +00:00
Luis Ontanon c8e3f9209c Fix version_info.c compilation
svn path=/trunk/; revision=20478
2007-01-18 14:04:49 +00:00
Luis Ontanon 81f9069fa2 the version string stated "without Lua" regardless or not Lua support was indeed built.
svn path=/trunk/; revision=20468
2007-01-18 03:13:10 +00:00
Jaap Keuter 04e34b975a Bump date
svn path=/trunk/; revision=20307
2007-01-04 13:46:29 +00:00
Jeff Morriss 2b67ffc5b3 Take out UCD-SNMP message since we no longer use it
svn path=/trunk/; revision=20199
2006-12-22 17:23:45 +00:00
Guy Harris a9023649b2 Fix the display of whether the program was built with Net-SNMP, now that
we no longer support UCD SNMP and no longer define HAVE_SOME_SNMP.

svn path=/trunk/; revision=20084
2006-12-09 22:34:13 +00:00
Ulf Lamping ca3d2d22e0 MS usually calls this a build number, not a patch (e.g. see the system version info)
svn path=/trunk/; revision=19643
2006-10-20 20:21:52 +00:00
Guy Harris b12232d7a1 Do the word-wrapping in end_string(), once the string is completely
constructed.  Clean up the insertion of ", ".

Put the runtime libpcap version into the runtime version info.

svn path=/trunk/; revision=19625
2006-10-20 09:06:24 +00:00
Jaap Keuter 22a949a42f Make dumpcap complile again and other minor improvements.
svn path=/trunk/; revision=19624
2006-10-20 06:24:56 +00:00
Gerald Combs 2f053534b1 Remove an extra space.
svn path=/trunk/; revision=19621
2006-10-19 23:57:46 +00:00
Gerald Combs 99d5c5e440 Rename get_epan_and_portaudio_version_info() to get_gui_compiled_info()
and add version info for AirPcap.  Add a corresponding
get_gui_runtime_info().  Fix up whitespace.

svn path=/trunk/; revision=19620
2006-10-19 22:43:38 +00:00
Guy Harris 1eefc6d60e Clean up the word wrap stuff a bit. (Arguably, that should be done in
the code that displays it - we might, for example, be able to have the
About dialog word-wrap to the appropriate size, and word-wrap text
printed to the standard output to the terminal width if it's going to a
terminal and to 80 or whatever columns otherwise.)

Don't report anything in dumpcap about libraries not used by dumpcap. 
(It was printing a blank, which looked a bit weird.)

Fix the handling of _MSC_VER as per Gerald's fix for _MSC_FULL_VER.

svn path=/trunk/; revision=19618
2006-10-19 21:17:23 +00:00
Gerald Combs 1a9332f19a Fix the MSVC++ compiler information. Put a blank line before the "Built"
info.

svn path=/trunk/; revision=19616
2006-10-19 20:37:41 +00:00
Guy Harris 1ae512451e Fix a comment.
svn path=/trunk/; revision=19614
2006-10-19 18:44:51 +00:00
Guy Harris 00d8ca2d45 Fix up the changes to put the Portaudio information at the end of the
version string, so the information comes out right for applications that
don't use Portaudio.

Get rid of an extra "with" in the version string for dumpcap.

Get rid of an extra blank after the libpcap version string, and get rid
of an extra newline before it.

Attempt to add more compiler version information and to prettify the
MSVC++ version information (both untested).

svn path=/trunk/; revision=19613
2006-10-19 18:43:12 +00:00
Gerald Combs 9898be2f65 Add compiler information.
svn path=/trunk/; revision=19584
2006-10-17 22:43:40 +00:00
Jaap Keuter fe2f2920b8 Don't let PortAudio skip the queue on the about dialog ;)
svn path=/trunk/; revision=19478
2006-10-10 19:00:50 +00:00
Ulf Lamping 9e72b99f92 Slightly reshape the version text: Bring the OS info above the WinPcap text - this just makes more sense IMHO
svn path=/trunk/; revision=19294
2006-09-22 23:08:06 +00:00
Gerald Combs 9e23f31e5f Add support for reading from stdin under Windows. Based on a patch sent
in last year by Gianluca Varenni.

Add partial support for reading from named pipes (currently disabled).

Move utf_8to16() and utf_16to8() to a separate module (unicode-utils.[ch])
so that we don't have to cut and paste code in dumpcap.c.

Fix up whitespace.

svn path=/trunk/; revision=19291
2006-09-22 21:14:54 +00:00
Guy Harris c577480d71 Move the PortAudio stuff to from version_info.c to gtk/main.c, so it can
use Pa_GetVersionText().

(The word-wrapping stuff appears to work.)

svn path=/trunk/; revision=19222
2006-09-12 20:23:57 +00:00
Jörg Mayer 6cf447a76d tshark wouldn't link any more, as it doesn't link against
libportaudio, but version_info.c with libportaudio >= 19
needs to link against this.

FIXME: Just print out >= 19 instead of real version string
  until someone finds a proper solution.

svn path=/trunk/; revision=19219
2006-09-12 18:51:22 +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 d0f09612b8 add version output (e.g. in the About box) for the following libraries:
-GnuTLS
-Gcrypt
-Kerberos (no version, only if compiled with MIT/HEIMDAL or without any kerberos)
-PortAudio (version number only for V>=19, maybe need some fixing)

Don't know how to use the line breaking stuff, if someone could help me here ...

svn path=/trunk/; revision=19217
2006-09-12 17:50:36 +00:00
Gerald Combs 5e344f5d95 Include strutil.h.
svn path=/trunk/; revision=18942
2006-08-17 23:35:45 +00:00
Ulf Lamping f7f96d52dd another place missing a call to utf_16to8(), the about box was showing "Windows XP S", where it should be "Windows XP Service Pack 2"
dumpcap uses this too, so I had to duplicate utf_16to8 there :-(

svn path=/trunk/; revision=18891
2006-08-13 12:12:06 +00:00
Anders Broman f68d6e4c8c Ethereal->Wireshark
svn path=/trunk/; revision=18235
2006-05-28 20:28:20 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +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
Ulf Lamping 79053183c5 remove dependencies to pcap.h, so getting an idea what needs to be done by dumpcap in addition to the things already done now
various dumpcap related code cleanup: mainly #include's and capture engine related stuff

svn path=/trunk/; revision=17327
2006-02-17 02:18:48 +00:00
Ulf Lamping db56fe619f we don't need pcap.h here (any longer)
svn path=/trunk/; revision=17324
2006-02-17 01:36:28 +00:00
Ulf Lamping 963539f1bd we have 2006 in the meantime ...
I've also added "and contributors" to the copyright string

svn path=/trunk/; revision=17018
2006-01-12 11:21:07 +00:00
Guy Harris c9b702ba1a Provide not only copyright information, but a GPL blurb, in all the
version/usage messages.

Put newlines at the end of various version strings.

svn path=/trunk/; revision=16870
2005-12-21 08:59:52 +00:00
Ulf Lamping 7e3a24418c rename pcap-....c/.h files to capture-pcap-....c/.h
this way, the capture prefix will "logically" group the files together and file browsers will also group them

we may want to move the files into a subdir capture later

svn path=/trunk/; revision=16691
2005-12-06 00:07:13 +00:00
Guy Harris d4725c127c Grr. Without the right version of the SDK, we can't even compile code
to *use* the shiny new features.

svn path=/trunk/; revision=16102
2005-10-04 04:12:34 +00:00
Guy Harris ead795c0e7 Cope with NT 6.0, and with the x86-64 version of XP being NT 5.2 rather
than NT 5.1.

svn path=/trunk/; revision=16100
2005-10-04 03:15:12 +00:00
Jörg Mayer 0f9ffd6923 Move SVNVERSION handling into version_info. That way, we won't have
to recompile tethereal.o etc each time the svn version has changed,
relinking is sufficient.

I'm not sure what to do about mergecap, as it currently doesn't link
against version_info, so it's "overhead" either way.

svn path=/trunk/; revision=15371
2005-08-16 06:45:17 +00:00
Guy Harris f1deabed56 Make the tone of the error messages a bit less formal, by using
contractions.  (Safari does, at least when you're trying to open a file
to which you don't have read access.)

svn path=/trunk/; revision=12852
2004-12-29 01:08:20 +00:00
Guy Harris f23f4ecf04 Use _WIN32 rather than WIN32 to determine if we're compiling on Win32;
according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is.

svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris 88d2d10fb4 Don't put a newline at the end of the compiled-with version information
- we don't put it at the end of the run-time version information.

Add newlines into formats used with that information where appropriate
(the "About" dialog box already had a newline in the format).

svn path=/trunk/; revision=10950
2004-05-22 04:15:01 +00:00
Guy Harris a56e99aa7a Put a period at the end of the "Running with" stuff.
svn path=/trunk/; revision=10212
2004-02-24 01:14:27 +00:00
Guy Harris 880010fbd1 As Apple's advertising industry might have said, "word-wrap different".
svn path=/trunk/; revision=9975
2004-02-03 22:30:28 +00:00
Guy Harris b97626862e Rename DISSECTOR_HELPER_{SRC,OBJECTS} to
DISSECTOR_SUPPORT_{SRC,OBJECTS}.

Add some additional files, required by dissectors, to those lists.

Extract the stuff to get version information strings for libraries and
the OS, which is *not* needed by dissectors, from "util.c", which
contains routines that *are* needed by dissectors, and put it into a
separate file.

Make "dftest" link only with the dissector support stuff, not with all
of the Ethereal common files.

svn path=/trunk/; revision=9645
2004-01-11 22:17:43 +00:00