Commit Graph

126 Commits

Author SHA1 Message Date
Pascal Quantin 5e641a636c Add identification of Windows 8.1 / Windows Server 2012 R2
svn path=/trunk/; revision=52305
2013-09-30 20:14:42 +00:00
Alexis La Goutte 2b3b994b01 Fix indent (use Tabs)
svn path=/trunk/; revision=50088
2013-06-20 21:10:23 +00:00
Alexis La Goutte 874ff29b40 Fix warning about CPUInfo in Linux (when use qmake to build qtshark)
../../version_info.c: In function 'get_cpu_info':
../../version_info.c:662:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:670:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:672:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:674:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'

svn path=/trunk/; revision=50087
2013-06-20 21:10:18 +00:00
Stig Bjørlykke 114657b0cb Added a missing CFRelease.
svn path=/trunk/; revision=49976
2013-06-17 07:20:54 +00:00
Guy Harris 7a9158418c Replace implicit conversions with explicit casts.
svn path=/trunk/; revision=48534
2013-03-24 18:22:07 +00:00
Anders Broman ef07303c20 Make internal functions static.
svn path=/trunk/; revision=48465
2013-03-21 21:58:47 +00:00
Anders Broman 7ffa55c84e Try using cpuid also for __x86_64__ if compiled with GCC.
svn path=/trunk/; revision=47567
2013-02-08 14:51:49 +00:00
Pascal Quantin 79eb789b0d Fix warning: unused parameter ‘str’ when compiling on a non Windows machine
svn path=/trunk/; revision=47466
2013-02-04 16:35:51 +00:00
Anders Broman 3b1bf70380 Add CPUBrandString and memory size to VersionInfo on windows if available.
svn path=/trunk/; revision=47465
2013-02-04 15:29:43 +00:00
Pascal Quantin 46b0d0f406 Welcome in 2013
svn path=/trunk/; revision=46882
2013-01-01 14:20:49 +00:00
Pascal Quantin dad3ca304a Add detection of Windows 8 and Windows Server 2012
svn path=/trunk/; revision=46881
2013-01-01 14:20:17 +00:00
Guy Harris bd976ae6c0 On UN*X, if an interface has a description, use it as the "friendly
name".  If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.

If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.

Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.

svn path=/trunk/; revision=46131
2012-11-22 06:02:49 +00:00
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