# include "config.h"
#endif
-#ifdef HAVE_PYTHON
-#include <Python.h> /* to get the Python version number (PY_VERSION) */
-#endif
-
#include <glib.h>
#include <stdlib.h>
#include <zlib.h> /* to get the libz version number */
#endif
-#ifdef HAVE_LIBPCRE
-#include <pcre.h> /* to get the libpcre version number */
-#endif /* HAVE_LIBPCRE */
-
#ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
#endif
# include <sys/capability.h>
#endif
-#ifdef HAVE_GEOIP
-#include <epan/geoip_db.h>
-#endif
-
#ifdef SVNVERSION
const char *wireshark_svnversion = " (" SVNVERSION " from " SVNPATH ")";
#else
* don't use Portaudio in TShark.
*/
void
-get_compiled_version_info(GString *str, void (*additional_info)(GString *))
+get_compiled_version_info(GString *str, void (*prepend_info)(GString *),
+ void (*append_info)(GString *))
{
if (sizeof(str) == 4)
g_string_append(str, "(32-bit) ");
else
g_string_append(str, "(64-bit) ");
- /* GLIB */
+ if (prepend_info)
+ (*prepend_info)(str);
+
+ /* GLIB */
g_string_append(str, "with ");
g_string_append_printf(str,
#ifdef GLIB_MAJOR_VERSION
g_string_append(str, ", ");
get_compiled_pcap_version(str);
- /* LIBZ */
+ /* LIBZ */
g_string_append(str, ", ");
#ifdef HAVE_LIBZ
g_string_append(str, "with libz ");
g_string_append(str, "without libz");
#endif /* HAVE_LIBZ */
- /* LIBCAP */
+ /* LIBCAP */
g_string_append(str, ", ");
#ifdef HAVE_LIBCAP
g_string_append(str, "with POSIX capabilities");
#endif /* HAVE_LIBCAP */
/* Additional application-dependent information */
- if (additional_info)
- (*additional_info)(str);
+ if (append_info)
+ (*append_info)(str);
g_string_append(str, ".");
-#if !defined(HAVE_LIBPCRE) && !GLIB_CHECK_VERSION(2,14,0)
- g_string_append(str,
- "\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter syntax");
- g_string_append(str, ".");
-#endif /* HAVE_LIBPCRE */
-
end_string(str);
}
+#ifdef _WIN32
+typedef void (WINAPI *nativesi_func_ptr)(LPSYSTEM_INFO);
+#endif
+
/*
* Get various library run-time versions, and the OS version, and append
* them to the specified GString.
#if defined(_WIN32)
OSVERSIONINFOEX info;
SYSTEM_INFO system_info;
+ nativesi_func_ptr nativesi_func;
#elif defined(HAVE_SYS_UTSNAME_H)
struct utsname name;
#endif
#if HAVE_OS_X_FRAMEWORKS
SInt32 macosx_ver, macosx_major_ver, macosx_minor_ver, macosx_bugfix_ver;
#endif
+#ifndef _WIN32
+ gchar *lang;
+#endif
g_string_append(str, "on ");
}
memset(&system_info, '\0', sizeof system_info);
- GetSystemInfo(&system_info); /* only for W2K or greater .... (which is what we support) */
+ /* Look for and use the GetNativeSystemInfo() function if available to get the correct processor
+ * architecture even when running 32-bit Wireshark in WOW64 (x86 emulation on 64-bit Windows) */
+ nativesi_func = (nativesi_func_ptr)GetProcAddress(GetModuleHandle(_T("kernel32.dll")), "GetNativeSystemInfo");
+ if(nativesi_func)
+ nativesi_func(&system_info);
+ else
+ GetSystemInfo(&system_info);
switch (info.dwPlatformId) {
*/
if (uname(&name) < 0) {
g_string_append_printf(str, "unknown OS version (uname failed - %s)",
- strerror(errno));
+ g_strerror(errno));
return;
}
g_string_append(str, "an unknown OS");
#endif
+#ifndef _WIN32
+ /* Locale */
+ if ((lang = getenv ("LANG")) != NULL)
+ g_string_append_printf(str, ", with locale %s", lang);
+ else
+ g_string_append(str, ", without locale");
+#endif
+
/* Libpcap */
g_string_append(str, ", ");
get_runtime_pcap_version(str);
- /* zlib */
+ /* zlib */
#if defined(HAVE_LIBZ) && !defined(_WIN32)
- g_string_append_printf(str, ", with libz %s", zlibVersion());
+ g_string_append_printf(str, ", with libz %s", zlibVersion());
#endif
/* Additional application-dependent information */
/* Compiler info */
/*
- * See http://predef.sourceforge.net/precomp.html for
+ * See https://sourceforge.net/apps/mediawiki/predef/index.php?title=Compilers
* information on various defined strings.
*
* GCC's __VERSION__ is a nice text string for humans to
- * read. The page at predef.sourceforge.net largely
- * describes numeric #defines that encode the version;
- * if the compiler doesn't also offer a nice printable
- * string, we should probably prettify the number somehow.
+ * read. The page at sourceforge.net largely describes
+ * numeric #defines that encode the version; if the compiler
+ * doesn't also offer a nice printable string, we try prettifying
+ * the number somehow.
*/
#if defined(__GNUC__) && defined(__VERSION__)
+ /*
+ * Clang and llvm-gcc also define __GNUC__ and __VERSION__;
+ * distinguish between them.
+ */
#if defined(__clang__)
g_string_append_printf(str, "\n\nBuilt using clang %s.\n", __VERSION__);
#elif defined(__llvm__)
#endif /* __INTEL_COMPILER_BUILD_DATE */
g_string_append_printf(str, "\n");
#elif defined(_MSC_FULL_VER)
- if (_MSC_FULL_VER > 99999999) {
- g_string_append_printf(str, "\n\nBuilt using Microsoft Visual C++ %d.%d",
- (_MSC_FULL_VER / 10000000) - 6,
- (_MSC_FULL_VER / 100000) % 100);
- if ((_MSC_FULL_VER % 100000) != 0)
- g_string_append_printf(str, " build %d",
- _MSC_FULL_VER % 100000);
- } else {
- g_string_append_printf(str, "\n\nBuilt using Microsoft Visual C++ %d.%d",
- (_MSC_FULL_VER / 1000000) - 6,
- (_MSC_FULL_VER / 10000) % 100);
- if ((_MSC_FULL_VER % 10000) != 0)
- g_string_append_printf(str, " build %d",
- _MSC_FULL_VER % 10000);
- }
+# if _MSC_FULL_VER > 99999999
+ g_string_append_printf(str, "\n\nBuilt using Microsoft Visual C++ %d.%d",
+ (_MSC_FULL_VER / 10000000) - 6,
+ (_MSC_FULL_VER / 100000) % 100);
+# if (_MSC_FULL_VER % 100000) != 0
+ g_string_append_printf(str, " build %d",
+ _MSC_FULL_VER % 100000);
+# endif
+# else
+ g_string_append_printf(str, "\n\nBuilt using Microsoft Visual C++ %d.%d",
+ (_MSC_FULL_VER / 1000000) - 6,
+ (_MSC_FULL_VER / 10000) % 100);
+# if (_MSC_FULL_VER % 10000) != 0
+ g_string_append_printf(str, " build %d",
+ _MSC_FULL_VER % 10000);
+# endif
+# endif
g_string_append_printf(str, "\n");
#elif defined(_MSC_VER)
/* _MSC_FULL_VER not defined, but _MSC_VER defined */
get_copyright_info(void)
{
return
-"Copyright 1998-2010 Gerald Combs <gerald@wireshark.org> and contributors.\n"
+"Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
}
* indent-tabs-mode: t
* End:
*
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
git.samba.org / obnox / wireshark / wip.git / blobdiff