ip_proto.h now requires expert.h.
[metze/wireshark/wip.git] / version_info.c
index 5dafbec2140b2c56f68f6534b053a2da7c0b168d..a65e2b8fa4929188046dc12e0f1f1c7b97fa184e 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.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 */
-
-#if (defined(HAVE_LIBGCRYPT) || defined(HAVE_LIBGNUTLS)) && defined(_WIN32)
-#include <winposixtype.h>
-#endif
-
-#ifdef HAVE_LIBGCRYPT
-#include <gcrypt.h>
-#endif /* HAVE_LIBGCRYPT */
-
-#ifdef HAVE_LIBGNUTLS
-#include <gnutls/gnutls.h>
-#endif /* HAVE_LIBGNUTLS */
-
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
 #endif
 #include <windows.h>
 #endif
 
-#ifdef HAVE_C_ARES
-#include <ares_version.h>
-#endif
-
-#ifdef HAVE_LUA_5_1
-#include <lua.h>
-#endif
-
-#ifdef HAVE_LIBSMI
-#include <smi.h>
-#endif
-
 #ifdef HAVE_OS_X_FRAMEWORKS
-#include <CoreServices/CoreServices.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include "cfutils.h"
 #endif
 
 #ifdef HAVE_LIBCAP
 # include <sys/capability.h>
 #endif
 
-#ifdef HAVE_GEOIP
-#include <epan/geoip_db.h>
-#endif
-
 #ifdef SVNVERSION
-       const char *wireshark_svnversion = " (" SVNVERSION ")";
+       const char *wireshark_svnversion = " (" SVNVERSION " from " SVNPATH ")";
 #else
        const char *wireshark_svnversion = "";
 #endif
@@ -107,7 +74,7 @@ end_string(GString *str)
        size_t point;
        char *p, *q;
 
-       point = strlen(str->str);
+       point = str->len;
        if (point == 0 || str->str[point - 1] != '\n')
                g_string_append(str, "\n");
        p = str->str;
@@ -137,9 +104,18 @@ end_string(GString *str)
  * 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 *))
 {
-        /* GLIB */
+       if (sizeof(str) == 4)
+               g_string_append(str, "(32-bit) ");
+       else
+               g_string_append(str, "(64-bit) ");
+
+       if (prepend_info)
+               (*prepend_info)(str);
+
+       /* GLIB */
        g_string_append(str, "with ");
        g_string_append_printf(str,
 #ifdef GLIB_MAJOR_VERSION
@@ -153,7 +129,7 @@ get_compiled_version_info(GString *str, void (*additional_info)(GString *))
        g_string_append(str, ", ");
        get_compiled_pcap_version(str);
 
-        /* LIBZ */
+       /* LIBZ */
        g_string_append(str, ", ");
 #ifdef HAVE_LIBZ
        g_string_append(str, "with libz ");
@@ -166,7 +142,7 @@ get_compiled_version_info(GString *str, void (*additional_info)(GString *))
        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");
@@ -177,134 +153,190 @@ get_compiled_version_info(GString *str, void (*additional_info)(GString *))
        g_string_append(str, "without POSIX capabilities");
 #endif /* HAVE_LIBCAP */
 
-       /* Additional application-dependent information */
-       if (additional_info)
-               (*additional_info)(str);
-       g_string_append(str, ".");
+       /* LIBNL */
+       g_string_append(str, ", ");
+#if defined(HAVE_LIBNL1)
+       g_string_append(str, "with libnl 1");
+#elif defined(HAVE_LIBNL2)
+       g_string_append(str, "with libnl 2");
+#elif defined(HAVE_LIBNL3)
+       g_string_append(str, "with libnl 3");
+#else
+       g_string_append(str, "without libnl");
+#endif
 
-#ifndef HAVE_LIBPCRE
-       g_string_append(str,
-       "\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter syntax");
+       /* Additional application-dependent information */
+       if (append_info)
+               (*append_info)(str);
        g_string_append(str, ".");
-#endif /* HAVE_LIBPCRE */
 
        end_string(str);
 }
 
+#ifdef _WIN32
+typedef void (WINAPI *nativesi_func_ptr)(LPSYSTEM_INFO);
+#endif
+
 /*
- * Get compile-time information used only by applications that use
- * libwireshark.
+ * Handles the rather elaborate process of getting OS version information
+ * from OS X (we want the OS X version, not the Darwin version, the latter
+ * being easy to get with uname()).
  */
-void
-get_epan_compiled_version_info(GString *str)
-{
-        /* PCRE */
-       g_string_append(str, ", ");
-#ifdef HAVE_LIBPCRE
-       g_string_append(str, "with libpcre ");
-#ifdef PCRE_MAJOR
-#ifdef PCRE_MINOR
-       g_string_append_printf(str, "%u.%u", PCRE_MAJOR, PCRE_MINOR);
-#else                  /* PCRE_MINOR */
-       g_string_append_printf(str, "%u", PCRE_MAJOR);
-#endif                 /* PCRE_MINOR */
-#else          /* PCRE_MAJOR */
-       g_string_append(str, "(version unknown)");
-#endif         /* PCRE_MAJOR */
-#else  /* HAVE_LIBPCRE */
-       g_string_append(str, "without libpcre");
-#endif /* HAVE_LIBPCRE */
-
-        /* SNMP */
-       g_string_append(str, ", ");
-#ifdef HAVE_LIBSMI
-       g_string_append(str, "with SMI " SMI_VERSION_STRING);
-#else /* no SNMP library */
-       g_string_append(str, "without SMI");
-#endif /* _SMI_H */
-
-       /* c-ares */
-       g_string_append(str, ", ");
-#ifdef HAVE_C_ARES
-       g_string_append(str, "with c-ares " ARES_VERSION_STR);
-#else
-       g_string_append(str, "without c-ares");
-
-       /* ADNS - only add if no c-ares */
-       g_string_append(str, ", ");
-#ifdef HAVE_GNU_ADNS
-       g_string_append(str, "with ADNS");
-#else
-       g_string_append(str, "without ADNS");
-#endif /* HAVE_GNU_ADNS */
-#endif /* HAVE_C_ARES */
+#ifdef HAVE_OS_X_FRAMEWORKS
 
-        /* LUA */
-       g_string_append(str, ", ");
-#ifdef HAVE_LUA_5_1
-       g_string_append(str, "with ");
-       g_string_append(str, LUA_VERSION);
-#else
-       g_string_append(str, "without Lua");
-#endif /* HAVE_LUA_5_1 */
+/*
+ * Fetch a string, as a UTF-8 C string, from a dictionary, given a key.
+ */
+static char *
+get_string_from_dictionary(CFPropertyListRef dict, CFStringRef key)
+{
+       CFStringRef cfstring;
+
+       cfstring = (CFStringRef)CFDictionaryGetValue((CFDictionaryRef)dict,
+           (const void *)key);
+       if (cfstring == NULL)
+               return NULL;
+       if (CFGetTypeID(cfstring) != CFStringGetTypeID()) {
+               /* It isn't a string.  Punt. */
+               return NULL;
+       }
+       return CFString_to_C_string(cfstring);
+}
 
-        /* GnuTLS */
-       g_string_append(str, ", ");
-#ifdef HAVE_LIBGNUTLS
-       g_string_append(str, "with GnuTLS " LIBGNUTLS_VERSION);
-#else
-       g_string_append(str, "without GnuTLS");
-#endif /* HAVE_LIBGNUTLS */
+/*
+ * Get the OS X version information, and append it to the GString.
+ * Return TRUE if we succeed, FALSE if we fail.
+ */
+static gboolean
+get_os_x_version_info(GString *str)
+{
+       static const UInt8 server_version_plist_path[] =
+           "/System/Library/CoreServices/ServerVersion.plist";
+       static const UInt8 system_version_plist_path[] =
+           "/System/Library/CoreServices/SystemVersion.plist";
+       CFURLRef version_plist_file_url;
+       CFReadStreamRef version_plist_stream;
+       CFDictionaryRef version_dict;
+       char *string;
 
-        /* Gcrypt */
-       g_string_append(str, ", ");
-#ifdef HAVE_LIBGCRYPT
-       g_string_append(str, "with Gcrypt " GCRYPT_VERSION);
-#else
-       g_string_append(str, "without Gcrypt");
-#endif /* HAVE_LIBGCRYPT */
+       /*
+        * On OS X, report the OS X version number as the OS, and put
+        * the Darwin information in parentheses.
+        *
+        * Alas, Gestalt() is deprecated in Mountain Lion, so the build
+        * fails if you treat deprecation warnings as fatal.  I don't
+        * know of any replacement API, so we fall back on reading
+        * /System/Library/CoreServices/ServerVersion.plist if it
+        * exists, otherwise /System/Library/CoreServices/SystemVersion.plist,
+        * and using ProductUserVisibleVersion.  We also get the build
+        * version from ProductBuildVersion and the product name from
+        * ProductName.
+        */
+       version_plist_file_url = CFURLCreateFromFileSystemRepresentation(NULL,
+           server_version_plist_path, sizeof server_version_plist_path - 1,
+           false);
+       if (version_plist_file_url == NULL)
+               return FALSE;
+       version_plist_stream = CFReadStreamCreateWithFile(NULL,
+           version_plist_file_url);
+       CFRelease(version_plist_file_url);
+       if (version_plist_stream == NULL)
+               return FALSE;
+       if (!CFReadStreamOpen(version_plist_stream)) {
+               CFRelease(version_plist_stream);
 
-        /* Kerberos */
-        /* XXX - I don't see how to get the version number, at least for KfW */
-       g_string_append(str, ", ");
-#ifdef HAVE_KERBEROS
-#ifdef HAVE_MIT_KERBEROS
-       g_string_append(str, "with MIT Kerberos");
+               /*
+                * Try SystemVersion.plist.
+                */
+               version_plist_file_url = CFURLCreateFromFileSystemRepresentation(NULL,
+                   system_version_plist_path, sizeof system_version_plist_path - 1,
+                   false);
+               if (version_plist_file_url == NULL)
+                       return FALSE;
+               version_plist_stream = CFReadStreamCreateWithFile(NULL,
+                   version_plist_file_url);
+               CFRelease(version_plist_file_url);
+               if (version_plist_stream == NULL)
+                       return FALSE;
+               if (!CFReadStreamOpen(version_plist_stream)) {
+                       CFRelease(version_plist_stream);
+                       return FALSE;
+               }
+       }
+#ifdef HAVE_CFPROPERTYLISTCREATEWITHSTREAM
+       version_dict = (CFDictionaryRef)CFPropertyListCreateWithStream(NULL,
+           version_plist_stream, 0, kCFPropertyListImmutable,
+           NULL, NULL);
 #else
-        /* HAVE_HEIMDAL_KERBEROS */
-       g_string_append(str, "with Heimdal Kerberos");
+       version_dict = (CFDictionaryRef)CFPropertyListCreateFromStream(NULL,
+           version_plist_stream, 0, kCFPropertyListImmutable,
+           NULL, NULL);
 #endif
-#else
-       g_string_append(str, "without Kerberos");
-#endif /* HAVE_KERBEROS */
-
-       /* GeoIP */
-       g_string_append(str, ", ");
-#ifdef HAVE_GEOIP
-       g_string_append(str, "with GeoIP");
-#else
-       g_string_append(str, "without GeoIP");
-#endif /* HAVE_GEOIP */
-
+       if (version_dict == NULL) {
+               CFRelease(version_plist_stream);
+               return FALSE;
+       }
+       if (CFGetTypeID(version_dict) != CFDictionaryGetTypeID()) {
+               /* This is *supposed* to be a dictionary.  Punt. */
+               CFRelease(version_dict);
+               CFReadStreamClose(version_plist_stream);
+               CFRelease(version_plist_stream);
+               return FALSE;
+       }
+       /* Get the product name string. */
+       string = get_string_from_dictionary(version_dict,
+           CFSTR("ProductName"));
+       if (string == NULL) {
+               CFRelease(version_dict);
+               CFReadStreamClose(version_plist_stream);
+               CFRelease(version_plist_stream);
+               return FALSE;
+       }
+       g_string_append_printf(str, "%s", string);
+       g_free(string);
+
+       /* Get the OS version string. */
+       string = get_string_from_dictionary(version_dict,
+           CFSTR("ProductUserVisibleVersion"));
+       if (string == NULL) {
+               CFRelease(version_dict);
+               CFReadStreamClose(version_plist_stream);
+               CFRelease(version_plist_stream);
+               return FALSE;
+       }
+       g_string_append_printf(str, " %s", string);
+       g_free(string);
+
+       /* Get the build string */
+       string = get_string_from_dictionary(version_dict,
+           CFSTR("ProductBuildVersion"));
+       if (string == NULL) {
+               CFRelease(version_dict);
+               CFReadStreamClose(version_plist_stream);
+               CFRelease(version_plist_stream);
+               return FALSE;
+       }
+       g_string_append_printf(str, ", build %s", string);
+       g_free(string);
+       CFRelease(version_dict);
+       CFReadStreamClose(version_plist_stream);
+       CFRelease(version_plist_stream);
+       return TRUE;
 }
+#endif
 
 /*
- * Get various library run-time versions, and the OS version, and append
- * them to the specified GString.
+ * Get the OS version, and append it to the GString
  */
-void
-get_runtime_version_info(GString *str, void (*additional_info)(GString *))
+void get_os_version_info(GString *str)
 {
 #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
-       long macosx_ver, macosx_major_ver, macosx_minor_ver, macosx_bugfix_ver;
-#endif
-
-       g_string_append(str, "on ");
 
 #if defined(_WIN32)
        /*
@@ -324,6 +356,8 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
         * not even be able to compile code that *uses* that structure with
         * older versions of the SDK.
         */
+
+       memset(&info, '\0', sizeof info);
        info.dwOSVersionInfoSize = sizeof info;
        if (!GetVersionEx((OSVERSIONINFO *)&info)) {
                /*
@@ -332,6 +366,16 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
                g_string_append(str, "unknown Windows version");
                return;
        }
+
+       memset(&system_info, '\0', sizeof system_info);
+       /* 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) {
 
        case VER_PLATFORM_WIN32s:
@@ -396,33 +440,58 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
                                break;
 
                        case 2:
-                               g_string_append_printf(str, "Windows Server 2003");
+                               if ((info.wProductType == VER_NT_WORKSTATION) &&
+                                   (system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)) {
+                                       g_string_append_printf(str, "Windows XP Professional x64 Edition");
+                               } else {
+                                       g_string_append_printf(str, "Windows Server 2003");
+                                       if (system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+                                               g_string_append_printf(str, " x64 Edition");
+                               }
                                break;
 
                        default:
                                g_string_append_printf(str, "Windows NT, unknown version %lu.%lu",
-                                   info.dwMajorVersion, info.dwMinorVersion);
+                                                      info.dwMajorVersion, info.dwMinorVersion);
                                break;
                        }
                        break;
 
-               case 6:
+               case 6: {
+                       gboolean is_nt_workstation;
+
+                       if (system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+                               g_string_append(str, "64-bit ");
+                       else if (system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
+                               g_string_append(str, "32-bit ");
 #ifndef VER_NT_WORKSTATION
 #define VER_NT_WORKSTATION 0x01
-                       if ((info.wReserved[1] & 0xff) == VER_NT_WORKSTATION)
+                       is_nt_workstation = ((info.wReserved[1] & 0xff) == VER_NT_WORKSTATION);
 #else
-                       if (info.wProductType == VER_NT_WORKSTATION)
+                       is_nt_workstation = (info.wProductType == VER_NT_WORKSTATION);
 #endif
-                               g_string_append_printf(str, "Windows Vista");
-                       else
-                               g_string_append_printf(str, "Windows Server 2008");
+                       switch (info.dwMinorVersion) {
+                       case 0:
+                               g_string_append_printf(str, is_nt_workstation ? "Windows Vista" : "Windows Server 2008");
+                               break;
+                       case 1:
+                               g_string_append_printf(str, is_nt_workstation ? "Windows 7" : "Windows Server 2008 R2");
+                               break;
+                       case 2:
+                               g_string_append_printf(str, is_nt_workstation ? "Windows 8" : "Windows Server 2012");
+                               break;
+                       default:
+                               g_string_append_printf(str, "Windows NT, unknown version %lu.%lu",
+                                                      info.dwMajorVersion, info.dwMinorVersion);
+                               break;
+                       }
                        break;
-
+               }  /* case 6 */
                default:
                        g_string_append_printf(str, "Windows NT, unknown version %lu.%lu",
                            info.dwMajorVersion, info.dwMinorVersion);
                        break;
-               }
+               } /* info.dwMajorVersion */
                break;
 
        default:
@@ -439,7 +508,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
         */
        if (uname(&name) < 0) {
                g_string_append_printf(str, "unknown OS version (uname failed - %s)",
-                   strerror(errno));
+                   g_strerror(errno));
                return;
        }
 
@@ -461,46 +530,202 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
                 * On Solaris, it's some kind of build information.
                 * On HP-UX, it appears to be some sort of subrevision
                 * thing.
+                * On *BSD and Darwin/OS X, it's a long string giving
+                * a build date, config file name, etc., etc., etc..
                 */
-               g_string_append_printf(str, "%s %s", name.sysname, name.release);
 #ifdef HAVE_OS_X_FRAMEWORKS
-               Gestalt(gestaltSystemVersion, &macosx_ver);
-
-               /* The following functions are only available in MacOS 10.4+ */
-               if(macosx_ver >= 0x1040) {
-                       Gestalt(gestaltSystemVersionMajor, &macosx_major_ver);
-                       Gestalt(gestaltSystemVersionMinor, &macosx_minor_ver);
-                       Gestalt(gestaltSystemVersionBugFix, &macosx_bugfix_ver);
-
-                       g_string_append_printf(str, " (MacOS %ld.%ld.%ld)",
-                                         macosx_major_ver,
-                                         macosx_minor_ver,
-                                         macosx_bugfix_ver);
+               /*
+                * On Mac OS X, report the Mac OS X version number as
+                * the OS version if we can, and put the Darwin information
+                * in parentheses.
+                */
+               if (get_os_x_version_info(str)) {
+                       /* Success - append the Darwin information. */
+                       g_string_append_printf(str, " (%s %s)", name.sysname, name.release);
                } else {
-                       g_string_append_printf(str, " (MacOS X < 10.4 [%lx])",
-                                         macosx_ver);
-                       /* See Apple's Gestalt Manager Reference for meanings
-                        * of the macosx_ver values. */
+                       /* Failure - just use the Darwin information. */
+                       g_string_append_printf(str, "%s %s", name.sysname, name.release);
                }
+#else /* HAVE_OS_X_FRAMEWORKS */
+               /*
+                * XXX - on Linux, are there any APIs to get the distribution
+                * name and version number?  I think some distributions have
+                * that.
+                *
+                * At least on Linux Standard Base-compliant distributions,
+                * there's an "lsb_release" command.  However:
+                *
+                *      http://forums.fedoraforum.org/showthread.php?t=220885
+                *
+                * seems to suggest that if you don't have the redhat-lsb
+                * package installed, you don't have lsb_release, and that
+                * /etc/fedora-release has the release information on
+                * Fedora.
+                *
+                *      http://linux.die.net/man/1/lsb_release
+                *
+                * suggests that there's an /etc/distrib-release file, but
+                * it doesn't indicate whether "distrib" is literally
+                * "distrib" or is the name for the distribution, and
+                * also speaks of an /etc/debian_version file.
+                *
+                * "lsb_release" apparently parses /etc/lsb-release, which
+                * has shell-style assignments, assigning to, among other
+                * values, DISTRIB_ID (distributor/distribution name),
+                * DISTRIB_RELEASE (release number of the distribution),
+                * DISTRIB_DESCRIPTION (*might* be name followed by version,
+                * but the manpage for lsb_release seems to indicate that's
+                * not guaranteed), and DISTRIB_CODENAME (code name, e.g.
+                * "licentious" for the Ubuntu Licentious Lemur release).
+                * the lsb_release man page also speaks of the distrib-release
+                * file, but Debian doesn't have one, and Ubuntu 7's
+                * lsb_release command doesn't look for one.
+                *
+                * I've seen references to /etc/redhat-release as well.
+                *
+                * At least on my Ubuntu 7 system, /etc/debian_version
+                * doesn't contain anything interesting (just some Debian
+                * codenames).
+                *
+                * See also
+                *
+                *      http://bugs.python.org/issue1322
+                *
+                *      http://www.novell.com/coolsolutions/feature/11251.html
+                *
+                *      http://linuxmafia.com/faq/Admin/release-files.html
+                *
+                * and the Lib/Platform.py file in recent Python 2.x
+                * releases.
+                */
+               g_string_append_printf(str, "%s %s", name.sysname, name.release);
 #endif /* HAVE_OS_X_FRAMEWORKS */
        }
 #else
        g_string_append(str, "an unknown OS");
 #endif
+}
+
+
+/*
+ * Get the CPU info, and append it to the GString
+ */
+
+#if defined(_MSC_VER)
+static void
+do_cpuid(int *CPUInfo, guint32 selector){
+       __cpuid(CPUInfo, selector);
+}
+#elif defined(__GNUC__)
+#if defined(__x86_64__)  
+static inline void
+do_cpuid(guint32 *CPUInfo, int selector)
+{
+       __asm__ __volatile__("cpuid"
+                                               : "=a" (CPUInfo[0]),
+                                                       "=b" (CPUInfo[1]),
+                                                       "=c" (CPUInfo[2]),
+                                                       "=d" (CPUInfo[3])
+                                               : "a"(selector));
+}
+#else /* (__i386__) */
+/* would need a test if older proccesors have the cpuid instruction */
+static void
+do_cpuid(guint32 *CPUInfo, int selector _U_){
+       CPUInfo[0] = 0;
+}
+
+#endif /* defined(__x86_64__)*/
+#else /* Other compilers */
+static void
+do_cpuid(guint32 *CPUInfo, int selector _U_){
+       CPUInfo[0] = 0;
+}
+#endif
+
+/*
+ * Get CPU info on platforms where the cpuid instruction can be used skip 32 bit versions for GCC
+ *     http://www.intel.com/content/dam/www/public/us/en/documents/application-notes/processor-identification-cpuid-instruction-note.pdf
+ * the get_cpuid() routine will return 0 in CPUInfo[0] if cpuinfo isn't available.
+ */
+
+static void get_cpu_info(GString *str _U_)
+{
+#if defined(_MSC_VER)
+       int CPUInfo[4];
+#else
+       guint32 CPUInfo[4];
+#endif
+       char CPUBrandString[0x40];
+       unsigned nExIds;
+
+       /* http://msdn.microsoft.com/en-us/library/hskdteyh(v=vs.100).aspx */
+
+       /* Calling __cpuid with 0x80000000 as the InfoType argument*/
+       /* gets the number of valid extended IDs.*/
+       do_cpuid(CPUInfo, 0x80000000);
+       nExIds = CPUInfo[0];
+
+       if( nExIds<0x80000005)
+               return;
+       memset(CPUBrandString, 0, sizeof(CPUBrandString));
+
+       /* Interpret CPU brand string.*/
+       do_cpuid(CPUInfo, 0x80000002);
+       memcpy(CPUBrandString, CPUInfo, sizeof(CPUInfo));
+       do_cpuid(CPUInfo, 0x80000003);
+       memcpy(CPUBrandString + 16, CPUInfo, sizeof(CPUInfo));
+       do_cpuid(CPUInfo, 0x80000004);
+       memcpy(CPUBrandString + 32, CPUInfo, sizeof(CPUInfo));
+
+       g_string_append_printf(str, "\n%s", CPUBrandString);
+
+}
+
+static void get_mem_info(GString *str _U_)
+{
+#if defined(_WIN32)
+       MEMORYSTATUSEX statex;
+
+       statex.dwLength = sizeof (statex);
+       
+       if(GlobalMemoryStatusEx (&statex))
+               g_string_append_printf(str, ", with ""%" G_GINT64_MODIFIER "d" "MB of physical memory.\n", statex.ullTotalPhys/(1024*1024));
+#endif
+
+}
+
+/*
+ * Get various library run-time versions, and the OS version, and append
+ * them to the specified GString.
+ */
+void
+get_runtime_version_info(GString *str, void (*additional_info)(GString *))
+{
+#ifndef _WIN32
+       gchar *lang;
+#endif
+
+       g_string_append(str, "on ");
+
+       get_os_version_info(str);
+
+#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);
 
-    /* GnuTLS */
-#ifdef HAVE_LIBGNUTLS
-       g_string_append_printf(str, ", GnuTLS %s", gnutls_check_version(NULL));
-#endif /* HAVE_LIBGNUTLS */
-
-        /* Gcrypt */
-#ifdef HAVE_LIBGCRYPT
-       g_string_append_printf(str, ", Gcrypt %s", gcry_check_version(NULL));
-#endif /* HAVE_LIBGCRYPT */
+       /* zlib */
+#if defined(HAVE_LIBZ) && !defined(_WIN32)
+       g_string_append_printf(str, ", with libz %s", zlibVersion());
+#endif
 
        /* Additional application-dependent information */
        if (additional_info)
@@ -508,20 +733,36 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
 
        g_string_append(str, ".");
 
+       /* CPU Info */
+       get_cpu_info(str);
+
+       /* Get info about installed memory Windows only */
+       get_mem_info(str);
+
        /* 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__)
+       g_string_append_printf(str, "\n\nBuilt using llvm-gcc %s.\n", __VERSION__);
+#else /* boring old GCC */
        g_string_append_printf(str, "\n\nBuilt using gcc %s.\n", __VERSION__);
+#endif /* llvm */
 #elif defined(__HP_aCC)
        g_string_append_printf(str, "\n\nBuilt using HP aCC %d.\n", __HP_aCC);
 #elif defined(__xlC__)
@@ -545,21 +786,23 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
 #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 */
@@ -583,7 +826,7 @@ const char *
 get_copyright_info(void)
 {
        return
-"Copyright 1998-2009 Gerald Combs <gerald@wireshark.org> and contributors.\n"
+"Copyright 1998-2013 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";
 }
@@ -614,6 +857,6 @@ get_os_major_version()
  * 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:
  */