Rename DISSECTOR_HELPER_{SRC,OBJECTS} to

DISSECTOR_SUPPORT_{SRC,OBJECTS}.

Add some additional files, required by dissectors, to those lists.

Extract the stuff to get version information strings for libraries and
the OS, which is *not* needed by dissectors, from "util.c", which
contains routines that *are* needed by dissectors, and put it into a
separate file.

Make "dftest" link only with the dissector support stuff, not with all
of the Ethereal common files.

svn path=/trunk/; revision=9645

1 files changed, 345 insertions, 0 deletions

diff --git a/version_info.c b/version_info.c
new file mode 100644
index 0000000000..6e71175fc8
--- /dev/null
+++ b/version_info.c
@@ -0,0 +1,345 @@
+/* version_info.c
+ * Routines to report version information for stuff used by Ethereal
+ *
+ * $Id: version_info.c,v 1.1 2004/01/11 22:17:43 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_LIBPCAP
+#include <pcap.h>
+#endif /* HAVE_LIBPCAP */
+
+#include <glib.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBZ
+#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 */
+
+/*
+ * This has to come after the include of <pcap.h>, as the include of
+ * <pcap.h> might cause <winsock2.h> to be included, and if we've
+ * already included <winsock.h> as a result of including <windows.h>,
+ * we get a bunch of redefinitions.
+ */
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#ifdef HAVE_SOME_SNMP
+
+#ifdef HAVE_NET_SNMP
+#include <net-snmp/version.h>
+#endif /* HAVE_NET_SNMP */
+
+#ifdef HAVE_UCD_SNMP
+#include <ucd-snmp/version.h>
+#endif /* HAVE_UCD_SNMP */
+
+#endif /* HAVE_SOME_SNMP */
+
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
+#include "version_info.h"
+#include "pcap-util.h"
+
+/*
+ * See whether the last line in the string goes past column 80; if so,
+ * replace the blank at the specified point with a newline.
+ */
+static void
+do_word_wrap(GString *str, gint point)
+{
+	char *line_begin;
+
+	line_begin = strrchr(str->str, '\n');
+	if (line_begin == NULL)
+		line_begin = str->str;
+	else
+		line_begin++;
+	if (strlen(line_begin) > 80) {
+		g_assert(str->str[point] == ' ');
+		str->str[point] = '\n';
+	}
+}	
+
+/*
+ * Get various library compile-time versions and append them to
+ * the specified GString.
+ */
+void
+get_compiled_version_info(GString *str)
+{
+	gint break_point;
+
+	g_string_append(str, "with ");
+	g_string_sprintfa(str,
+#ifdef GLIB_MAJOR_VERSION
+	    "GLib %d.%d.%d,", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION,
+	    GLIB_MICRO_VERSION);
+#else
+	    "GLib (version unknown),");
+#endif
+
+	g_string_append(str, " ");
+	break_point = str->len - 1;
+	get_compiled_pcap_version(str);
+	g_string_append(str, ",");
+	do_word_wrap(str, break_point);
+
+	g_string_append(str, " ");
+	break_point = str->len - 1;
+#ifdef HAVE_LIBZ
+	g_string_append(str, "with libz ");
+#ifdef ZLIB_VERSION
+	g_string_append(str, ZLIB_VERSION);
+#else /* ZLIB_VERSION */
+	g_string_append(str, "(version unknown)");
+#endif /* ZLIB_VERSION */
+#else /* HAVE_LIBZ */
+	g_string_append(str, "without libz");
+#endif /* HAVE_LIBZ */
+	g_string_append(str, ",");
+	do_word_wrap(str, break_point);
+
+	g_string_append(str, " ");
+	break_point = str->len - 1;
+#ifdef HAVE_LIBPCRE
+	g_string_append(str, "with libpcre ");
+#ifdef PCRE_MAJOR
+#ifdef PCRE_MINOR
+	g_string_sprintfa(str, "%u.%u", PCRE_MAJOR, PCRE_MINOR);
+#else			/* PCRE_MINOR */
+	g_string_sprintfa(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 */
+
+	g_string_append(str, ",");
+	do_word_wrap(str, break_point);
+
+/* Oh, this is pretty. */
+/* Oh, ha.  you think that was pretty.  Try this:! --Wes */
+	g_string_append(str, " ");
+	break_point = str->len - 1;
+#ifdef HAVE_SOME_SNMP
+
+#ifdef HAVE_UCD_SNMP
+	g_string_append(str, "with UCD-SNMP ");
+	g_string_append(str, VersionInfo);
+#endif /* HAVE_UCD_SNMP */
+
+#ifdef HAVE_NET_SNMP
+	g_string_append(str, "with Net-SNMP ");
+	g_string_append(str, netsnmp_get_version());
+#endif /* HAVE_NET_SNMP */
+
+#else /* no SNMP library */
+	g_string_append(str, "without UCD-SNMP or Net-SNMP");
+#endif /* HAVE_SOME_SNMP */
+	g_string_append(str, ",");
+	do_word_wrap(str, break_point);
+
+	g_string_append(str, " ");
+	break_point = str->len - 1;
+#ifdef HAVE_GNU_ADNS
+	g_string_append(str, "with ADNS");
+#else
+	g_string_append(str, "without ADNS");
+#endif /* HAVE_GNU_ADNS */
+
+	g_string_append(str, ".");
+	do_word_wrap(str, break_point);
+
+#ifndef HAVE_LIBPCRE
+	break_point = str->len - 1;
+	g_string_append(str,
+			"\nNOTE: this build does not support the \"matches\" operator"
+			"\nfor Ethereal filter syntax.\n");
+	do_word_wrap(str, break_point);
+#endif	/* HAVE_LIBPCRE */
+}
+
+/*
+ * Get various library run-time versions, and the OS version, and append
+ * them to the specified GString.
+ */
+void
+get_runtime_version_info(GString *str)
+{
+#if defined(WIN32)
+	OSVERSIONINFO info;
+#elif defined(HAVE_SYS_UTSNAME_H)
+	struct utsname name;
+#endif
+
+	get_runtime_pcap_version(str);
+
+	g_string_append(str, "on ");
+#if defined(WIN32)
+	info.dwOSVersionInfoSize = sizeof info;
+	if (!GetVersionEx(&info)) {
+		/*
+		 * XXX - get the failure reason.
+		 */
+		g_string_append(str, "unknown Windows version");
+		return;
+	}
+	switch (info.dwPlatformId) {
+
+	case VER_PLATFORM_WIN32s:
+		/* Shyeah, right. */
+		g_string_sprintfa(str, "Windows 3.1 with Win32s");
+		break;
+
+	case VER_PLATFORM_WIN32_WINDOWS:
+		/* Windows OT */
+		switch (info.dwMajorVersion) {
+
+		case 4:
+			/* 3 cheers for Microsoft marketing! */
+			switch (info.dwMinorVersion) {
+
+			case 0:
+				g_string_sprintfa(str, "Windows 95");
+				break;
+
+			case 10:
+				g_string_sprintfa(str, "Windows 98");
+				break;
+
+			case 90:
+				g_string_sprintfa(str, "Windows Me");
+				break;
+
+			default:
+				g_string_sprintfa(str, "Windows OT, unknown version %lu.%lu",
+				    info.dwMajorVersion, info.dwMinorVersion);
+				break;
+			}
+			break;
+
+		default:
+			g_string_sprintfa(str, "Windows OT, unknown version %lu.%lu",
+			    info.dwMajorVersion, info.dwMinorVersion);
+			break;
+		}
+		break;
+
+	case VER_PLATFORM_WIN32_NT:
+		/* Windows NT */
+		switch (info.dwMajorVersion) {
+
+		case 3:
+		case 4:
+			g_string_sprintfa(str, "Windows NT %lu.%lu",
+			    info.dwMajorVersion, info.dwMinorVersion);
+			break;
+
+		case 5:
+			/* 3 cheers for Microsoft marketing! */
+			switch (info.dwMinorVersion) {
+
+			case 0:
+				g_string_sprintfa(str, "Windows 2000");
+				break;
+
+			case 1:
+				g_string_sprintfa(str, "Windows XP");
+				break;
+
+			case 2:
+				g_string_sprintfa(str, "Windows Server 2003");
+				break;
+
+			default:
+				g_string_sprintfa(str, "Windows NT, unknown version %lu.%lu",
+				    info.dwMajorVersion, info.dwMinorVersion);
+				break;
+			}
+			break;
+
+		default:
+			g_string_sprintfa(str, "Windows NT, unknown version %lu.%lu",
+			    info.dwMajorVersion, info.dwMinorVersion);
+			break;
+		}
+		break;
+
+	default:
+		g_string_sprintfa(str, "Unknown Windows platform %lu version %lu.%lu",
+		    info.dwPlatformId, info.dwMajorVersion, info.dwMinorVersion);
+		break;
+	}
+	if (info.szCSDVersion[0] != '\0')
+		g_string_sprintfa(str, " %s", info.szCSDVersion);
+	g_string_sprintfa(str, ", build %lu", info.dwBuildNumber);
+#elif defined(HAVE_SYS_UTSNAME_H)
+	/*
+	 * We have <sys/utsname.h>, so we assume we have "uname()".
+	 */
+	if (uname(&name) < 0) {
+		g_string_sprintfa(str, "unknown OS version (uname failed - %s)",
+		    strerror(errno));
+		return;
+	}
+
+	if (strcmp(name.sysname, "AIX") == 0) {
+		/*
+		 * Yay, IBM!  Thanks for doing something different
+		 * from most of the other UNIXes out there, and
+		 * making "name.version" apparently be the major
+		 * version number and "name.release" be the minor
+		 * version number.
+		 */
+		g_string_sprintfa(str, "%s %s.%s", name.sysname, name.version,
+		    name.release);
+	} else {
+		/*
+		 * XXX - get "version" on any other platforms?
+		 *
+		 * On Digital/Tru65 UNIX, it's something unknown.
+		 * On Solaris, it's some kind of build information.
+		 * On HP-UX, it appears to be some sort of subrevision
+		 * thing.
+		 */
+		g_string_sprintfa(str, "%s %s", name.sysname, name.release);
+	}
+#else
+	g_string_append(str, "an unknown OS");
+#endif
+}