Commit Graph

164 Commits

Author SHA1 Message Date
Gerald Combs e395a29ad6 Fix compilation warnings.
svn path=/trunk/; revision=45133
2012-09-25 15:27:36 +00:00
Jeff Morriss 3551a86c36 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45015
2012-09-20 01:29:52 +00:00
Guy Harris b5d6160447 Try ServerVersion.plist first, and use ProductName as the OS name; that
means we report the server as such (and means that if Apple calls it
Shiny Happy Puppy X in the future, we'll report it as such...).

svn path=/trunk/; revision=45013
2012-09-19 22:41:11 +00:00
Guy Harris f5428eddcd OK, fine, g_malloc() and g_free(). We really should be using
g_try_free(), because, trust me, we *can* handle allocation failures
here.

svn path=/trunk/; revision=44813
2012-09-08 07:57:45 +00:00
Guy Harris 001dbcfc0b We no longer use Gestalt(), so there's no need to check for it.
We *do*, however, use CFPropertyListCreateWithStream(), so we need to
check for it, and, if we're able to use the OS X frameworks at all, use
CFPropertyListCreateFromStream() if we don't have
CFPropertyListCreateWithStream().

svn path=/trunk/; revision=44812
2012-09-08 07:46:56 +00:00
Guy Harris 50351aa1c4 Mountain Lion marks Gestalt() as deprecated, which causes the build to
fail on Mountain Lion with the default -W flags, but no replacement API
was specified.  Fall back on dredging information out of
/System/Library/CoreServices/SystemVersion.plist; this also lets us get
the OS build version.

(In theory, we could calculate the OS version from the Darwin version
for everything except 10.0:

	12.x.x  OS X 10.8.x Mountain Lion
	11.x.x  OS X 10.7.x Lion
	10.x.x  OS X 10.6.x Snow Leopard
	 9.x.x  OS X 10.5.x Leopard
	 8.x.x  OS X 10.4.x Tiger
	 7.x.x  OS X 10.3.x Panther
	 6.x.x  OS X 10.2.x Jaguar
	 5.x    OS X 10.1.x Puma

and could get the build number as "kern.osversion" from sysctl.)

svn path=/trunk/; revision=44811
2012-09-08 07:04:13 +00:00
Jeff Morriss efe4dd96aa List whether we were compiled with LIBNL or not (including which major
version).

svn path=/trunk/; revision=43574
2012-07-05 19:10:47 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Anders Broman 29a14da188 Jose Pedro Oliveira: get_os_version_info() is more apropriate for shb_os
svn path=/trunk/; revision=41086
2012-02-20 21:17:43 +00:00
Stig Bjørlykke 92528dad84 Happy New Year!
svn path=/trunk/; revision=40353
2012-01-01 10:02:11 +00:00
Gerald Combs 7d442f4c22 Change the use of threads from "mostly always, depending on your
configure options and Gtk+ and GLib versions" to "always".

svn path=/trunk/; revision=39751
2011-11-07 23:42:53 +00:00
Bill Meier 781129806f Fix ex "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
Guy Harris 12074249cb Update some comments, including a new URL, and add an additional
comment.

svn path=/trunk/; revision=38874
2011-09-02 23:20:27 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Michael Tüxen 76d03b5bcb Provide information regarding thred support.
svn path=/trunk/; revision=38058
2011-07-16 12:19:57 +00:00
Gerald Combs 5467d67f2a In version_info.c, assume we always have the "matches" operator. In
capture_opts.c, assume our output filename has been passed through
arg_list_utf_16to8().

svn path=/trunk/; revision=37974
2011-07-11 19:15:57 +00:00
Stig Bjørlykke e015eca944 Show locale in version info (if !win32).
This may help us identifying bugs related to locale.

svn path=/trunk/; revision=37829
2011-06-29 08:05:53 +00:00
Stig Bjørlykke 8443bbbf75 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

svn path=/trunk/; revision=37812
2011-06-28 09:00:11 +00:00
Guy Harris 317cb92f9c The "shared by every program in the Wireshark suite, including dumpcap"
version information doesn't include Python version information (only
programs using libwireshark have that) or GeoIP version information
(ditto).  Don't include headers required only for that information;
hopefully this will keep dumpcap from requiring the Python library on
Windows.

svn path=/trunk/; revision=37650
2011-06-11 02:35:58 +00:00
Bill Meier 00ac593f91 (Trivial) Testing _MSC_FULL_VER can be done at compile time.
svn path=/trunk/; revision=37366
2011-05-23 16:09:09 +00:00
Bill Meier ba48c5061e Fix a Windows compiler warning;
Minor whitespace cleanup.

svn path=/trunk/; revision=35563
2011-01-16 23:04:33 +00:00
Stig Bjørlykke 388453b79d New Year.
svn path=/trunk/; revision=35322
2011-01-01 12:23:21 +00:00
Stephen Fisher 9e5dc7e406 Fix bug #5453 "Help->About Wireshark mis-reports OS" (again) without the help of MSDN code fragments.
svn path=/trunk/; revision=35090
2010-12-01 16:39:28 +00:00
Stephen Fisher 283e7471e2 Back out r35084 since it contains code fragments from MSDN, which are covered
under the "Microsoft Limited Public License" apparently.


svn path=/trunk/; revision=35085
2010-12-01 00:42:48 +00:00
Stephen Fisher 7ba78f6857 Fix bug #5453: Use GetSystemNativeInfo() function if found on the machine running Wireshark instead of GetSystemInfo(), so that we obtain the machine's actual architecture even when running under WOW64 x86 emulation.
svn path=/trunk/; revision=35084
2010-11-30 23:42:47 +00:00
Stig Bjørlykke 2cedc69849 Fixed "Compiled with" information in the About box.
svn path=/trunk/; revision=34601
2010-10-21 07:13:43 +00:00
Stig Bjørlykke afd6761f46 A GString has it's own length.
svn path=/trunk/; revision=34034
2010-08-31 18:28:59 +00:00
Guy Harris 04cf498c25 More information on getting the distribution name and release.
svn path=/trunk/; revision=33545
2010-07-15 22:31:53 +00:00
Guy Harris 96e8176ac2 More details on getting the distribution name and version on Linux.
svn path=/trunk/; revision=33543
2010-07-15 20:59:26 +00:00
Guy Harris d9b1e79b1e On OS X, give the OS version as
Mac OS X 10.x.y (Darwin a.b.c)

rather than as

	Darwin a.b.c (Mac OS X 10.x.y)

and also note that, on Linux, the lsb_release command might be able to
give you the *distribution* name and version.

svn path=/trunk/; revision=33542
2010-07-15 20:55:46 +00:00
Guy Harris a2d9316f8c Don't include headers we don't need (they might be generating external
references to functions in libraries with which we're not necessarily
being linked).

svn path=/trunk/; revision=33535
2010-07-15 09:04:10 +00:00
Guy Harris cc3540b0fb Move the code to get version information for libraries used by
libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
Guy Harris 36623bcb71 From H.sivank: GtkOSXApplication support.
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
2010-05-25 00:35:44 +00:00
Guy Harris 0c40b92518 Detect clang and llvm-gcc.
svn path=/trunk/; revision=32905
2010-05-19 23:39:45 +00:00
Jörg Mayer e309a6ad5a Bruno Matos <bruno.matos@gmail.com>
In version_info.c file, if we put the Python include in first place we
remove the warning/error "_POSIX_C_SOURCE redefined", as in this article:
http://bytes.com/topic/python/answers/30009-warning-_posix_c_source-redefined
.

I had problems with CMake build.


svn path=/trunk/; revision=32824
2010-05-15 21:38:36 +00:00
Jeff Morriss d83b07c874 Tell, in the version info, if we were compiled 32- or 64-bit.
svn path=/trunk/; revision=32548
2010-04-24 02:04:14 +00:00
Stig Bjørlykke 534dfde65c Disable usage of zlibVersion() on win32.
svn path=/trunk/; revision=32511
2010-04-19 06:39:45 +00:00
Stig Bjørlykke 8bd4f6139f From Richard Brodie via bug 4606:
Display runtime version for libz, as well as build version.

svn path=/trunk/; revision=32502
2010-04-17 10:22:38 +00:00
Stig Bjørlykke 8c3069eadb Happy New Year!
svn path=/trunk/; revision=31396
2010-01-01 12:15:27 +00:00
Gerald Combs 8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
2009-12-21 21:06:01 +00:00
Gerald Combs 7c0dc5d7e7 If we don't have PCRE and we do have GLib >= 2.14, use GRegexes for the
"matches" operator.

svn path=/trunk/; revision=31302
2009-12-18 01:15:08 +00:00
Guy Harris 3302631960 Fix typo in comment.
svn path=/trunk/; revision=29955
2009-09-17 02:02:21 +00:00
Bill Meier e9b9b83b49 Fix a typo.
svn path=/trunk/; revision=29951
2009-09-16 23:24:31 +00:00
Bill Meier bfd830ace8 Add info as to 32/64 bit and also if "Windows 7" to runtime version info.
svn path=/trunk/; revision=29950
2009-09-16 23:13:34 +00:00
Gerald Combs 1e93d53b56 Use "svn info" to fetch the version by default. Fetch the repository path as
well. Add the repository path to the version strings.

svn path=/trunk/; revision=29171
2009-07-22 23:59:15 +00:00
Stig Bjørlykke 9a372f685d From Kovarththanan Rajaratnam's patch in bug 3500:
Added info about python version.

svn path=/trunk/; revision=28543
2009-05-31 16:05:13 +00:00
Guy Harris bac808474c The second argument to Gestalt() is an SInt32, which, for backwards
compatibility reasons, is a long rather than an int in ILP32 mode
(probably dating back to the old 68000 days, when 32-bit arithmetic was
slower than 16-bit arithmetic, so an int was 16 bits and a long 32 bits
on some 68K machines) and is an int in LP64 mode.

svn path=/trunk/; revision=27921
2009-04-01 04:01:13 +00:00
Tomas Kukosa e22d7c79eb display runtime versions of GnuTLS and Gcrypt libraries
svn path=/trunk/; revision=27194
2009-01-08 13:24:04 +00:00
Jaap Keuter 60c6bbcdc2 We had a roll-over of the calendar thingy.
svn path=/trunk/; revision=27190
2009-01-08 07:28:58 +00:00
Gerald Combs d2aa34721a Check in a modified version of Jaap's patch in bug 3162. This should fix
compilation under Visual C++ 6.0.

svn path=/trunk/; revision=27136
2008-12-30 19:17:35 +00:00
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