diff -Naur orig_wireshark-0.99.5-fc7/configure.in orig_wireshark-0.99.5-fc7-clique/configure.in --- orig_wireshark-0.99.5-fc7/configure.in 2008-03-16 23:13:11.000000000 -0400 +++ orig_wireshark-0.99.5-fc7-clique/configure.in 2008-03-16 23:19:57.000000000 -0400 @@ -1390,6 +1390,7 @@ plugins/pcli/Makefile plugins/profinet/Makefile plugins/rlm/Makefile + plugins/clique-rm/Makefile plugins/rtnet/Makefile plugins/rudp/Makefile plugins/sbus/Makefile diff -Naur orig_wireshark-0.99.5-fc7/configure.in.orig orig_wireshark-0.99.5-fc7-clique/configure.in.orig --- orig_wireshark-0.99.5-fc7/configure.in.orig 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/configure.in.orig 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,1491 @@ +# $Id: configure.in 20410 2007-01-12 21:04:33Z guy $ +# +AC_INIT(cfile.h) + +AC_PREREQ(2.52) + +dnl Check for CPU / vendor / OS +dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or +dnl `AC_CANONICAL_HOST', or `AC_CANONICAL_TARGET', depending on the +dnl needs. Using `AC_CANONICAL_TARGET' is enough to run the two other +dnl macros. + +dnl AC_CANONICAL_HOST +dnl AC_CANONICAL_BUILD +AC_CANONICAL_TARGET + +AM_INIT_AUTOMAKE(wireshark, 0.99.5) + +AM_DISABLE_STATIC + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_CPP +dnl Work around libtool bug (fixed in the version 1.5a?) +AC_DEFUN([AC_PROVIDE_AC_LIBTOOL_DLOPEN], ) +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL +AC_PROG_YACC +AM_PROG_LEX +AC_PATH_PROG(PERL, perl) +AC_PATH_PROG(POD2MAN, pod2man) +if test "x$POD2MAN" = x +then + # + # The alternative is not to build the man pages.... + # + AC_MSG_ERROR(I couldn't find pod2man; make sure it's installed and in your path) +fi +AC_PATH_PROG(POD2HTML, pod2html) +if test "x$POD2HTML" = x +then + # + # The alternative is not to build the HTML man pages.... + # + AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path) +fi +AC_PATH_PROG(HTML_VIEWER, htmlview) +if test "x$HTML_VIEWER" = x +then + AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla]) +else + AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla]) +fi + +AC_PATH_PROG(LEX, flex) +AC_PATH_PROG(PYTHON, python) + +AC_SUBST(PERL) +AC_SUBST(POD2MAN) +AC_SUBST(POD2HTML) +AC_SUBST(LEX) +AC_SUBST(FLEX_PATH) +AC_SUBST(PYTHON) +AC_SUBST(XSLTPROC) +AC_SUBST(XMLLINT) + +if test "x$CC_FOR_BUILD" = x +then + CC_FOR_BUILD=$CC +fi +AC_SUBST(CC_FOR_BUILD) + +# Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) +AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, "yes", "no") +AM_CONDITIONAL(HAVE_DOXYGEN, test x$HAVE_DOXYGEN = xyes) + +# gnu tls +AM_PATH_LIBGNUTLS(1.0.0, + [ + echo "gnuTLS found, enabling ssl decryption" + AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use gnutls library]) + tls_message="yes" + ] + , [ + if test x$libgnutls_config_prefix != x ; then + AC_MSG_ERROR([[gnuTLS not found; install gnuTLS-devel package for your system]]) + else + echo echo "gnuTLS not found, disabling ssl decryption" + tls_message="no" + fi + ] +) + +# libgrypt +AM_PATH_LIBGCRYPT(1.1.42, + [ + echo "libgcrypt found, enabling ipsec decryption" + AC_DEFINE(HAVE_LIBGCRYPT, 1, [Define to use libgcrypt]) + gcrypt_message="yes" + ] + , [ + if test x$libgcrypt_config_prefix != x ; then + AC_MSG_ERROR([[libgcrypt not found; install libgcrypt-devel package for your system]]) + else + echo echo "libgcrypt not found, disabling ipsec decryption" + gcrypt_message="no" + fi + ] +) + +# Check for xsltproc +AC_PATH_PROG(XSLTPROC, xsltproc) +AC_CHECK_PROG(HAVE_XSLTPROC, xsltproc, "yes", "no") +AM_CONDITIONAL(HAVE_XSLTPROC, test x$HAVE_XSLTPROC = xyes) + +# Check for xmllint +AC_PATH_PROG(XMLLINT, xmllint) +AC_CHECK_PROG(HAVE_XMLLINT, xmllint, "yes", "no") +AM_CONDITIONAL(HAVE_XMLLINT, test x$HAVE_XMLLINT = xyes) + +# Check for fop (translate .fo to e.g. pdf) +AC_PATH_PROG(FOP, fop) +AC_CHECK_PROG(HAVE_FOP, fop, "yes", "no") +AM_CONDITIONAL(HAVE_FOP, test x$HAVE_FOP = xyes) + +# Check for hhc (html help compiler) +AC_PATH_PROG(HHC, hhc.exe) +AC_CHECK_PROG(HAVE_HHC, hhc.exe, "yes", "no") +AM_CONDITIONAL(HAVE_HHC, test x$HAVE_HHC = xyes) + +# Check for packaging utilities +# For now, we check to see if the various packaging utilites are in our +# path. I'm too lazy to write code to go hunt for them. - Gerald +AC_CHECK_PROG(HAVE_PKGPROTO, pkgproto, "yes", "no") +AC_CHECK_PROG(HAVE_PKGMK, pkgmk, "yes", "no") +AC_CHECK_PROG(HAVE_PKGTRANS, pkgtrans, "yes", "no") + +if test x$HAVE_PKGPROTO = xyes -a x$HAVE_PKGMK = xyes \ + -a x$HAVE_PKGTRANS = xyes ; then + HAVE_SVR4_PACKAGING=yes +else + HAVE_SVR4_PACKAGING=no +fi +AC_SUBST(HAVE_SVR4_PACKAGING) + +AC_WIRESHARK_RPM_CHECK +AC_SUBST(HAVE_RPM) + +# +# If we're running gcc, add '-Wall -W' to CFLAGS, and add +# '-D_U_="__attribute__((unused))"' as well, so we can use _U_ to +# flag unused function arguments and not get warnings about them. +# If "--with-extra-gcc-checks" was specified, add "-Wcast-qual +# -Wcast-align" as well. (Add more checks here in the future?) +# +# Otherwise, add '-D_U_=""', so that _U_ used to flag an unused function +# argument will compile with non-GCC compilers. +# +AC_ARG_WITH(extra-gcc-checks, +[ --with-extra-gcc-checks Do additional -W checks in GCC. [default=no]], +[ + if test $withval != no + then + wireshark_extra_gcc_flags=" -Wcast-qual -Wcast-align -Wbad-function-cast -pedantic -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings" + fi +],) +AC_MSG_CHECKING(to see if we can add '-Wall -W $wireshark_extra_gcc_flags' to CFLAGS) +if test x$GCC != x ; then + CFLAGS="-D_U_=\"__attribute__((unused))\" -Wall -Wpointer-arith -W $wireshark_extra_gcc_flags $CFLAGS" + AC_MSG_RESULT(yes) +else + CFLAGS="-D_U_=\"\" $CFLAGS" + AC_MSG_RESULT(no) +fi + +# +# Add any platform-specific compiler flags needed. +# +AC_MSG_CHECKING(for platform-specific compiler flags) +if test "x$GCC" = x +then + # + # Not GCC - assume it's the vendor's compiler. + # + case "$host_os" in + hpux*) + # + # HP's ANSI C compiler; flags suggested by Jost Martin. + # "-Ae" for ANSI C plus extensions such as "long long". + # "+O2", for optimization. XXX - works with "-g"? + # + CFLAGS="-Ae +O2 $CFLAGS" + AC_MSG_RESULT(HP ANSI C compiler - added -Ae +O2) + ;; + darwin*) + # + # It may be called "cc", but it's really a GCC derivative + # with a problematic special precompiler and precompiled + # headers; turn off the special precompiler, as some + # apparently-legal code won't compile with its precompiled + # headers. + # + CFLAGS="-no-cpp-precomp $CFLAGS" + AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp) + ;; + *) + AC_MSG_RESULT(none needed) + ;; + esac +else + case "$host_os" in + solaris*) + # the X11 headers don't automatically include prototype info + # and a lot don't include the return type + CFLAGS="$CFLAGS -Wno-return-type -DFUNCPROTO=15" + AC_MSG_RESULT(GCC on Solaris - added -Wno-return-type -DFUNCPROTO=15) + ;; + darwin*) + # + # See comments above about Apple's lovely C compiler. + # + CFLAGS="-no-cpp-precomp $CFLAGS" + AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp) + ;; + *) + AC_MSG_RESULT(none needed) + ;; + esac +fi + +# +# Add any platform-specific linker flags needed. +# +AC_MSG_CHECKING(for platform-specific linker flags) +case "$host_os" in +darwin*) + # + # Add -Wl,-single_module to the LDFLAGS used with shared + # libraries, to fix some error that show up in some cases; + # some Apple documentation recommends it for most shared + # libraries. + # + LDFLAGS_SHAREDLIB="-Wl,-single_module" + # + # Add -Wl,-search_paths_first to make sure that if we search + # directories A and B, in that order, for a given library, a + # non-shared version in directory A, rather than a shared + # version in directory B, is chosen (so we can use + # --with-pcap=/usr/local to force all programs to be linked + # with a static version installed in /usr/local/lib rather than + # the system version in /usr/lib). + # + LDFLAGS="-Wl,-search_paths_first $LDFLAGS" + AC_MSG_RESULT(Apple linker - added -Wl,-single_module and -Wl,-search_paths_first) + ;; +cygwin*) + # + # Shared libraries in cygwin/Win32 must never contain + # undefined symbols. + # + LDFLAGS="$LDFLAGS -no-undefined" + AC_MSG_RESULT(CygWin GNU ld - added -no-undefined) + ;; +*) + AC_MSG_RESULT(none needed) + ;; +esac +AC_SUBST(LDFLAGS_SHAREDLIB) + +# +# On OS X, if we find the headers for Core Foundation and Launch Services, +# add -framework options to link with Application Services (of which +# Launch Services is a subframework) and Core Foundation (required by +# the Launch Services APIs), so we can use that to launch a Web browser +# from the Help menu. +# +# (Do those headers exist on pure Darwin? If so, does the CoreFoundation +# *and* Launch Services code exist there, or are those headers just stubs? +# If the frameworks aren't present on Darwin, how *should* we check for +# their existence?) +# +case "$host_os" in + +darwin*) + AC_MSG_CHECKING(whether we can build with Core Foundation and Launch Services) + ac_save_LIBS="$LIBS" + ac_frameworks="-framework ApplicationServices -framework CoreFoundation" + LIBS="$LIBS $ac_frameworks" + AC_TRY_LINK( + [ +# include +# include +# include +# include + ], + [ + CFStringRef url_CFString; + CFURLRef url_CFURL; + OSStatus status; + + url_CFString = CFStringCreateWithCString(NULL, "", kCFStringEncodingASCII); + url_CFURL = CFURLCreateWithString(NULL, url_CFString, NULL); + status = LSOpenCFURLRef(url_CFURL, NULL); + ], + ac_cv_can_use_cf_and_ls=yes, + ac_cv_can_use_cf_and_ls=no, + [echo $ac_n "cross compiling; assumed OK... $ac_c"]) + if test "$ac_cv_can_use_cf_and_ls" = yes ; then + AC_DEFINE(HAVE_OS_X_FRAMEWORKS, 1, [Define to 1 if you have OS X frameworks]) + FRAMEWORKS="$ac_frameworks" + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + LIBS="$ac_save_LIBS" + ;; +esac +AC_SUBST(FRAMEWORKS) + +dnl Look in /usr/local for header files and libraries ? +dnl XXX FIXME don't include /usr/local if it is already in the system +dnl search path as this causes gcc 3.2 on Linux to complain about a change +dnl of the system search order for includes +AC_ARG_ENABLE(usr-local, +[ --enable-usr-local look for headers and libs in /usr/local tree. [default=yes]],ac_cv_enable_usr_local=$enableval,ac_cv_enable_usr_local=yes) + +AC_MSG_CHECKING(whether to use /usr/local for headers and libraries) +if test "x$ac_cv_enable_usr_local" = "xyes" ; then + AC_MSG_RESULT(yes) + # + # Arrange that we search for header files in the source directory + # and in its "wiretap" subdirectory, as well as in "/usr/local/include", + # as various packages we use ("libpcap", "zlib", an SNMP library) + # may have been installed under "/usr/local/include". + # + CFLAGS="$CFLAGS -I/usr/local/include" + CPPFLAGS="$CPPFLAGS -I/usr/local/include" + + # + # Arrange that we search for libraries in "/usr/local/lib". + # + AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib) +else + AC_MSG_RESULT(no) +fi + +# +# If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a +# link directory. +# +case "$host_os" in + solaris*) + AC_MSG_CHECKING(for LD_LIBRARY_PATH, since you appear to be running Solaris) + if test x$LD_LIBRARY_PATH != x ; then + LIBS="$LIBS -R$LD_LIBRARY_PATH" + AC_MSG_RESULT(yes -- added LD_LIBRARY_PATH to run-time linker path) + else + AC_MSG_RESULT(no -- this may be a problem in a few seconds) + fi + ;; +esac + +# +# Check for versions of "sed" inadequate to handle, in libtool, a list +# of object files as large as the list in Wireshark. +# +# On Solaris, we check for "/bin/sed", "/usr/bin/sed", and "/usr/ucb/sed", +# as both "/usr/bin/sed" (which is also "/bin/sed", as "/bin" is just a +# symlink to "/usr/bin", but people may have "/bin" before "/usr/bin" in +# their search path) and "/usr/ucb/sed" are inadequate; "/usr/xpg4/bin/sed" +# is the only "sed" that comes with Solaris that can handle Wireshark. +# +# Add any checks here that are necessary for other OSes. +# +AC_WIRESHARK_GNU_SED_CHECK +if test "$HAVE_GNU_SED" = no ; then + case "$host_os" in + solaris*) + AC_MSG_CHECKING(whether one of /usr/bin/sed or /bin/sed or /usr/ucb/sed will be used) + case `which sed` in + /bin/sed|/usr/bin/sed|/usr/ucb/sed) + AC_MSG_RESULT(yes) + AC_MSG_ERROR([change your path to search /usr/xpg4/bin or directory containing GNU sed before /usr/bin (and /bin and /usr/ucb)]) + ;; + + *) + AC_MSG_RESULT(no) + ;; + esac + ;; + + *) + : + ;; + esac +fi + +# Enable/disable tshark + +AC_ARG_ENABLE(wireshark, +[ --enable-wireshark build GTK+-based wireshark. [default=yes]],enable_wireshark=$enableval,enable_wireshark=yes) + +AC_ARG_ENABLE(gtk2, +[ --disable-gtk2 build Glib1/Gtk1+-based wireshark. [default=no]],enable_gtk2=$enableval,enable_gtk2=yes) +AM_CONDITIONAL(USE_GTK2, test x$enable_gtk2 = xyes) + +AC_ARG_ENABLE(threads, +[ --enable-threads use threads in wireshark. [default=no]],enable_threads=$enableval,enable_threads=no) +AM_CONDITIONAL(USE_THREADS, test x$enable_threads = xyes) + +AC_ARG_ENABLE(profile-build, +[ --enable-profile-build build profile-ready binaries. [default=no]],enable_profile_build=$enableval,enable_profile_build=no) +AM_CONDITIONAL(USE_PROFILE_BUILD, test x$enable_profile_build = xyes) +AC_MSG_CHECKING(if profile builds must be generated) +if test "x$enable_profile_build" = "xyes" ; then + if test -n "$GCC" ; then + AC_MSG_RESULT(yes) + CFLAGS=" -pg $CFLAGS" + else + AC_MSG_RESULT(no) + echo "Building profile binaries currently only supported for GCC." + fi +else + AC_MSG_RESULT(no) +fi + +# Create DATAFILE_DIR #define for config.h +datafiledir=$datadir/wireshark +datafiledir=`( + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=${prefix} + # Ugly hack, but I don't see how this problem can be solved + # properly that DATAFILE_DIR had a value starting with + # "${prefix}/" instead of e.g. "/usr/local/" + eval eval echo "$datafiledir" +)` +AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data]) + +# GTK checks +# We don't add $GLIB_LIBS to LIBS, because we don't want to force all +# programs to be built with GTK+. +# +if test "x$enable_gtk2" = "xyes" -a "x$enable_wireshark" = "xyes" ; then + GTK_OK=two + AM_PATH_GTK_2_0(2.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no, gthread) +elif test "x$enable_gtk2" != "xyes" -a "x$enable_wireshark" = "xyes" ; then + GTK_OK=one + AM_PATH_GTK(1.2.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no ) +else + GTK_OK=no +fi + +# GLib checks +# This doesn't add GLIB_CFLAGS to CFLAGS, because AM_PATH_GTK will add +# GTK_CFLAGS to CFLAGS, and GTK_CFLAGS is a superset of CFLAGS. +# However, this means that both @GLIB_LIBS@ and @GTK_LIBS@ will be +# set when generating the Makefile, so we can make programs that require +# only GLib link with @GLIB_LIBS@ and make programs that require GTK+ +# link with @GTK_LIBS@ (which includes @GLIB_LIBS@). +# We don't add $GLIB_LIBS to LIBS, because we don't want to force all +# programs to be built with GLib. +# +if test "$GTK_OK" = "no" ; then + enable_wireshark="no" + wireshark_bin="" + wireshark_man="" + # Honor GLIB_CFLAGS + if test "x$enable_gtk2" = "xyes" ; then + AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule) + else + AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule) + fi +else + wireshark_bin="wireshark\$(EXEEXT)" + wireshark_man="wireshark.1" + wireshark_SUBDIRS="codecs gtk" + # Honor GLIB_CFLAGS + if test "$GTK_OK" = "two" ; then + AM_PATH_GLIB_2_0(2.0.0, , AC_MSG_ERROR(GLib distribution not found.), gmodule) + else + AM_PATH_GLIB(1.2.0, , AC_MSG_ERROR(GLib distribution not found.), gmodule) + fi +fi + +# +# Check whether GLib modules are supported, to determine whether we +# can support plugins. +# +AC_MSG_CHECKING(whether GLib supports loadable modules) +ac_save_CFLAGS="$CFLAGS" +ac_save_LIBS="$LIBS" +CFLAGS="$CFLAGS $GLIB_CFLAGS" +LIBS="$GLIB_LIBS $LIBS" +AC_TRY_RUN([ +#include +#include +#include +#include + +int +main () +{ + if (g_module_supported()) + return 0; /* success */ + else + return 1; /* failure */ +} +], ac_cv_glib_supports_modules=yes, ac_cv_glib_supports_modules=no, + [echo $ac_n "cross compiling; assumed OK... $ac_c" + ac_cv_glib_supports_modules=yes]) +CFLAGS="$ac_save_CFLAGS" +LIBS="$ac_save_LIBS" +if test "$ac_cv_glib_supports_modules" = yes ; then + AC_MSG_RESULT(yes) + have_plugins=yes +else + AC_MSG_RESULT(no) + have_plugins=no +fi + +# +# We can't just check for - some systems have one that +# doesn't define all the PRI[doxu]64 macros. +# +AC_CHECK_HEADERS(inttypes.h, + [ + # + # OK, we have inttypes.h, but does it define those macros? + # + AC_MSG_CHECKING([[whether inttypes.h defines the PRI[doxu]64 macros]]) + AC_COMPILE_IFELSE( + [ + AC_LANG_SOURCE( + [[ + #include + #include + #include + #include + + main() + { + printf("%" PRId64 "\n", (gint64)1); + printf("%" PRIo64 "\n", (guint64)1); + printf("%" PRIx64 "\n", (guint64)1); + printf("%" PRIX64 "\n", (guint64)1); + printf("%" PRIu64 "\n", (guint64)1); + } + ]]) + ], + [ + AC_MSG_RESULT(yes) + ac_wireshark_inttypes_h_defines_formats=yes + ], + [ + AC_MSG_RESULT(no) + ac_wireshark_inttypes_h_defines_formats=no + ]) + ], + [ + # + # We don't have inttypes.h, so it obviously can't define those + # macros. + # + ac_wireshark_inttypes_h_defines_formats=no + ]) +if test "$ac_wireshark_inttypes_h_defines_formats" = yes; then + AC_DEFINE(INTTYPES_H_DEFINES_FORMATS,,[Define if defines PRI[doxu]64 macros]) +else + AC_WIRESHARK_CHECK_64BIT_FORMAT(ll, + [ + AC_WIRESHARK_CHECK_64BIT_FORMAT(L, + [ + AC_WIRESHARK_CHECK_64BIT_FORMAT(q, + [ + AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer]) + ]) + ]) + ]) +fi + +AC_SUBST(wireshark_bin) +AC_SUBST(wireshark_man) + +rdps_bin="rdps\$(EXEEXT)" +AC_SUBST(rdps_bin) + + +# Enable/disable tshark + +AC_ARG_ENABLE(tshark, +[ --enable-tshark build tshark. [default=yes]],tshark=$enableval,enable_tshark=yes) + +if test "x$enable_tshark" = "xyes" ; then + tshark_bin="tshark\$(EXEEXT)" + tshark_man="tshark.1" + wiresharkfilter_man="wireshark-filter.4" +else + tshark_bin="" + tshark_man="" +fi +AC_SUBST(tshark_bin) +AC_SUBST(tshark_man) +AC_SUBST(wiresharkfilter_man) + + + +# Enable/disable editcap + +AC_ARG_ENABLE(editcap, +[ --enable-editcap build editcap. [default=yes]],enable_editcap=$enableval,enable_editcap=yes) + +if test "x$enable_editcap" = "xyes" ; then + editcap_bin="editcap\$(EXEEXT)" + editcap_man="editcap.1" +else + editcap_bin="" + editcap_man="" +fi +AC_SUBST(editcap_bin) +AC_SUBST(editcap_man) + + +# Enable/disable dumpcap + +AC_ARG_ENABLE(dumpcap, +[ --enable-dumpcap build dumpcap. [default=yes]],enable_dumpcap=$enableval,enable_dumpcap=yes) + +if test "x$enable_dumpcap" = "xyes" ; then + dumpcap_bin="dumpcap\$(EXEEXT)" + dumpcap_man="dumpcap.1" +else + dumpcap_bin="" + dumpcap_man="" +fi +AC_SUBST(dumpcap_bin) +AC_SUBST(dumpcap_man) + + +# Enable/disable capinfos + +AC_ARG_ENABLE(capinfos, +[ --enable-capinfos build capinfos. [default=yes]],enable_capinfos=$enableval,enable_capinfos=yes) + +if test "x$enable_capinfos" = "xyes" ; then + capinfos_bin="capinfos\$(EXEEXT)" + capinfos_man="capinfos.1" +else + capinfos_bin="" + capinfos_man="" +fi +AC_SUBST(capinfos_bin) +AC_SUBST(capinfos_man) + + +# Enable/disable mergecap + +AC_ARG_ENABLE(mergecap, +[ --enable-mergecap build mergecap. [default=yes]],enable_mergecap=$enableval,enable_mergecap=yes) + +if test "x$enable_mergecap" = "xyes" ; then + mergecap_bin="mergecap\$(EXEEXT)" + mergecap_man="mergecap.1" +else + mergecap_bin="" + mergecap_man="" +fi +AC_SUBST(mergecap_bin) +AC_SUBST(mergecap_man) + + +# Enable/disable text2pcap + +AC_ARG_ENABLE(text2pcap, +[ --enable-text2pcap build text2pcap. [default=yes]],text2pcap=$enableval,enable_text2pcap=yes) + +if test "x$enable_text2pcap" = "xyes" ; then + text2pcap_bin="text2pcap\$(EXEEXT)" + text2pcap_man="text2pcap.1" +else + text2pcap_bin="" + text2pcap_man="" +fi +AC_SUBST(text2pcap_bin) +AC_SUBST(text2pcap_man) + +# Enable/disable idl2wrs + +AC_ARG_ENABLE(idl2wrs, +[ --enable-idl2wrs build idl2wrs. [default=yes]],enable_idl2wrs=$enableval,enable_idl2wrs=yes) + +if test "x$enable_idl2wrs" = "xyes" ; then + idl2wrs_bin="idl2wrs" + idl2wrs_man="idl2wrs.1" +else + idl2wrs_bin="" + idl2wrs_man="" +fi +AC_SUBST(idl2wrs_bin) +AC_SUBST(idl2wrs_man) + + +# Enable/disable dftest + +AC_ARG_ENABLE(dftest, +[ --enable-dftest build dftest. [default=yes]],enable_dftest=$enableval,enable_dftest=yes) + +if test "x$enable_dftest" = "xyes" ; then + dftest_bin="dftest\$(EXEEXT)" +else + dftest_bin="" +fi +AC_SUBST(dftest_bin) + + +# Enable/disable randpkt + +AC_ARG_ENABLE(randpkt, +[ --enable-randpkt build randpkt. [default=yes]],enable_randpkt=$enableval,enable_randpkt=yes) + +if test "x$enable_randpkt" = "xyes" ; then + randpkt_bin="randpkt\$(EXEEXT)" +else + randpkt_bin="" +fi +AC_SUBST(randpkt_bin) + + +dnl Checks for "gethostbyname()" - and "-lnsl", if we need it to get +dnl "gethostbyname()". +AC_WIRESHARK_GETHOSTBY_LIB_CHECK + +dnl Checks for "connect()", used as a proxy for "socket()" - and +dnl "-lsocket", if we need it to get "connect()". +AC_WIRESHARK_SOCKET_LIB_CHECK + +dnl pcap check +AC_MSG_CHECKING(whether to use libpcap for packet capture) + +AC_ARG_WITH(pcap, +[ --with-pcap[[=DIR]] use libpcap for packet capturing. [[default=yes]]], +[ + if test $withval = no + then + want_pcap=no + elif test $withval = yes + then + want_pcap=yes + else + want_pcap=yes + pcap_dir=$withval + fi +],[ + want_pcap=yes + pcap_dir= +]) +if test "x$want_pcap" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_PCAP_CHECK +fi + +dnl zlib check +AC_MSG_CHECKING(whether to use zlib for reading compressed capture files) + +AC_ARG_WITH(zlib, +[ --with-zlib[[=DIR]] use zlib (located in directory DIR, if supplied) to read compressed data. [[default=yes, if available]]], +[ + if test $withval = no + then + want_zlib=no + elif test $withval = yes + then + want_zlib=yes + else + want_zlib=yes + zlib_dir=$withval + fi +],[ + # + # Use zlib if it's present, otherwise don't. + # + want_zlib=ifavailable + zlib_dir= +]) +if test "x$want_zlib" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_ZLIB_CHECK + if test "x$want_zlib" = "xno" ; then + AC_MSG_RESULT(zlib not found - disabling compressed capture file support) + fi +fi + + +dnl pcre check +AC_MSG_CHECKING(whether to use libpcre for regular expressions in dfilters) + +AC_ARG_WITH(pcre, +[ --with-pcre[[=DIR]] use libpcre (located in directory DIR, if supplied) to use in dfilter regular expressions. [[default=yes, if available]]], +[ + if test $withval = no + then + want_pcre=no + elif test $withval = yes + then + want_pcre=yes + else + want_pcre=yes + pcre_dir=$withval + fi +],[ + # + # Use libpcre if it's present, otherwise don't. + # + want_pcre=ifavailable + pcre_dir= +]) +if test "x$want_pcre" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_LIBPCRE_CHECK + if test "x$want_pcre" = "xno" ; then + AC_MSG_RESULT(libpcre not found - disabling support for perl compatible regular expressions in dfilters) + fi +fi + + +dnl lua check +AC_MSG_CHECKING(whether to use liblua for the lua scripting plugin) + +AC_ARG_WITH(lua, +[ --with-lua[[=DIR]] use liblua (located in directory DIR, if supplied) for the lua scripting plugin. [[default=no]]], +[ + if test $withval = no + then + want_lua=no + elif test $withval = yes + then + want_lua=yes + else + want_lua=yes + lua_dir=$withval + fi +],[ + # + # Don't use liblua by default (it isn't ready yet) + # + want_lua=no + lua_dir= +]) +if test "x$want_lua" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_LIBLUA_CHECK + if test "x$want_lua" = "xno" ; then + AC_MSG_RESULT(liblua not found - disabling support for the lua scripting plugin) + fi +fi +AM_CONDITIONAL(HAVE_LIBLUA, test x$want_lua = xyes) + + +dnl portaudio check +AC_MSG_CHECKING(whether to use libportaudio for the rtp_player) + +AC_ARG_WITH(portaudio, +[ --with-portaudio[[=DIR]] use libportaudio (located in directory DIR, if supplied) for the rtp_player. [[default=yes, if available]]], +[ + if test $withval = no + then + want_portaudio=no + elif test $withval = yes + then + want_portaudio=yes + else + want_portaudio=yes + portaudio_dir=$withval + fi +],[ + # + # Use libportaudio by default + # + want_portaudio=ifavailable + portaudio_dir= +]) +if test "x$want_portaudio" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_LIBPORTAUDIO_CHECK + if test "x$want_portaudio" = "xno" ; then + AC_MSG_RESULT(libportaudio not found - disabling support for the rtp_player) + fi +fi +AM_CONDITIONAL(HAVE_LIBPORTAUDIO, test x$want_portaudio = xyes) + + +dnl ipv6 check +AC_ARG_ENABLE(ipv6, +[ --enable-ipv6 use ipv6 name resolution, if available. [default=yes]],enable_ipv6=$enableval,enable_ipv6=yes) + +AC_MSG_CHECKING(whether to enable ipv6 name resolution if available) +if test "x$enable_ipv6" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_IPV6_STACK +fi + + +dnl Check if wireshark should be installed setuid +AC_ARG_ENABLE(setuid-install, +[ --enable-setuid-install install wireshark as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no) + +AC_MSG_CHECKING(whether to install wireshark setuid) +if test "x$enable_setuid_install" = "xno" ; then + AC_MSG_RESULT(no) +else + if test "x$enable_dumpcap" = "xno" ; then + AC_MSG_ERROR(Setuid install works only with --enable-dumpcap, but dumpcap disabled) + else + AC_MSG_RESULT(yes) + fi +fi + +AM_CONDITIONAL(SETUID_INSTALL, test x$enable_setuid_install = xyes) + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS(direct.h dirent.h fcntl.h netdb.h stdarg.h stddef.h unistd.h) +AC_CHECK_HEADERS(sys/ioctl.h sys/param.h sys/socket.h sys/sockio.h sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h) +AC_CHECK_HEADERS(netinet/in.h) +AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h) + +dnl iconv check +AM_ICONV + +dnl SSL Check +SSL_LIBS='' +AC_MSG_CHECKING(whether to use SSL library) + +AC_ARG_WITH(ssl, +[ --with-ssl[[=DIR]] use SSL crypto library (located in directory DIR, if supplied). [[default=no]]], +[ +if test "x$withval" = "xno"; then + want_ssl=no +elif test "x$withval" = "xyes"; then + want_ssl=yes +elif test -d "$withval"; then + want_ssl=yes + AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib) +fi +],[ + want_ssl=no +]) +if test "x$want_ssl" = "xyes"; then + AC_MSG_RESULT(yes) + AC_CHECK_LIB(crypto,EVP_md5, + [ + SSL_LIBS=-lcrypto + ], + [ + AC_MSG_ERROR([SSL crypto library was requested, but is not available]) + ]) +else + AC_MSG_RESULT(no) +fi +AC_SUBST(SSL_LIBS) + +dnl Net-SNMP Check +SNMP_LIBS='' + +AC_ARG_WITH(net-snmp, +[ --with-net-snmp[[=PATH]] use Net-SNMP library (with PATH as the location of the net-snmp-config shell script that comes with the net-snmp package, if supplied) [[default=yes, if available]]], +[ + if test $withval = no + then + want_netsnmp=no + elif test $withval = yes + then + want_netsnmp=yes + else + want_netsnmp=yes + netsnmpconfig="$withval" + fi +],[ + # + # Set "want_netsnmp" to "ifavailable" to make the default "use it + # if you find it, otherwise don't". + # + want_netsnmp=ifavailable +]) + +# +# Try Net-SNMP +# +AC_MSG_CHECKING(whether to use Net-SNMP library) +if test "x$want_netsnmp" = "xno" ; then + AC_MSG_RESULT(no) +else + if test "x$want_netsnmp" = "xifavailable" ; then + AC_MSG_RESULT([yes, if available]) + else + AC_MSG_RESULT(yes) + fi + AC_WIRESHARK_NETSNMP_CHECK +fi + +if test "x$have_net_snmp" = "xyes"; then + AC_DEFINE(HAVE_NET_SNMP, 1, [Define to 1 if Net-SNMP support is to be used]) +fi + +AC_SUBST(SNMP_LIBS) + + +dnl kerberos check +AC_MSG_CHECKING(whether to use kerberos) + +AC_ARG_WITH(krb5, +[ --with-krb5[[=DIR]] use kerberos (located in directory DIR, if supplied) to use in kerberos dissection [[default=yes]]], +[ + if test $withval = no + then + want_krb5=no + elif test $withval = yes + then + want_krb5=yes + else + want_krb5=yes + krb5_dir=$withval + fi +],[ + # + # Use kerberos if specified, otherwise don't. + # + want_krb5=ifavailable + krb5_dir= +]) +if test "x$want_krb5" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_KRB5_CHECK +fi + + +dnl ADNS Check +ADNS_LIBS='' +AC_MSG_CHECKING(whether to use the GNU ADNS library if available) + +AC_ARG_WITH(adns, +[ --with-adns[[=DIR]] use GNU ADNS (located in directory DIR, if supplied). [[default=yes, if present]]], +[ +if test "x$withval" = "xno"; then + want_adns=no +elif test "x$withval" = "xyes"; then + want_adns=yes +elif test -d "$withval"; then + want_adns=yes + AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib) +fi +]) +if test "x$with_adns" = "xno" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + AC_WIRESHARK_ADNS_CHECK +fi +AC_SUBST(ADNS_LIBS) + +# +# Define WS_VAR_IMPORT appropriately for declarations of external +# variables exported from dynamically-linked libraries. +# +AC_DEFINE(WS_VAR_IMPORT, extern, [Define as the string to precede external variable declarations in dynamically-linked libraries]) + +# +# Define HAVE_AIRPDCAP +# We'll want to remove this eventually. +# +AC_DEFINE(HAVE_AIRPDCAP, 1, [Enable AirPDcap (WPA/WPA2 decryption)]) + +dnl Checks for typedefs, structures, and compiler characteristics. +# AC_C_CONST + +# We need to know whether "struct sockaddr" has an "sa_len" member +# for get_interface_list(). + +AC_WIRESHARK_STRUCT_SA_LEN + +# We must know our byte order +AC_C_BIGENDIAN + +# Checks whether "-traditional" is needed when using "ioctl". +# XXX - do we need this? +AC_PROG_GCC_TRADITIONAL + +GETOPT_C="" +GETOPT_O="" +AC_CHECK_FUNC(getopt, GETOPT_O="", + [GETOPT_O="getopt.o" + AC_DEFINE(NEED_GETOPT_H, 1, [Define if getopt.h needs to be included]) +]) +if test "$ac_cv_func_getopt" = no ; then + GETOPT_C="getopt.c" + GETOPT_O="getopt.o" +fi +AC_SUBST(GETOPT_C) +AC_SUBST(GETOPT_O) + +AC_CHECK_FUNC(strerror, STRERROR_O="", + [STRERROR_O="strerror.o" + AC_DEFINE(NEED_STRERROR_H, 1, [Define if strerror.h needs to be included]) +]) +if test "$ac_cv_func_strerror" = no ; then + STRERROR_C="strerror.c" + STRERROR_O="strerror.o" +fi +AC_SUBST(STRERROR_C) +AC_SUBST(STRERROR_O) + +AC_CHECK_FUNC(strcasecmp, STRCASECMP_O="", + STRCASECMP_O="strcasecmp.o") +if test "$ac_cv_func_strcasecmp" = no ; then + STRCASECMP_C="strcasecmp.c" + STRCASECMP_O="strcasecmp.o" +fi +AC_SUBST(STRCASECMP_C) +AC_SUBST(STRCASECMP_O) + +AC_CHECK_FUNC(strncasecmp, STRNCASECMP_O="", + STRNCASECMP_O="strncasecmp.o") +if test "$ac_cv_func_strncasecmp" = no ; then + STRNCASECMP_C="strncasecmp.c" + STRNCASECMP_O="strncasecmp.o" +fi +AC_SUBST(STRNCASECMP_C) +AC_SUBST(STRNCASECMP_O) + +AC_CHECK_FUNC(mkstemp, MKSTEMP_O="", + MKSTEMP_O="mkstemp.o") +if test "$ac_cv_func_mkstemp" = no ; then + MKSTEMP_C="mkstemp.c" + MKSTEMP_O="mkstemp.o" +fi +AC_SUBST(MKSTEMP_C) +AC_SUBST(MKSTEMP_O) + +ac_save_LIBS="$LIBS" +LIBS="$GLIB_LIBS $LIBS" +G_ASCII_STRTOULL_C="" +G_ASCII_STRTOULL_O="" +G_ASCII_STRTOULL_LO="" +AC_CHECK_FUNC(g_ascii_strtoull, + [G_ASCII_STRTOULL_O="" + G_ASCII_STRTOULL_LO=""], + [G_ASCII_STRTOULL_O="g_ascii_strtoull.o" + G_ASCII_STRTOULL_LO="g_ascii_strtoull.lo" + AC_DEFINE(NEED_G_ASCII_STRTOULL_H, 1, [Define if g_ascii_strtoull.h needs to be included]) +]) +LIBS="$ac_save_LIBS" +if test "$ac_cv_func_g_ascii_strtoull" = no ; then + G_ASCII_STRTOULL_C="g_ascii_strtoull.c" + G_ASCII_STRTOULL_O="g_ascii_strtoull.o" + G_ASCII_STRTOULL_LO="g_ascii_strtoull.lo" +fi +AC_SUBST(G_ASCII_STRTOULL_C) +AC_SUBST(G_ASCII_STRTOULL_O) +AC_SUBST(G_ASCII_STRTOULL_LO) + +AC_CHECK_FUNC(inet_aton, + [INET_ATON_O="" + INET_ATON_LO=""], + [INET_ATON_O="inet_aton.o" + INET_ATON_LO="inet_aton.lo" +]) +if test "$ac_cv_func_inet_aton" = no ; then + INET_ATON_C="inet_aton.c" + INET_ATON_O="inet_aton.o" + INET_ATON_LO="inet_aton.lo" + AC_DEFINE(NEED_INET_ATON_H, 1, [Define if inet/aton.h needs to be included]) +fi +AC_SUBST(INET_ATON_C) +AC_SUBST(INET_ATON_O) +AC_SUBST(INET_ATON_LO) + +AC_SEARCH_LIBS(inet_pton, [socket nsl], [ + dnl check for pre-BIND82 inet_pton() bug. + AC_MSG_CHECKING(for broken inet_pton) + AC_TRY_RUN([#include +#include +#include +#include +int main() +{ +#ifdef AF_INET6 + char buf[16]; + /* this should return 0 (error) */ + return inet_pton(AF_INET6, "0:1:2:3:4:5:6:7:", buf); +#else + return 1; +#endif +}], [AC_MSG_RESULT(ok); +have_inet_pton=yes], [AC_MSG_RESULT(broken); +have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken); +have_inet_pton=no])], +have_inet_pton=no) +if test "$have_inet_pton" = no; then + INET_PTON_C="inet_pton.c" + INET_PTON_O="inet_pton.o" + INET_PTON_LO="inet_pton.lo" +else + INET_PTON_C="" + INET_PTON_O="" + INET_PTON_LO="" +fi +AC_SUBST(INET_PTON_C) +AC_SUBST(INET_PTON_O) +AC_SUBST(INET_PTON_LO) + +AC_SEARCH_LIBS(inet_ntop, [socket nsl], [ + AC_MSG_CHECKING([for inet_ntop prototype]) + AC_TRY_COMPILE([#include +#include +#include +#include +#include + +extern const char *inet_ntop(int, const void *, char *, size_t);],, [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_INET_NTOP_PROTO, 1, + [Define if inet_ntop() prototype exists])], [ + AC_TRY_COMPILE([#include +#include +#include +#include +#include + +extern const char *inet_ntop(int, const void *, char *, socklen_t);],, [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_INET_NTOP_PROTO, 1, + [Define if inet_ntop() prototype exists])], [ + AC_MSG_RESULT(no)])]) + INET_NTOP_O="" + INET_NTOP_LO=""], [ + INET_NTOP_C="inet_ntop.c" + INET_NTOP_O="inet_ntop.o" + INET_NTOP_LO="inet_ntop.lo" + AC_DEFINE(NEED_INET_V6DEFS_H, 1, + [Define if inet/v6defs.h needs to be included])]) +AC_SUBST(INET_NTOP_C) +AC_SUBST(INET_NTOP_O) +AC_SUBST(INET_NTOP_LO) + +AC_CHECK_FUNC(strptime, STRPTIME_O="", + [STRPTIME_O="strptime.o" + AC_DEFINE(NEED_STRPTIME_H, 1, [Define if strptime.h needs to be included]) +]) +if test "$ac_cv_func_strptime" = no ; then + STRPTIME_C="strptime.c" + STRPTIME_O="strptime.o" +fi +AC_SUBST(STRPTIME_C) +AC_SUBST(STRPTIME_O) + +AC_CHECK_FUNCS(getprotobynumber gethostbyname2) +AC_CHECK_FUNCS(issetugid) +AC_CHECK_FUNCS(mmap mprotect sysconf) + +dnl blank for now, but will be used in future +AC_SUBST(wireshark_SUBDIRS) + +dnl +dnl check whether plugins should be enabled and, if they should be, +dnl check for plugins directory - stolen from Amanda's configure.in +dnl +plugindir="$libdir/wireshark/plugins/$VERSION" +AC_ARG_WITH(plugins, +[ --with-plugins[[=DIR]] support plugins (installed in DIR, if supplied).], +[ + case "$withval" in + "" | y | ye | yes ) + if test x$have_plugins = xno + then + AC_MSG_ERROR([GLib on this platform doesn't support loadable modules, so you can't enable plugins.]) + fi + ;; + n | no) + have_plugins=no + ;; + *) + if test x$have_plugins = xno + then + AC_MSG_ERROR([GLib on this platform doesn't support loadable modules, so you can't enable plugins.]) + fi + plugindir="$withval" + ;; + esac +]) + +AM_CONDITIONAL(HAVE_PLUGINS, test x$have_plugins = xyes) +if test x$have_plugins = xyes +then + AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled]) + plugindir=`( + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=${prefix} + eval echo "$plugindir" + )` + AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$plugindir", [Plugin installation directory]) +else + AC_DEFINE(PLUGIN_DIR, NULL, [Plugin installation directory]) +fi +AC_SUBST(plugindir) + +# +# The plugin dissectors reside in ./plugins/PROTO/ +# +PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS" +AC_SUBST(PLUGIN_LIBS) + +dnl libtool defs +# +# Yes, AM_PROG_LIBTOOL is redundant with newer version(s) of some tool(s) +# (autoconf? automake? libtool?) - with the newer version(s), it's +# just an alias for AC_PROG_LIBTOOL, which is called earlier. +# +# With older version(s) of those tool(s), however, it's not just an +# alias, and the configure scripts don't work without it. +# +AM_PROG_LIBTOOL +AC_SUBST(LIBTOOL_DEPS) + +AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes) +if test x$enable_static = xyes -a x$have_plugins = xyes +then + AC_DEFINE(ENABLE_STATIC, 1, [Link plugins statically into Wireshark]) +fi +AC_SUBST(ENABLE_STATIC) + +dnl Save the cacheable configure results to config.cache before recursing +AC_CACHE_SAVE + +AM_CONFIG_HEADER(config.h) +AC_CONFIG_SUBDIRS(wiretap) +AC_OUTPUT( + Makefile + doxygen.cfg + asn1/Makefile + doc/Makefile + epan/Makefile + epan/crypt/Makefile + epan/doxygen.cfg + epan/dfilter/Makefile + epan/dissectors/Makefile + epan/ftypes/Makefile + epan/wslua/Makefile + codecs/Makefile + gtk/Makefile + gtk/doxygen.cfg + help/Makefile + packaging/Makefile + packaging/nsis/Makefile + packaging/rpm/Makefile + packaging/rpm/SPECS/Makefile + packaging/rpm/SPECS/wireshark.spec + packaging/svr4/Makefile + packaging/svr4/checkinstall + packaging/svr4/pkginfo + plugins/Makefile + plugins/agentx/Makefile + plugins/artnet/Makefile + plugins/asn1/Makefile + plugins/ciscosm/Makefile + plugins/docsis/Makefile + plugins/enttec/Makefile + plugins/giop/Makefile + plugins/gryphon/Makefile + plugins/h223/Makefile + plugins/irda/Makefile + plugins/lwres/Makefile + plugins/mate/Makefile + plugins/megaco/Makefile + plugins/mgcp/Makefile + plugins/opsi/Makefile + plugins/pcli/Makefile + plugins/profinet/Makefile + plugins/rlm/Makefile + plugins/rtnet/Makefile + plugins/rudp/Makefile + plugins/sbus/Makefile + plugins/stats_tree/Makefile + plugins/v5ua/Makefile + tools/Makefile + tools/idl2wrs.sh + tools/lemon/Makefile + ,) + + +# Pretty messages + +if test "x$enable_setuid_install" = "xyes" ; then + setuid_message="yes (DANGEROUS!!!)" +else + setuid_message="no" +fi + +if test "x$want_zlib" = "xno" ; then + zlib_message="no" +else + zlib_message="yes" +fi + +if test "x$want_pcre" = "xno" ; then + pcre_message="no" +else + pcre_message="yes" +fi + +if test "x$want_lua" = "xyes" -a "x$have_plugins" = "xyes" ; then + lua_message="yes" +else + lua_message="no" +fi + +if test "x$want_portaudio" = "xyes" ; then + portaudio_message="yes" +else + portaudio_message="no" +fi + +if test "x$want_ssl" = "xno" ; then + ssl_message="no" +else + ssl_message="yes" +fi + +if test "x$want_krb5" = "xno" ; then + krb5_message="no" +else + krb5_message="yes ($ac_krb5_version)" +fi + +if test "x$have_good_adns" = "xyes" ; then + adns_message="yes" +else + adns_message="no" +fi + +if test "x$have_net_snmp" = "xyes" ; then + snmp_libs_message="yes" +else + snmp_libs_message="no" +fi + +echo "" +echo "The Wireshark package has been configured with the following options." +echo " Build wireshark : $enable_wireshark" +echo " Build tshark : $enable_tshark" +echo " Build capinfos : $enable_capinfos" +echo " Build editcap : $enable_editcap" +echo " Build dumpcap : $enable_dumpcap" +echo " Build mergecap : $enable_mergecap" +echo " Build text2pcap : $enable_text2pcap" +echo " Build idl2wrs : $enable_idl2wrs" +echo " Build randpkt : $enable_randpkt" +echo " Build dftest : $enable_dftest" +echo "" +echo " Install setuid : $setuid_message" +echo " Use plugins : $have_plugins" +echo " Build lua plugin : $lua_message" +echo " Build rtp_player : $portaudio_message" +echo " Use GTK+ v2 library : $enable_gtk2" +if test "x$enable_gtk2" = "xyes" ; then +echo " Use threads : $enable_threads" +echo " Build profile binaries : $enable_profile_build" +fi +echo " Use pcap library : $want_pcap" +echo " Use zlib library : $zlib_message" +echo " Use pcre library : $pcre_message" +echo " Use kerberos library : $krb5_message" +echo " Use GNU ADNS library : $adns_message" +echo " Use GNU crypto library : $gcrypt_message" +echo " Use SSL crypto library : $ssl_message" +echo " Use IPv6 name resolution : $enable_ipv6" +echo " Use Net-SNMP library : $snmp_libs_message" +echo " Use gnutls library : $tls_message" diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/AUTHORS orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/AUTHORS --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/AUTHORS 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/AUTHORS 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,2 @@ +Author: +Sjoerd Simons diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/COPYING orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/COPYING --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/COPYING 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/COPYING 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.am orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.am --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.am 2008-03-17 00:13:27.000000000 -0400 @@ -0,0 +1,120 @@ +# Makefile.am +# Automake file for Cisco SS7 Redundant Link Management plugin +# Copyright 2004, Duncan Sargeant +# +# $Id: Makefile.am 21961 2007-05-27 18:35:55Z guy $ +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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. +# + +INCLUDES = -I$(top_srcdir) -I$(includedir) + +include Makefile.common + +plugindir = @plugindir@ + +plugin_LTLIBRARIES = clique-rm.la +clique_rm_la_SOURCES = \ + plugin.c \ + moduleinfo.h \ + $(DISSECTOR_SRC) \ + $(DISSECTOR_INCLUDES) +clique_rm_la_LDFLAGS = -module -avoid-version +clique_rm_la_LIBADD = @PLUGIN_LIBS@ + +# Libs must be cleared, or else libtool won't create a shared module. +# If your module needs to be linked against any particular libraries, +# add them here. +LIBS = + +# +# Build plugin.c, which contains the plugin version[] string, a +# function plugin_register() that calls the register routines for all +# protocols, and a function plugin_reg_handoff() that calls the handoff +# registration routines for all protocols. +# +# We do this by scanning sources. If that turns out to be too slow, +# maybe we could just require every .o file to have an register routine +# of a given name (packet-aarp.o -> proto_register_aarp, etc.). +# +# Formatting conventions: The name of the proto_register_* routines an +# proto_reg_handoff_* routines must start in column zero, or must be +# preceded only by "void " starting in column zero, and must not be +# inside #if. +# +# DISSECTOR_SRC is assumed to have all the files that need to be scanned. +# +# For some unknown reason, having a big "for" loop in the Makefile +# to scan all the files doesn't work with some "make"s; they seem to +# pass only the first few names in the list to the shell, for some +# reason. +# +# Therefore, we have a script to generate the plugin.c file. +# The shell script runs slowly, as multiple greps and seds are run +# for each input file; this is especially slow on Windows. Therefore, +# if Python is present (as indicated by PYTHON being defined), we run +# a faster Python script to do that work instead. +# +# The first argument is the directory in which the source files live. +# The second argument is "plugin", to indicate that we should build +# a plugin.c file for a plugin. +# All subsequent arguments are the files to scan. +# +plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \ + $(top_srcdir)/tools/make-dissector-reg.py + @if test -n $(PYTHON); then \ + echo Making plugin.c with python ; \ + $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ + plugin $(DISSECTOR_SRC) ; \ + else \ + echo Making plugin.c with shell script ; \ + $(top_srcdir)/tools/make-dissector-reg $(srcdir) \ + $(plugin_src) plugin $(DISSECTOR_SRC) ; \ + fi + +# +# Currently plugin.c can be included in the distribution because +# we always build all protocol dissectors. We used to have to check +# whether or not to build the snmp dissector. If we again need to +# variably build something, making plugin.c non-portable, uncomment +# the dist-hook line below. +# +# Oh, yuk. We don't want to include "plugin.c" in the distribution, as +# its contents depend on the configuration, and therefore we want it +# to be built when the first "make" is done; however, Automake insists +# on putting *all* source into the distribution. +# +# We work around this by having a "dist-hook" rule that deletes +# "plugin.c", so that "dist" won't pick it up. +# +#dist-hook: +# @rm -f $(distdir)/plugin.c + +CLEANFILES = \ + *~ + +MAINTAINERCLEANFILES = \ + Makefile.in \ + plugin.c + +EXTRA_DIST = \ + Makefile.common \ + Makefile.nmake \ + moduleinfo.nmake \ + plugin.rc.in diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.am~ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.am~ --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.am~ 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.am~ 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,124 @@ +# Makefile.am +# Automake file for Cisco SS7 Redundant Link Management plugin +# Copyright 2004, Duncan Sargeant +# +# $Id: Makefile.am 21961 2007-05-27 18:35:55Z guy $ +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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. +# + +INCLUDES = -I$(top_srcdir) -I$(includedir) + +include Makefile.common + +if HAVE_WARNINGS_AS_ERRORS +AM_CFLAGS = -Werror +endif + +plugindir = @plugindir@ + +plugin_LTLIBRARIES = clique-rm.la +clique_rm_la_SOURCES = \ + plugin.c \ + moduleinfo.h \ + $(DISSECTOR_SRC) \ + $(DISSECTOR_INCLUDES) +clique_rm_la_LDFLAGS = -module -avoid-version +clique_rm_la_LIBADD = @PLUGIN_LIBS@ + +# Libs must be cleared, or else libtool won't create a shared module. +# If your module needs to be linked against any particular libraries, +# add them here. +LIBS = + +# +# Build plugin.c, which contains the plugin version[] string, a +# function plugin_register() that calls the register routines for all +# protocols, and a function plugin_reg_handoff() that calls the handoff +# registration routines for all protocols. +# +# We do this by scanning sources. If that turns out to be too slow, +# maybe we could just require every .o file to have an register routine +# of a given name (packet-aarp.o -> proto_register_aarp, etc.). +# +# Formatting conventions: The name of the proto_register_* routines an +# proto_reg_handoff_* routines must start in column zero, or must be +# preceded only by "void " starting in column zero, and must not be +# inside #if. +# +# DISSECTOR_SRC is assumed to have all the files that need to be scanned. +# +# For some unknown reason, having a big "for" loop in the Makefile +# to scan all the files doesn't work with some "make"s; they seem to +# pass only the first few names in the list to the shell, for some +# reason. +# +# Therefore, we have a script to generate the plugin.c file. +# The shell script runs slowly, as multiple greps and seds are run +# for each input file; this is especially slow on Windows. Therefore, +# if Python is present (as indicated by PYTHON being defined), we run +# a faster Python script to do that work instead. +# +# The first argument is the directory in which the source files live. +# The second argument is "plugin", to indicate that we should build +# a plugin.c file for a plugin. +# All subsequent arguments are the files to scan. +# +plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \ + $(top_srcdir)/tools/make-dissector-reg.py + @if test -n $(PYTHON); then \ + echo Making plugin.c with python ; \ + $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ + plugin $(DISSECTOR_SRC) ; \ + else \ + echo Making plugin.c with shell script ; \ + $(top_srcdir)/tools/make-dissector-reg $(srcdir) \ + $(plugin_src) plugin $(DISSECTOR_SRC) ; \ + fi + +# +# Currently plugin.c can be included in the distribution because +# we always build all protocol dissectors. We used to have to check +# whether or not to build the snmp dissector. If we again need to +# variably build something, making plugin.c non-portable, uncomment +# the dist-hook line below. +# +# Oh, yuk. We don't want to include "plugin.c" in the distribution, as +# its contents depend on the configuration, and therefore we want it +# to be built when the first "make" is done; however, Automake insists +# on putting *all* source into the distribution. +# +# We work around this by having a "dist-hook" rule that deletes +# "plugin.c", so that "dist" won't pick it up. +# +#dist-hook: +# @rm -f $(distdir)/plugin.c + +CLEANFILES = \ + *~ + +MAINTAINERCLEANFILES = \ + Makefile.in \ + plugin.c + +EXTRA_DIST = \ + Makefile.common \ + Makefile.nmake \ + moduleinfo.nmake \ + plugin.rc.in diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.common orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.common --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.common 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.common 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,31 @@ +# Makefile.common for Cisco SS7 Redundant Link Management plugin +# Contains the stuff from Makefile.am and Makefile.nmake that is +# a) common to both files and +# b) portable between both files +# +# $Id: Makefile.common 18197 2006-05-21 05:12:17Z sahlberg $ +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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. + +# the name of the plugin +PLUGIN_NAME = clique-rm + +# the dissector sources (without any helpers) +DISSECTOR_SRC = \ + packet-clique-rm.c diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.nmake orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.nmake --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/Makefile.nmake 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/Makefile.nmake 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,99 @@ +# Makefile.nmake +# nmake file for Wireshark plugin +# +# $Id: Makefile.nmake 22696 2007-08-27 22:56:27Z wmeier $ +# + +include ..\..\config.nmake +include moduleinfo.nmake + +include Makefile.common + +CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ + /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) + +.c.obj:: + $(CC) $(CFLAGS) -Fd.\ -c $< + +LDFLAGS = $(PLUGIN_LDFLAGS) + +!IFDEF ENABLE_LIBWIRESHARK +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib +CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) + +DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) + +DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) + +OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj + +RESOURCE=$(PLUGIN_NAME).res + +all: $(PLUGIN_NAME).dll + +$(PLUGIN_NAME).rc : moduleinfo.nmake + sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ + -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ + -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ + -e s/@PACKAGE@/$(PACKAGE)/ \ + -e s/@VERSION@/$(VERSION)/ \ + -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ + < plugin.rc.in > $@ + +$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) + link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ + $(GLIB_LIBS) $(RESOURCE) + +# +# Build plugin.c, which contains the plugin version[] string, a +# function plugin_register() that calls the register routines for all +# protocols, and a function plugin_reg_handoff() that calls the handoff +# registration routines for all protocols. +# +# We do this by scanning sources. If that turns out to be too slow, +# maybe we could just require every .o file to have an register routine +# of a given name (packet-aarp.o -> proto_register_aarp, etc.). +# +# Formatting conventions: The name of the proto_register_* routines an +# proto_reg_handoff_* routines must start in column zero, or must be +# preceded only by "void " starting in column zero, and must not be +# inside #if. +# +# DISSECTOR_SRC is assumed to have all the files that need to be scanned. +# +# For some unknown reason, having a big "for" loop in the Makefile +# to scan all the files doesn't work with some "make"s; they seem to +# pass only the first few names in the list to the shell, for some +# reason. +# +# Therefore, we have a script to generate the plugin.c file. +# The shell script runs slowly, as multiple greps and seds are run +# for each input file; this is especially slow on Windows. Therefore, +# if Python is present (as indicated by PYTHON being defined), we run +# a faster Python script to do that work instead. +# +# The first argument is the directory in which the source files live. +# The second argument is "plugin", to indicate that we should build +# a plugin.c file for a plugin. +# All subsequent arguments are the files to scan. +# +plugin.c: $(DISSECTOR_SRC) ../../tools/make-dissector-reg.py ../../tools/make-dissector-reg +!IFDEF PYTHON + @echo Making plugin.c (using python) + @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC) +!ELSE + @echo Making plugin.c (using sh) + @$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC) +!ENDIF + +!ENDIF + +clean: + rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \ + $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ + $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc + +distclean: clean + +maintainer-clean: distclean diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/moduleinfo.h orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/moduleinfo.h --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/moduleinfo.h 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/moduleinfo.h 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,16 @@ +/* Included *after* config.h, in order to re-define these macros */ + +#ifdef PACKAGE +#undef PACKAGE +#endif + +/* Name of package */ +#define PACKAGE "clique-rm" + + +#ifdef VERSION +#undef VERSION +#endif + +/* Version number of package */ +#define VERSION "0.0.1" diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/moduleinfo.nmake orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/moduleinfo.nmake --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/moduleinfo.nmake 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/moduleinfo.nmake 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,28 @@ +# +# $Id: moduleinfo.nmake 20170 2006-12-19 22:27:31Z jake $ +# + +# The name +PACKAGE=clique-rm + +# The version +MODULE_VERSION_MAJOR=0 +MODULE_VERSION_MINOR=0 +MODULE_VERSION_MICRO=1 +MODULE_VERSION_EXTRA=0 + +# +# The RC_VERSION should be comma-separated, not dot-separated, +# as per Graham Bloice's message in +# +# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html +# +# "The RC_VERSION variable in config.nmake should be comma separated. +# This allows the resources to be built correctly and the version +# number to be correctly displayed in the explorer properties dialog +# for the executables, and XP's tooltip, rather than 0.0.0.0." +# + +MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) +RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) + diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/packet-clique-rm.c orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/packet-clique-rm.c --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/packet-clique-rm.c 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/packet-clique-rm.c 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,446 @@ +/* packet-clique_rm.c + * + * $Id$ + * + * Routines for clique reliable multicast dissector + * Copyright 2007, Collabora Ltd. + * @author: Sjoerd Simons + * Based on code from Wireshark - Network traffic analyzer + * By Gerald Combs + * 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 + +#include +#include +#include + +#include +#include + +/* Initialize the protocol and registered fields */ +static int proto_clique_rm = -1; + +static int hf_clique_rm_version = -1; +static int hf_clique_rm_type = -1; +static int hf_clique_rm_sender = -1; +static int hf_clique_rm_packet_id = -1; +static int hf_clique_rm_data_flags = -1; +static int hf_clique_rm_data_size = -1; +static int hf_clique_rm_data_stream_id = -1; +static int hf_clique_rm_data_data = -1; +static int hf_clique_rm_whois_request_id = -1; +static int hf_clique_rm_whois_reply_name = -1; +static int hf_clique_rm_repair_request_sender_id = -1; +static int hf_clique_rm_repair_request_packet_id = -1; + +/* Initialize the subtree pointers */ +static gint ett_clique_rm = -1; +static gint ett_clique_rm_data = -1; +static gint ett_clique_rm_depends = -1; +static gint ett_clique_rm_failures = -1; +static gint ett_clique_rm_attempt_join = -1; +static gint ett_clique_rm_join = -1; + +/* Packet types */ +typedef enum { + /* Unreliable packets */ + PACKET_TYPE_WHOIS_REQUEST = 0, + PACKET_TYPE_WHOIS_REPLY, + PACKET_TYPE_REPAIR_REQUEST, + PACKET_TYPE_SESSION, + /* Reliable packets */ + FIRST_RELIABLE_PACKET = 0xf, + PACKET_TYPE_DATA = FIRST_RELIABLE_PACKET, + /* No data just acknowledgement */ + PACKET_TYPE_NO_DATA, + /* Some nodes failed */ + PACKET_TYPE_FAILURE, + /* Start a joining attempt */ + PACKET_TYPE_ATTEMPT_JOIN, + /* The real join */ + PACKET_TYPE_JOIN, + /* Leaving now, bye */ + PACKET_TYPE_BYE, + PACKET_TYPE_INVALID +} GibberRMulticastPacketType; + +#define IS_RELIABLE(type) (type >= FIRST_RELIABLE_PACKET) + +static gchar * +type_to_str (guint8 type) +{ + switch (type) + { + case PACKET_TYPE_WHOIS_REQUEST: + return "Whois request"; + case PACKET_TYPE_WHOIS_REPLY: + return "Whois reply"; + case PACKET_TYPE_REPAIR_REQUEST: + return "Repair request"; + case PACKET_TYPE_SESSION: + return "Session"; + case PACKET_TYPE_DATA: + return "Data"; + /* No data just acknowledgement */ + case PACKET_TYPE_NO_DATA: + return "No data"; + /* Some nodes failed */ + case PACKET_TYPE_FAILURE: + return "Failure"; + /* Start a joining attempt */ + case PACKET_TYPE_ATTEMPT_JOIN: + return "Attempt join"; + /* The real join */ + case PACKET_TYPE_JOIN: + return "Join"; + /* Leaving now, bye */ + case PACKET_TYPE_BYE: + return "Bye"; + } + return "Unknown"; +} + +static gsize +dissect_sender_array (proto_tree *clique_rm_tree, gchar *header, + tvbuff_t *tvb, gsize offset) +{ + guint8 count; + gsize len; + proto_item *ti; + proto_tree *tree; + + + count = tvb_get_guint8(tvb, offset); + len = 1 + 4 * count; + ti = proto_tree_add_text (clique_rm_tree, tvb, offset, len , + "%s (%d)", header, count); + tree = proto_item_add_subtree (ti, ett_clique_rm_failures); + offset++; + + for (; count > 0 ; count--) + { + guint32 sender; + sender = tvb_get_ntohl (tvb, offset); + proto_tree_add_text (tree, tvb, offset, 4, "Sender: %x", sender); + offset += 4; + } + return len; +} + +static void +dissect_data_packet (proto_tree *clique_rm_tree, tvbuff_t *tvb, gsize offset) +{ + proto_item *ti; + proto_tree *tree; + + ti = proto_tree_add_text (clique_rm_tree, tvb, offset, -1, "Data"); + tree = proto_item_add_subtree (ti, ett_clique_rm_data); + + proto_tree_add_item(tree, hf_clique_rm_data_flags, tvb, offset, 1, FALSE); + offset += 1; + + proto_tree_add_item(tree, hf_clique_rm_data_stream_id, tvb, offset, 2, + FALSE); + offset += 2; + + proto_tree_add_item(tree, hf_clique_rm_data_size, tvb, offset, 4, FALSE); + offset += 4; + + + proto_tree_add_item(tree, hf_clique_rm_data_data, tvb, offset, + tvb_length_remaining(tvb, offset), FALSE); +} + +static gsize +dissect_depends (proto_tree *clique_rm_tree, tvbuff_t *tvb, gsize offset) +{ + proto_item *ti; + proto_tree *tree; + guint8 count; + gsize len; + + count = tvb_get_guint8 (tvb, offset); + len = 1 + count * 8; + + ti = proto_tree_add_text (clique_rm_tree, tvb, offset, 1 + count * 8, + "Depends (%d)", count); + offset += 1; + + tree = proto_item_add_subtree (ti, ett_clique_rm_depends); + for ( ; count > 0 ; count--) + { + guint32 d; + guint32 d_id; + + d = tvb_get_ntohl (tvb, offset); + d_id = tvb_get_ntohl (tvb, offset + 4); + proto_tree_add_text (tree, tvb, offset, 8, + "Sender: %x Packet id: %x", d, d_id); + offset += 8; + } + + return len; +} + +/* Code to actually dissect the packets */ +static void +dissect_reliable_packet (proto_tree *clique_rm_tree, guint8 type, + tvbuff_t *tvb, gsize offset) +{ + proto_tree_add_item(clique_rm_tree, hf_clique_rm_packet_id, tvb, offset, 4, + FALSE); + offset += 4; + + offset += dissect_depends (clique_rm_tree, tvb, offset); + + switch (type) + { + case PACKET_TYPE_DATA: + dissect_data_packet (clique_rm_tree, tvb, offset); + break; + case PACKET_TYPE_NO_DATA: + break; + case PACKET_TYPE_FAILURE: + dissect_sender_array (clique_rm_tree, "Failures", tvb, offset); + break; + case PACKET_TYPE_ATTEMPT_JOIN: + dissect_sender_array (clique_rm_tree, "New attempt join senders", tvb, + offset); + break; + case PACKET_TYPE_JOIN: + dissect_sender_array (clique_rm_tree, "Join failures", tvb, offset); + break; + case PACKET_TYPE_BYE: + break; + default: + break; + } +} + +static void +dissect_unreliable_packet (proto_tree *clique_rm_tree, guint8 type, + tvbuff_t *tvb, gsize offset) +{ + guint8 len; + + switch (type) + { + case PACKET_TYPE_WHOIS_REQUEST: + proto_tree_add_item(clique_rm_tree, + hf_clique_rm_whois_request_id, tvb, offset, 4, FALSE); + break; + case PACKET_TYPE_WHOIS_REPLY: + len = tvb_get_guint8 (tvb, offset); + proto_tree_add_text (clique_rm_tree, tvb, offset, 1, + "Whois reply name length: %d", len); + offset += 1; + + proto_tree_add_item(clique_rm_tree, + hf_clique_rm_whois_reply_name, tvb, offset, len, FALSE); + break; + case PACKET_TYPE_REPAIR_REQUEST: + proto_tree_add_item(clique_rm_tree, + hf_clique_rm_repair_request_sender_id, tvb, offset, 4, FALSE); + offset += 4; + + proto_tree_add_item(clique_rm_tree, + hf_clique_rm_repair_request_packet_id, tvb, offset, 4, FALSE); + break; + case PACKET_TYPE_SESSION: + dissect_depends (clique_rm_tree, tvb, offset); + break; + default: + break; + } +} + + +static gboolean +dissect_clique_rm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + guint8 version = 0; + guint8 type = 0; + gsize offset = 0; + + if (tvb_length (tvb) < 12) + return FALSE; + + if (tvb_strneql (tvb, offset, "Clique", 6)) + return FALSE; + offset += 6; + + version = tvb_get_guint8 (tvb, offset); + if (version != 1) + return FALSE; + offset++; + + type = tvb_get_guint8 (tvb, offset); + offset++; + + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Clique-rm"); + + if (check_col(pinfo->cinfo, COL_INFO)) + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + type_to_str (type)); + + if (tree) { + proto_item *ti = NULL; + proto_tree *clique_rm_tree = NULL; + + /* rewind back to just behind the prefix */ + offset = 6; + + ti = proto_tree_add_item(tree, proto_clique_rm, tvb, 0, -1, FALSE); + clique_rm_tree = proto_item_add_subtree(ti, ett_clique_rm); + + proto_tree_add_item(clique_rm_tree, hf_clique_rm_version, tvb, offset, 1, + FALSE); + offset++; + + ti = proto_tree_add_item(clique_rm_tree, hf_clique_rm_type, tvb, offset, 1, + FALSE); + proto_item_append_text(ti, ", %s", type_to_str (type)); + offset++; + + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, ", sender: 0x%x", + tvb_get_ntohl (tvb, offset)); + + proto_tree_add_item(clique_rm_tree, hf_clique_rm_sender, tvb, offset, + 4, FALSE); + offset += 4; + + if (IS_RELIABLE(type)) { + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, ", id: 0x%x", + tvb_get_ntohl (tvb, offset)); + + dissect_reliable_packet(clique_rm_tree, type, tvb, offset); + } else { + dissect_unreliable_packet(clique_rm_tree, type, tvb, offset); + } + } + + return TRUE; +} + + +/* Register the protocol with Wireshark */ + +/* this format is require because a script is used to build the C function + that calls all the protocol registration. +*/ + +void +proto_reg_handoff_clique_rm(void) +{ + heur_dissector_add("udp", dissect_clique_rm, proto_clique_rm); +} + +void +proto_register_clique_rm(void) +{ + +/* Setup list of header fields See Section 1.6.1 for details*/ + static hf_register_info hf[] = { + { &hf_clique_rm_version, + { "Version", "clique_rm.version", + FT_UINT8, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_type, + { "Type", "clique_rm.type", + FT_UINT8, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_sender, + { "Sender", "clique_rm.sender", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_packet_id, + { "Packet id", "clique_rm.packet_id", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_data_flags, + { "Data flags", "clique_rm.data.flags", + FT_UINT8, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_data_size, + { "Data total size", "clique_rm.data.size", + FT_UINT32, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_data_stream_id, + { "Data stream id", "clique_rm.data.stream_id", + FT_UINT16, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_data_data, + { "Raw data", "clique_rm.data.data", + FT_STRINGZ, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_whois_request_id, + { "Whois request id", "clique_rm.whois_request.id", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_whois_reply_name, + { "Whois reply name", "clique_rm.whois_reply.name", + FT_STRINGZ, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_repair_request_sender_id, + { "Repair request for sender", + "clique_rm.repair_request.sender_id", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_clique_rm_repair_request_packet_id, + { "Repair request for packet", + "clique_rm.repair_request.packet_id", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + }; + +/* Setup protocol subtree array */ + static gint *ett[] = { + &ett_clique_rm, + &ett_clique_rm_depends, + &ett_clique_rm_data, + &ett_clique_rm_failures, + &ett_clique_rm_attempt_join, + &ett_clique_rm_join, + }; + +/* Register the protocol name and description */ + proto_clique_rm = proto_register_protocol( + "Clique Reliable Multicast Protocol", "Clique-rm", "clique-rm"); + +/* Required function calls to register the header fields and subtrees used */ + proto_register_field_array(proto_clique_rm, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); +} diff -Naur orig_wireshark-0.99.5-fc7/plugins/clique-rm/plugin.rc.in orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/plugin.rc.in --- orig_wireshark-0.99.5-fc7/plugins/clique-rm/plugin.rc.in 1969-12-31 19:00:00.000000000 -0500 +++ orig_wireshark-0.99.5-fc7-clique/plugins/clique-rm/plugin.rc.in 2008-03-16 23:19:57.000000000 -0400 @@ -0,0 +1,34 @@ +#include "winver.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @RC_MODULE_VERSION@ + PRODUCTVERSION @RC_VERSION@,0 + FILEFLAGSMASK 0x0L +#ifdef _DEBUG + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG +#else + FILEFLAGS VS_FF_PRERELEASE +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Collabora Ltd.\0" + VALUE "FileDescription", "@PACKAGE@ dissector\0" + VALUE "FileVersion", "@MODULE_VERSION@\0" + VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0" + VALUE "LegalCopyright", " Copyright � 2007 Collabora Ltd. Copyright � 1998 Gerald Combs , Gilbert Ramirez and others\0" + VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" + VALUE "ProductName", "Wireshark\0" + VALUE "ProductVersion", "@VERSION@\0" + VALUE "Comments", "Build with @MSVC_VARIANT@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff -Naur orig_wireshark-0.99.5-fc7/plugins/Makefile.am orig_wireshark-0.99.5-fc7-clique/plugins/Makefile.am --- orig_wireshark-0.99.5-fc7/plugins/Makefile.am 2008-03-16 23:13:11.000000000 -0400 +++ orig_wireshark-0.99.5-fc7-clique/plugins/Makefile.am 2008-03-16 23:19:57.000000000 -0400 @@ -40,6 +40,7 @@ pcli \ profinet \ rlm \ + clique-rm \ rtnet \ rudp \ sbus \