aboutsummaryrefslogtreecommitdiffstats
path: root/version_info.c
AgeCommit message (Collapse)AuthorFilesLines
2017-11-09Start using SPDX license identifiers.Gerald Combs1-13/+1
A while back Graham pointed out the SPDX project (spdx.org), which is working on standardizing license specifications: https://www.wireshark.org/lists/wireshark-dev/201509/msg00119.html Appendix V of the specification describes a short identifier (SPDX-License-Identifier) that you can use in place of boilerplate in your source files: https://spdx.org/spdx-specification-21-web-version#h.twlc0ztnng3b Start the conversion process with our top-level C and C++ files. Change-Id: Iba1d835776714deb6285e2181e8ca17f95221878 Reviewed-on: https://code.wireshark.org/review/24302 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-23Make plugin support a runtime propertyJoão Valverde1-0/+11
Keep the option to disable at compile-time but use AC_ARG_ENABLE instead. Change-Id: Ie8c3f5ba0db1eb6d9d4ffd742cd3aa049ead5007 Reviewed-on: https://code.wireshark.org/review/24026 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde1-0/+408
It's not installed so like most other files it doesn't need or benefit from the prefix. Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c Reviewed-on: https://code.wireshark.org/review/23751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris1-156/+0
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-23Change version info string "without locale" to "with default locale" soStephen Fisher1-1/+1
it doesn't sound as though something is missing. Change-Id: Ifa584357c4613fd898824db011329971c9561c41 Reviewed-on: https://code.wireshark.org/review/6027 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-08-24Modify includes of config.h so that out-of-tree builds, i.e. CMakeGraham Bloice1-1/+1
don't pick up the in-tree copy. Change-Id: I7ec473876cdba1a025c52362d7f6adc62d24ce71 Reviewed-on: https://code.wireshark.org/review/3798 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris1-1/+0
Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Include <sys/capaibility.h> to get _LINUX_CAPABILITY_VERSION defined.Guy Harris1-4/+0
It's no longer used in version_info.c, but is used in the main source files of TShark and Wireshark (it's already included in dumpcap). Change-Id: I2169a2bbed678baf26fc8711d7c13d95cce3ee2a Reviewed-on: https://code.wireshark.org/review/2819 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Move the GLib version info string stuff to get_glib_version_info().Guy Harris1-9/+2
Change-Id: I1013ad9a0a98bcbf07fe597f9e932f2ea1a5cd28 Reviewed-on: https://code.wireshark.org/review/2818 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-03Make --help and --version information a bit more uniform.Guy Harris1-47/+3
Have --version print the version number, the copyright information, the "compiled with" information, the "running on/with" information, and the compiler information. Have --help print the version number, a one-line summary of what the program does, a reference to http://www.wireshark.org for more information, a Usage: line, and a list of command-line options. This means programs doing that don't need to include version.h; that's left up to get_ws_vcs_version_info() to do. Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb Reviewed-on: https://code.wireshark.org/review/2794 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23Have individual programs get libpcap and libz version info.Guy Harris1-9/+0
That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Add a routine to return a version string including VCS information.Guy Harris1-8/+0
Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_major_version() to wsutil and rename it to ↵Guy Harris1-21/+0
get_windows_major_version(). It's Windows-specific, so name it appropriately. Change-Id: Ic518cbfabebf95757f6b308a4d547a6cabed6a5e Reviewed-on: https://code.wireshark.org/review/2528 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move the routine to get memory information to wsutil.Guy Harris1-14/+2
Change-Id: I94717cec5a464166585b258a83f8ccdaccf8d5ff Reviewed-on: https://code.wireshark.org/review/2525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move the routine to get a CPU information string to wsutil.Guy Harris1-38/+1
Change-Id: Ibf6e57d7382cbbd831a0367fd48d684118712408 Reviewed-on: https://code.wireshark.org/review/2523 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Add a get_compiler_info() routine in libwsutil to get compiler information.Guy Harris1-75/+2
Change-Id: I8ccb6187f2ee0255460f448aee170768b6fa3f5d Reviewed-on: https://code.wireshark.org/review/2519 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Is <stdio.h> necessary here?Guy Harris1-1/+0
Change-Id: Ibfe4fa8b2c1f092781c4137cde7febe2d6f49e81 Reviewed-on: https://code.wireshark.org/review/2518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_version_info() to libwsutil.Guy Harris1-447/+1
This mean we also have to move CFString_to_C_string() there for OS X. Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337 Reviewed-on: https://code.wireshark.org/review/2511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_copyright_info() to wsutil.Guy Harris1-12/+0
Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a Reviewed-on: https://code.wireshark.org/review/2510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-10CPUID improvementsJakub Zawadzki1-1/+4
- Make ws_cpuid() return boolean when CPUID is support or no, this way it's easier for caller to determinate if it works (and can use cpuinfo[X] or no). - Add function ws_cpuid_sse42(), use it in ws_mempbrk() [cached] & version information. Change-Id: I4e77699f9f3d11bb9b2e8ea599e48d3c5ad84ed7 Reviewed-on: https://code.wireshark.org/review/2088 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-31Move cpuid to seperate header file.Jakub Zawadzki1-46/+5
It'll be later used also for detecting sse4.2 Change-Id: I1930abb29026b455d453a79b5f301cdf37585160 Reviewed-on: https://code.wireshark.org/review/1803 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-6/+6
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-01-01Happy new year!Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=54529
2013-11-02libcap is UN*X-only; libnl is Linux-only.Guy Harris1-2/+8
svn path=/trunk/; revision=53039
2013-09-30Add identification of Windows 8.1 / Windows Server 2012 R2Pascal Quantin1-0/+3
svn path=/trunk/; revision=52305
2013-06-20Fix indent (use Tabs)Alexis La Goutte1-15/+15
svn path=/trunk/; revision=50088
2013-06-20Fix warning about CPUInfo in Linux (when use qmake to build qtshark)Alexis La Goutte1-1/+5
../../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-17Added a missing CFRelease.Stig Bjørlykke1-1/+3
svn path=/trunk/; revision=49976
2013-03-24Replace implicit conversions with explicit casts.Guy Harris1-3/+4
svn path=/trunk/; revision=48534
2013-03-21Make internal functions static.Anders Broman1-2/+2
svn path=/trunk/; revision=48465
2013-02-08Try using cpuid also for __x86_64__ if compiled with GCC.Anders Broman1-8/+53
svn path=/trunk/; revision=47567
2013-02-04Fix warning: unused parameter ‘str’ when compiling on a non Windows machinePascal Quantin1-1/+1
svn path=/trunk/; revision=47466
2013-02-04Add CPUBrandString and memory size to VersionInfo on windows if available.Anders Broman1-0/+45
svn path=/trunk/; revision=47465
2013-01-01Welcome in 2013Pascal Quantin1-1/+1
svn path=/trunk/; revision=46882
2013-01-01Add detection of Windows 8 and Windows Server 2012Pascal Quantin1-0/+3
svn path=/trunk/; revision=46881
2012-11-22On UN*X, if an interface has a description, use it as the "friendlyGuy Harris1-11/+2
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-09-25Fix compilation warnings.Gerald Combs1-2/+2
svn path=/trunk/; revision=45133
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45015
2012-09-19Try ServerVersion.plist first, and use ProductName as the OS name; thatGuy Harris1-40/+69
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-08OK, fine, g_malloc() and g_free(). We really should be usingGuy Harris1-7/+4
g_try_free(), because, trust me, we *can* handle allocation failures here. svn path=/trunk/; revision=44813
2012-09-08We no longer use Gestalt(), so there's no need to check for it.Guy Harris1-0/+6
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-08Mountain Lion marks Gestalt() as deprecated, which causes the build toGuy Harris1-28/+131
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-07-05List whether we were compiled with LIBNL or not (including which majorJeff Morriss1-0/+12
version). svn path=/trunk/; revision=43574
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-02-20Jose Pedro Oliveira: get_os_version_info() is more apropriate for shb_osAnders Broman1-9/+19
svn path=/trunk/; revision=41086
2012-01-01Happy New Year!Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=40353
2011-11-07Change the use of threads from "mostly always, depending on yourGerald Combs1-5/+0
configure options and Gtk+ and GLib versions" to "always". svn path=/trunk/; revision=39751
2011-09-21Fix ex "modeline" so it works;Bill Meier1-1/+1
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748 svn path=/trunk/; revision=39081
2011-09-02Update some comments, including a new URL, and add an additionalGuy Harris1-5/+9
comment. svn path=/trunk/; revision=38874