Changes - j0ke.net Open Build Service

Changes of Revision 56

[-] [+]	Changed	nprobe.changes
@@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Dec 18 12:06:44 UTC 2012 - cs@linux-administrator.com + +- added PF_RING 5.5.1 at compile time (including libpcap) + +------------------------------------------------------------------- +Mon Dec 17 21:34:55 UTC 2012 - cs@linux-administrator.com + +- update to release 6.9.11 +- update nDPI to current svn +- update GeoIP ASnum data +- update GeoIP ASnum v6 data +- update GeoIP City data + +------------------------------------------------------------------- Tue Oct 9 07:30:46 UTC 2012 - cs@linux-administrator.com - update to release 6.9.9
[-] [+]	Changed	nprobe.spec ^
@@ -1,14 +1,15 @@ #!BuildIgnore: post-build-checks %define _default_patch_fuzz 3 -%define reldate 100812_svn2667 +%define reldate 120912_svn2881 +%define pfringver 5.5.1 Name: nprobe -Version: 6.9.9 +Version: 6.9.11 Release: 1 Group: System Summary: Netflow Probe Url: http://www.nmon.net/ License: GPL -Source0: %{name}_%{version}_%{reldate}_pro.tgz +Source0: %{name}_%{version}_%{reldate}_proplugins.tgz Source1: GeoLiteCity.dat.gz Source2: GeoIPASNum.dat.gz Source3: GeoIPASNumv6.dat.gz @@ -16,7 +17,9 @@ Source6: nprobe.init Source7: sysconfig.nprobe Source8: nDPI.tar.bz2 +Source9: PF_RING-%{pfringver}.tar.bz2 Patch1: nprobe-%{version}-GeoIPdat-dir.patch +Patch2: nprobe-%{version}-configure.in.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root NoSource: 0 @@ -38,7 +41,7 @@ PreReq: %insserv_prereq %fillup_prereq %endif -BuildRequires: autoconf automake libtool gcc-c++ grep sed +BuildRequires: autoconf automake libtool gcc-c++ grep sed flex bison BuildRequires: pcre-devel mysql-devel libGeoIP-devel >= 1.4.5 lksctp-tools-devel python-devel openssl-devel BuildRequires: sqlite-devel >= 3.0 BuildRequires: libpfring-devel @@ -55,18 +58,30 @@ NProbe development files. %prep -%setup -n %{name}_%{version}_%{reldate}_pro -a 8 +%setup -n %{name}_%{version}_%{reldate}_proplugins -a 8 -b 9 %patch1 +%patch2 cp %{S:1} . cp %{S:2} . cp %{S:3} . cp %{S:5} . +cd .. +mv PF_RING-%{pfringver} PF_RING %build +# pre build libpfring & libpcap of PF_RING +pre=`pwd` +cd ../PF_RING/userland/lib +./configure +make +cd ../libpcap +./configure +make +cd ${pre} if [ ! -f ./configure ]; then ./autogen.sh fi -CFLAGS="$RPM_OPT_FLAGS" ./configure \ +CFLAGS="$RPM_OPT_FLAGS" LIB="%{_lib}" ./configure \ --enable-shared \ --enable-static \ --prefix=%{_prefix} \ @@ -94,6 +109,15 @@ %__install -D -m644 %{S:7} %{buildroot}%{_sysconfdir}/sysconfig/%{name} %endif +# drop .la files +# * Warning: Linking the shared library libdbPlugin.la against the +# * static library /usr/src/packages/BUILD/nprobe_6.9.11_120912_svn2881_proplugins/../PF_RING/userland/libpcap/libpcap.a is not portable! +# * Warning: Linking the shared library libdbPlugin.la against the +# * static library /usr/src/packages/BUILD/nprobe_6.9.11_120912_svn2881_proplugins/../PF_RING/userland/lib/libpfring.a is not portable! +# * Warning: Linking the shared library libdbPlugin.la against the +# * static library /usr/src/packages/BUILD/nprobe_6.9.11_120912_svn2881_proplugins/nDPI/src/lib/.libs/libndpi.a is not portable! +find %{buildroot} -iname \.la -exec rm {} \; + %clean rm -rf %{buildroot} @@ -135,16 +159,12 @@ %{_prefix}/lib/nprobe/GeoIPASNum.dat %{_prefix}/lib/nprobe/GeoIPASNumv6.dat %{_prefix}/lib/nprobe/GeoLiteCity.dat -# removed in 6.9.9 -#%{_prefix}/lib/nprobe/plugins/libdbPlugin-%{version}.so +%{_prefix}/lib/nprobe/plugins/libdbPlugin-%{version}.so #%{_prefix}/lib/nprobe/plugins/libdbPlugin.la -#%{_prefix}/lib/nprobe/plugins/libdumpPlugin-%{version}.so -#%{_prefix}/lib/nprobe/plugins/libdumpPlugin.la - -#%{_prefix}/lib/nprobe/plugins/libl7Plugin-%{version}.so -#%{_prefix}/lib/nprobe/plugins/libl7Plugin.la +%{_prefix}/lib/nprobe/plugins/libbgpPlugin-%{version}.so +#%{_prefix}/lib/nprobe/plugins/libbgpPlugin.la %{_libdir}/libnprobe-%{version}.so -%{_libdir}/libnprobe.la +#%{_libdir}/libnprobe.la %{_libdir}/libnprobe.so %{_sysconfdir}/init.d/%{name} %if 0%{?suse_version} @@ -156,12 +176,10 @@ %files devel %defattr(-,root,root) %{_libdir}/libnprobe.a -# removed in 6.9.9 -#%if 0%{?sles_version} != 11 && 0%{?suse_version} < 1110 -#%{_prefix}/lib/nprobe/plugins/libdbPlugin.a -#%{_prefix}/lib/nprobe/plugins/libdumpPlugin.a -##%{_prefix}/lib/nprobe/plugins/libl7Plugin.a -#%endif +%if 0%{?sles_version} != 11 && 0%{?suse_version} < 1110 +%{_prefix}/lib/nprobe/plugins/libdbPlugin.a +%{_prefix}/lib/nprobe/plugins/libbgpPlugin.a +%endif %changelog Thu Jul 28 2011 Carsten Schoene <cs@linux-administrator.com> - 6.5.1-1
[-] [+]	Added	nprobe-6.9.11-GeoIPdat-dir.patch ^
@@ -0,0 +1,20 @@ +--- nprobe.c.orig 2011-04-03 13:53:36.000000000 +0200 ++++ nprobe.c 2011-04-04 10:44:26.309788419 +0200 +@@ -3601,7 +3601,7 @@ + + #ifdef HAVE_GEOIP + if(readOnlyGlobals.geo_ip_asn_db == NULL) +- readASs("GeoIPASNum.dat"); ++ readASs("/usr/lib/nprobe/GeoIPASNum.dat"); + + if(!readOnlyGlobals.enableGeoIP) { + if(readOnlyGlobals.geo_ip_city_db != NULL) { +@@ -3610,7 +3610,7 @@ + } + } else { + if(readOnlyGlobals.geo_ip_city_db == NULL) +- readCities("GeoLiteCity.dat"); ++ readCities("/usr/lib/nprobe/GeoLiteCity.dat"); + } + #endif +
[-] [+]	Added	nprobe-6.9.11-configure.in.patch ^
@@ -0,0 +1,11 @@ +--- configure.in.orig 2012-12-17 23:15:51.344038582 +0100 ++++ configure.in 2012-12-18 12:39:20.908040235 +0100 +@@ -363,7 +363,7 @@ + PWD=`pwd`/.. + LIBPCAP_ARM="${PWD}/libpcap-1.1.1-ARM" + PLATFORM=`uname -m` +-PF_RING_HOME=${HOME}/PF_RING ++PF_RING_HOME=${PWD}/PF_RING + + if test -d "${PF_RING_HOME}"; then + LDFLAGS="${LDFLAGS} -L${PWD}/PF_RING/userland/lib -L${PWD}/PF_RING/userland/libpcap"
	Changed	GeoIPASNum.dat.gz ^
	Changed	GeoIPASNumv6.dat.gz ^
	Changed	GeoLiteCity.dat.gz ^
	Added	PF_RING-5.5.1.tar.bz2 ^
[-] [+]	Changed	nDPI.tar.bz2/Makefile.am ^
@@ -1,2 +1,4 @@ SUBDIRS = src/include src/lib ACLOCAL_AMFLAGS = -I m4 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libndpi.pc
[-] [+]	Changed	nDPI.tar.bz2/Makefile.in ^
@@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,7 +14,25 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + \\[\ \ ]) \ + echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \ + \| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \ + ) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + =\|--) ;; \ + n) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,9 +53,9 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing + $(srcdir)/Makefile.in $(srcdir)/libndpi.pc.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + config.guess config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -48,7 +66,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = libndpi.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -59,6 +77,40 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n\|no\|NO) false;; \ + ) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \ + ) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p \| sed -e 's\|^./\|\|'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\\|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done \| sed -e "s\|$$srcdirstrip/\|\|" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done \| \ + sed "s\| $$srcdirstrip/\| \|;"' / .\//!s/ ./ ./; s,$ .$/[^/]$$,\1,' \| \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' \| \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + \|\| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + \|\| { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -222,6 +274,8 @@ top_srcdir = @top_srcdir@ SUBDIRS = src/include src/lib ACLOCAL_AMFLAGS = -I m4 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libndpi.pc all: all-recursive .SUFFIXES: @@ -259,6 +313,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): +libndpi.pc: $(top_builddir)/config.status $(srcdir)/libndpi.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f .lo @@ -268,6 +324,27 @@ distclean-libtool: -rm -f libtool config.lt +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" \|\| list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" \|\| exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done \| $(am__base_list) \| \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" \|\| exit $$?; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" \|\| list=; \ + files=`for p in $$list; do echo $$p; done \| sed -e 's\|^./\|\|'`; \ + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -438,13 +515,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - \|\| $(MKDIR_P) "$(distdir)/$$subdir" \ - \|\| exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + \|\| test -d "$(distdir)/$$subdir" \ + \|\| $(MKDIR_P) "$(distdir)/$$subdir" \ + \|\| exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -530,7 +604,7 @@ .zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -596,9 +670,12 @@ exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -651,7 +728,7 @@ info-am: -install-data-am: +install-data-am: install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -697,7 +774,7 @@ ps-am: -uninstall-am: +uninstall-am: uninstall-pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -712,11 +789,12 @@ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-pkgconfigDATA # Tell versions [3.59,3.63) of GNU make to not export all variables.
[-] [+]	Changed	nDPI.tar.bz2/aclocal.m4 ^
@@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -- Autoconf -- +# generated automatically by aclocal 1.11.6 -- Autoconf -- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -38,7 +38,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,7 +54,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
[-] [+]	Changed	nDPI.tar.bz2/configure ^
@@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for nDPI 1.4.0. +# Generated by GNU Autoconf 2.69 for nDPI 1.4.0. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + vx* \| xv* ) as_opts=-vx ;; + v ) as_opts=-v ;; + x ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 \|\| exit 1" +test x\$exitcode = x0 \|\| exit 1 +test -x / \|\| exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -220,21 +244,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - vx* \| xv* ) as_opts=-vx ;; - v ) as_opts=-v ;; - x ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + vx* \| xv* ) as_opts=-vx ;; + v ) as_opts=-v ;; + x ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -336,6 +364,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -457,6 +493,10 @@ chmod +x "$as_me.lineno" \|\| { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -491,16 +531,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -512,28 +552,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]):;;)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1197,8 +1217,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1456,9 +1474,9 @@ if $ac_init_version; then cat <<\_ACEOF nDPI configure 1.4.0 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1534,7 +1552,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes \|\| - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1821,7 +1839,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by nDPI $as_me 1.4.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2238,7 +2256,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2407,7 +2425,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2447,7 +2465,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2498,7 +2516,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } \|\| continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" \|\| continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* \| \ 'mkdir (coreutils) '* \| \ @@ -2551,7 +2569,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2928,7 +2946,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2968,7 +2986,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3021,7 +3039,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3062,7 +3080,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3120,7 +3138,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3164,7 +3182,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3610,8 +3628,7 @@ /* end confdefs.h. / #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; / Most of the following tests are stolen from RCS 5.7's src/conf.sh. / struct buf { int x; }; FILE (rcsopen) (struct buf , struct stat , int); @@ -3846,7 +3863,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } \|\| continue + as_fn_executable_p "$ac_path_SED" \|\| continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -3922,7 +3939,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue + as_fn_executable_p "$ac_path_GREP" \|\| continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3988,7 +4005,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue + as_fn_executable_p "$ac_path_EGREP" \|\| continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4055,7 +4072,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } \|\| continue + as_fn_executable_p "$ac_path_FGREP" \|\| continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4311,7 +4328,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4355,7 +4372,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4779,7 +4796,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4819,7 +4836,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5125,7 +5142,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5165,7 +5182,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5269,7 +5286,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5313,7 +5330,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5438,7 +5455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5478,7 +5495,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5537,7 +5554,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5577,7 +5594,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6226,7 +6243,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6266,7 +6283,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6346,7 +6363,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6386,7 +6403,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6438,7 +6455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6478,7 +6495,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6530,7 +6547,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6570,7 +6587,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6622,7 +6639,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6662,7 +6679,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6714,7 +6731,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6754,7 +6771,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11280,7 +11297,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11320,7 +11337,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11373,7 +11390,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11414,7 +11431,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -11472,7 +11489,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11516,7 +11533,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11712,8 +11729,7 @@ / end confdefs.h. / #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; / Most of the following tests are stolen from RCS 5.7's src/conf.sh. / struct buf { int x; }; FILE (rcsopen) (struct buf , struct stat , int); @@ -11944,7 +11960,7 @@ done -ac_config_files="$ac_config_files Makefile src/lib/Makefile src/include/Makefile" +ac_config_files="$ac_config_files Makefile src/lib/Makefile src/include/Makefile libndpi.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12409,16 +12425,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -12478,28 +12494,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]):;;)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -12521,7 +12525,7 @@ # values after options handling. ac_log=" This file was extended by nDPI $as_me 1.4.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12578,10 +12582,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ nDPI config.status 1.4.0 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -12661,7 +12665,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$" >&6 CONFIG_SHELL='$SHELL' @@ -12977,6 +12981,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;; + "libndpi.pc") CONFIG_FILES="$CONFIG_FILES libndpi.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac
[-] [+]	Changed	nDPI.tar.bz2/configure.ac ^
@@ -15,5 +15,6 @@ AC_CONFIG_FILES([Makefile src/lib/Makefile src/include/Makefile + libndpi.pc ]) AC_OUTPUT
[-] [+]	Changed	nDPI.tar.bz2/example/Makefile ^
@@ -1,5 +1,8 @@ INC=-I../src/include/ LIB=../src/lib/.libs/libndpi.a -lpcap -pcapReader: pcapReader.c Makefile - gcc -g $(INC) pcapReader.c -o pcapReader $(LIB) \ No newline at end of file +pcapReader: pcapReader.c Makefile ../src/lib/.libs/libndpi.a + gcc -g $(INC) pcapReader.c -o pcapReader $(LIB) + +clean: + \/bin/rm -f pcapReader
[-] [+]	Added	nDPI.tar.bz2/libndpi.pc.in ^
@@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libndpi +Description: deep packet inspection library +Version: @VERSION@ +Libs: -L${libdir} -lndpi +Cflags: -I${includedir}/libndpi-@VERSION@ \ No newline at end of file
[-] [+]	Added	nDPI.tar.bz2/ndpi-netfilter ^
+(directory)
[-] [+]	Added	nDPI.tar.bz2/ndpi-netfilter/README ^
@@ -0,0 +1,4 @@ +This package is a GPL implementation of an iptables and netfilter module for +nDPI integration into the Linux kernel. + +https://github.com/ewildgoose/ndpi-netfilter
[-] [+]	Changed	nDPI.tar.bz2/src/include/Makefile.in ^
@@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + \\[\ \ ]) \ + echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \ + \| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \ + ) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + =\|--) ;; \ + n) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -49,6 +66,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n\|no\|NO) false;; \ + ) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`; am__vpath_adj = case $$p in \ $(srcdir)/) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \ @@ -243,8 +265,11 @@ -rm -rf .libs _libs install-library_includeHEADERS: $(library_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(library_includedir)" \|\| $(MKDIR_P) "$(DESTDIR)$(library_includedir)" @list='$(library_include_HEADERS)'; test -n "$(library_includedir)" \|\| list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(library_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(library_includedir)" \|\| exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \
[-] [+]	Changed	nDPI.tar.bz2/src/include/linux_compat.h ^
@@ -51,6 +51,9 @@ u_int32_t daddr; }; + +#ifdef WIN32 + typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int uint; @@ -102,6 +105,13 @@ #define s6_addr16 __u6_addr.__u6_addr16 #define s6_addr32 __u6_addr.__u6_addr32 +#else +#ifndef OPENDPI_NETFILTER_MODULE +#include <arpa/inet.h> +#endif +#endif + + struct ndpi_in6_addr { union { @@ -148,10 +158,5 @@ u_int16_t len; u_int16_t check; }; -#else -#ifndef WIN32 -#include <arpa/inet.h> -#endif -#endif - +#endif
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_define.h ^
@@ -25,7 +25,20 @@ gcc -E -dM - < /dev/null \|grep ENDIAN / +#ifdef WIN32 +#define __LITTLE_ENDIAN__ 1 +#endif + #if !(defined(__LITTLE_ENDIAN__) \|\| defined(__BIG_ENDIAN__)) +/ Kernel modules / +#if defined(__LITTLE_ENDIAN) +#define __LITTLE_ENDIAN__ +#endif +#if defined(__BIG_ENDIAN) +#define __BIG_ENDIAN__ +#endif +/ Everything else */ +#if (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)) #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #define __LITTLE_ENDIAN__ #else @@ -33,6 +46,8 @@ #endif #endif +#endif + #define NDPI_USE_ASYMMETRIC_DETECTION 0 #define NDPI_SELECTION_BITMASK_PROTOCOL_SIZE u_int32_t
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_macros.h ^
@@ -59,8 +59,8 @@ /* this is a very very tricky macro g, * the compiler will remove all shifts here if the protocol is static... */ -#define NDPI_ADD_PROTOCOL_TO_BITMASK(bmask,value) \ - {(bmask).bitmask[(value) >> 6] \|= (((u_int64_t)1)<<((value) & 0x3F));} \ +#define NDPI_ADD_PROTOCOL_TO_BITMASK(bmask,value) \ + {(bmask).bitmask[(value) >> 6] \|= (((u_int64_t)1)<<((value) & 0x3F));} \ #define NDPI_DEL_PROTOCOL_FROM_BITMASK(bmask,value) \ {(bmask).bitmask[(value) >> 6] = (bmask).bitmask[(value) >> 6] & (~(((u_int64_t)1)<<((value) & 0x3F)));} \
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_main.h ^
@@ -31,7 +31,7 @@ #include <string.h> #endif -#if !defined(WIN32) +#ifndef WIN32 #if 1 && !defined __APPLE__ && !defined __FreeBSD__ #ifndef OPENDPI_NETFILTER_MODULE @@ -41,17 +41,17 @@ # include <asm/byteorder.h> #endif -#endif /* not WIN32 && not APPLE) / -#endif / ntop / +#endif / default includes / -#ifndef WIN32 +#ifndef OPENDPI_NETFILTER_MODULE #include <sys/param.h> #include <limits.h> #endif -#ifdef NDPI_BUILD +#endif + #ifdef WIN32 #define __attribute__(x) typedef char int8_t; @@ -65,7 +65,6 @@ #endif #include "linux_compat.h" -#endif #if defined(__FreeBSD__) #include <netinet/in.h> @@ -73,18 +72,21 @@ #ifndef WIN32 #ifndef OPENDPI_NETFILTER_MODULE -#include <netinet/ip.h> -#include <netinet/tcp.h> -#include <netinet/udp.h> +# include <netinet/ip.h> +# include <netinet/tcp.h> +# include <netinet/udp.h> +#else +# include <linux/ip.h> +# include <linux/tcp.h> +# include <linux/udp.h> #endif #endif -#include <time.h> - #include "ndpi_define.h" #include "ndpi_macros.h" #include "ndpi_protocols_osdpi.h" +u_int16_t ntohs_ndpi_bytestream_to_number(const u_int8_t str, u_int16_t max_chars_to_read, u_int16_t * bytes_read); u_int32_t ndpi_bytestream_to_number(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read); u_int64_t ndpi_bytestream_to_number64(const u_int8_t * str, u_int16_t max_chars_to_read, u_int16_t * bytes_read);
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_protocols.h ^
@@ -24,8 +24,6 @@ #ifndef __NDPI_PROTOCOLS_INCLUDE_FILE__ #define __NDPI_PROTOCOLS_INCLUDE_FILE__ -#define NDPI_BUILD - #include "ndpi_main.h" /* the get_uXX will return raw network packet bytes !! / @@ -57,8 +55,6 @@ #endif / __BYTE_ORDER / - - / define memory callback function */ #define ndpi_mem_cmp memcmp void ndpi_search_bittorrent(struct ndpi_detection_module_struct
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_protocols_osdpi.h ^
@@ -201,7 +201,7 @@ #define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1) - +#if 0 #define NDPI_PROTOCOL_LONG_STRING "Unknown","FTP","Mail_POP","Mail_SMTP","Mail_IMAP","DNS","IPP","HTTP","MDNS","NTP",\ "NETBIOS","NFS","SSDP","BGP","SNMP","XDMCP","SMB","SYSLOG","DHCP","PostgreSQL","MySQL","TDS","DirectDownloadLink","I23V5", \ "AppleJuice","DirectConnect","Socrates","WinMX","MANOLITO","PANDO","Filetopia","iMESH","Kontiki","OpenFT","Kazaa/Fasttrack", \ @@ -229,6 +229,7 @@ "http_connect","http_proxy","Citrix","Netflix","Last.fm","Grooveshark",\ "Skyfile_pre", "Skyfile_ru","Skyfile_post","CitrixOnline","iMessage_Facetime","Webex","WhatsApp","iCloud","Viber","iTunes", \ "Radius","WinUpdate","TeamViewer","tuenti" +#endif #ifdef __cplusplus }
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_public_functions.h ^
@@ -28,11 +28,15 @@ #ifndef __NDPI_PUBLIC_FUNCTIONS_H__ #define __NDPI_PUBLIC_FUNCTIONS_H__ -#include "ndpi_structs.h" +//#include "ndpi_structs.h" #ifdef __cplusplus extern "C" { #endif + /* Forward / + struct ndpi_flow_struct; + struct ndpi_id_struct; + /* * struct for a unique ipv4 flow address / @@ -223,8 +227,13 @@ u_int8_t ndpi_detection_flow_protocol_history_contains_protocol(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow, u_int16_t protocol_id); - unsigned int ndpi_find_port_based_protocol(u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport); - unsigned int ndpi_guess_undetected_protocol(u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport); + unsigned int ndpi_find_port_based_protocol(struct ndpi_detection_module_struct ndpi_struct, + u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport); + unsigned int ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct ndpi_struct, + u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport); + char ndpi_get_proto_name(struct ndpi_detection_module_struct mod, u_int16_t proto_id); + void ndpi_dump_protocols(struct ndpi_detection_module_struct mod); + char* ndpi_strnstr(const char s, const char find, size_t slen); int matchStringProtocol(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow, char *string_to_match, u_int string_to_match_len);
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_structs.h ^
@@ -24,9 +24,7 @@ #ifndef __NDPI_STRUCTS_INCLUDE_FILE__ #define __NDPI_STRUCTS_INCLUDE_FILE__ -#ifdef NDPI_BUILD #include "linux_compat.h" -#endif #include "ndpi_define.h" @@ -500,6 +498,14 @@ u_int8_t detection_feature; } ndpi_call_function_struct_t; +#define MAX_DEFAULT_PORTS 3 + +/* ntop extensions / +typedef struct ndpi_proto_defaults { + char protoName; + u_int16_t tcpDefaultPorts, udpDefaultPorts; +} ndpi_proto_defaults_t; + typedef struct ndpi_detection_module_struct { NDPI_PROTOCOL_BITMASK detection_bitmask; NDPI_PROTOCOL_BITMASK generic_http_packet_bitmask; @@ -576,6 +582,9 @@ char ip_string[NDPI_IP_STRING_SIZE]; #endif u_int8_t ip_version_limit; + + /* ********************* */ + ndpi_proto_defaults_t proto_defaults[NDPI_MAX_SUPPORTED_PROTOCOLS]; } ndpi_detection_module_struct_t; typedef struct ndpi_flow_struct {
[-] [+]	Changed	nDPI.tar.bz2/src/lib/Makefile.in ^
@@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + \\[\ \ ]) \ + echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \ + \| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \ + ) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + =\|--) ;; \ + n) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,6 +161,11 @@ $(LDFLAGS) -o $@ SOURCES = $(libndpi_la_SOURCES) DIST_SOURCES = $(libndpi_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n\|no\|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -425,7 +447,6 @@ $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" \|\| list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -433,6 +454,8 @@ else :; fi; \ done; \ test -z "$$list2" \|\| { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" \|\| exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ }
[-] [+]	Changed	nDPI.tar.bz2/src/lib/ndpi_main.c ^
@@ -1,27 +1,27 @@ /* * ndpi_main.c * Copyright (C) 2009-2011 by ipoque GmbH + * Copyright (C) 2011-12 - ntop.org * - * This file is part of OpenDPI, an open source deep packet inspection - * library based on the PACE technology by ipoque GmbH + * This file is part of nDPI, an open source deep packet inspection + * library based on the OpenDPI and PACE technology by ipoque GmbH * - * OpenDPI is free software: you can redistribute it and/or modify + * nDPI is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * OpenDPI is distributed in the hope that it will be useful, + * nDPI 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 Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with OpenDPI. If not, see <http://www.gnu.org/licenses/>. + * along with nDPI. If not, see <http://www.gnu.org/licenses/>. * / -#define NDPI_BUILD - +#include <stdlib.h> #include "ndpi_main.h" #include "ndpi_protocols.h" #include "ndpi_utils.h" @@ -94,19 +94,271 @@ void ndpi_exit_detection_module(struct ndpi_detection_module_struct ndpi_struct, void (ndpi_free) (void ptr)) { - if (ndpi_struct != NULL) { + if(ndpi_struct != NULL) { + int i; + + for(i=0; i<NDPI_MAX_SUPPORTED_PROTOCOLS; i++) { + if(ndpi_struct->proto_defaults[i].protoName) free(ndpi_struct->proto_defaults[i].protoName); + if(ndpi_struct->proto_defaults[i].tcpDefaultPorts) free(ndpi_struct->proto_defaults[i].tcpDefaultPorts); + if(ndpi_struct->proto_defaults[i].udpDefaultPorts) free(ndpi_struct->proto_defaults[i].udpDefaultPorts); + } + ndpi_free(ndpi_struct); } } -void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct - ndpi_struct, const NDPI_PROTOCOL_BITMASK dbm) +u_int16_t* ndpi_build_default_ports(u_int16_t portA, u_int16_t portB, u_int16_t portC) { + u_int8_t num = 0, i; + u_int16_t ret; + + if(portA != 0) { + num++; + + if(portB != 0) { + num++; + + if(portC != 0) + num++; + } + } + + if(num >= MAX_DEFAULT_PORTS) { + printf("%s(%d) internal error\n", __FUNCTION__, num); + num = MAX_DEFAULT_PORTS-1; + } + + if(num == 0) return(NULL); + + ret = (u_int16_t)malloc(sizeof(u_int16_t)(num+1)); + if(ret == NULL) return(ret); + + ret[0] = portA; + if(portB != 0) + ret[1] = portB; + else { + ret[1] = 0; + return(ret); + } + + if(portC != 0) + ret[2] = portC, ret[3] = 0; + else { + ret[2] = 0; + return(ret); + } + + return(ret); +} + +static void ndpi_set_proto_defaults(struct ndpi_detection_module_struct ndpi_mod, + u_int16_t protoId, char protoName, + u_int16_t tcpDefPorts, u_int16_t udpDefPorts) { + char name = strdup(protoName); + + if(protoId >= NDPI_MAX_SUPPORTED_PROTOCOLS) { + printf("[NDPI] %s(protoId=%d): INTERNAL ERROR\n", __FUNCTION__, protoId); + return; + } + + ndpi_mod->proto_defaults[protoId].protoName = name; + ndpi_mod->proto_defaults[protoId].tcpDefaultPorts = tcpDefPorts, + ndpi_mod->proto_defaults[protoId].udpDefaultPorts = udpDefPorts; + +#if 0 + printf("%s(%d, %s, %p) [%s]\n", + __FUNCTION__, + protoId, + ndpi_mod->proto_defaults[protoId].protoName, + ndpi_mod, + ndpi_mod->proto_defaults[1].protoName); +#endif +} + +/* This function is used to map protocol name and default ports and it MUST + be updated whenever a new protocol is added to NDPI +/ +static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct ndpi_mod) { + int i; + + /* Reset all settings / + memset(ndpi_mod->proto_defaults, 0, sizeof(ndpi_mod->proto_defaults)); + + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_UNKNOWN, "UNKNOWN", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FTP, "FTP", ndpi_build_default_ports(20, 21, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MAIL_POP, "MAIL_POP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MAIL_SMTP, "MAIL_SMTP", ndpi_build_default_ports(25, 465, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MAIL_IMAP, "MAIL_IMAP", ndpi_build_default_ports(143, 993, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DNS, "DNS", ndpi_build_default_ports(53, 0, 0) / TCP /, ndpi_build_default_ports(53, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_IPP, "IPP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_HTTP, "HTTP", ndpi_build_default_ports(80, 3000 / ntop /, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MDNS, "MDNS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(5353, 5354, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_NTP, "NTP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_NETBIOS, "NETBIOS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(137, 138, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_NFS, "NFS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SSDP, "SSDP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_BGP, "BGP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SNMP, "SNMP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(161, 162, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_XDMCP, "XDMCP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SMB, "SMB", ndpi_build_default_ports(445, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SYSLOG, "SYSLOG", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DHCP, "DHCP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(67, 68, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_POSTGRES, "POSTGRES", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MYSQL, "MYSQL", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TDS, "TDS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, "DIRECT_DOWNLOAD_LINK", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_I23V5, "I23V5", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_APPLEJUICE, "APPLEJUICE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DIRECTCONNECT, "DIRECTCONNECT", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SOCRATES, "SOCRATES", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WINMX, "WINMX", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MANOLITO, "MANOLITO", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_PANDO, "PANDO", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FILETOPIA, "FILETOPIA", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_IMESH, "IMESH", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_KONTIKI, "KONTIKI", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_OPENFT, "OPENFT", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FASTTRACK, "FASTTRACK", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GNUTELLA, "GNUTELLA", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_EDONKEY, "EDONKEY", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_BITTORRENT, "BITTORRENT", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_OFF, "OFF", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_AVI, "AVI", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FLASH, "FLASH", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_OGG, "OGG", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MPEG, "MPEG", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_QUICKTIME, "QUICKTIME", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_REALMEDIA, "REALMEDIA", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WINDOWSMEDIA, "WINDOWSMEDIA", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MMS, "MMS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_XBOX, "XBOX", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_QQ, "QQ", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MOVE, "MOVE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_RTSP, "RTSP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FEIDIAN, "FEIDIAN", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ICECAST, "ICECAST", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_PPLIVE, "PPLIVE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_PPSTREAM, "PPSTREAM", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ZATTOO, "ZATTOO", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SHOUTCAST, "SHOUTCAST", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SOPCAST, "SOPCAST", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TVANTS, "TVANTS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TVUPLAYER, "TVUPLAYER", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV, "HTTP_APPLICATION_VEOHTV", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_QQLIVE, "QQLIVE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_THUNDER, "THUNDER", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SOULSEEK, "SOULSEEK", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GADUGADU, "GADUGADU", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_IRC, "IRC", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_POPO, "POPO", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_UNENCRYPED_JABBER, "UNENCRYPED_JABBER", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MSN, "MSN", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_OSCAR, "OSCAR", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_YAHOO, "YAHOO", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_BATTLEFIELD, "BATTLEFIELD", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_QUAKE, "QUAKE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SECONDLIFE, "SECONDLIFE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_STEAM, "STEAM", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_HALFLIFE2, "HALFLIFE2", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WORLDOFWARCRAFT, "WORLDOFWARCRAFT", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TELNET, "TELNET", ndpi_build_default_ports(23, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_STUN, "STUN", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_IPSEC, "IPSEC", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GRE, "GRE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ICMP, "ICMP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_IGMP, "IGMP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_EGP, "EGP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SCTP, "SCTP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_OSPF, "OSPF", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_IP_IN_IP, "IP_IN_IP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_RTP, "RTP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_RDP, "RDP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_VNC, "VNC", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_PCANYWHERE, "PCANYWHERE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SSL, "SSL", ndpi_build_default_ports(443, 3001 / ntop /, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SSH, "SSH", ndpi_build_default_ports(22, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_USENET, "USENET", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MGCP, "MGCP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_IAX, "IAX", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TFTP, "TFTP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_AFP, "AFP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_STEALTHNET, "STEALTHNET", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_AIMINI, "AIMINI", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SIP, "SIP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TRUPHONE, "TRUPHONE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ICMPV6, "ICMPV6", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DHCPV6, "DHCPV6", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ARMAGETRON, "ARMAGETRON", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_CROSSFIRE, "CROSSFIRE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DOFUS, "DOFUS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FIESTA, "FIESTA", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FLORENSIA, "FLORENSIA", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GUILDWARS, "GUILDWARS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC, "HTTP_APPLICATION_ACTIVESYNC", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_KERBEROS, "KERBEROS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_LDAP, "LDAP", ndpi_build_default_ports(389, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MAPLESTORY, "MAPLESTORY", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MSSQL, "MSSQL", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_PPTP, "PPTP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WARCRAFT3, "WARCRAFT3", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WORLD_OF_KUNG_FU, "WORLD_OF_KUNG_FU", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_MEEBO, "MEEBO", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_FACEBOOK, "FACEBOOK", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TWITTER, "TWITTER", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DROPBOX, "DROPBOX", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GMAIL, "GMAIL", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GOOGLE_MAPS, "GOOGLE_MAPS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_YOUTUBE, "YOUTUBE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SKYPE, "SKYPE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GOOGLE, "GOOGLE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_DCERPC, "DCERPC", ndpi_build_default_ports(135, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_NETFLOW, "NETFLOW", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SFLOW, "SFLOW", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_HTTP_CONNECT, "HTTP_CONNECT", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_HTTP_PROXY, "HTTP_PROXY", ndpi_build_default_ports(8080, 3128, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_CITRIX, "CITRIX", ndpi_build_default_ports(1494, 2598, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_NETFLIX, "NETFLIX", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_LASTFM, "LASTFM", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_GROOVESHARK, "GROOVESHARK", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SKYFILE_PREPAID, "SKYFILE_PREPAID", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SKYFILE_RUDICS, "SKYFILE_RUDICS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_SKYFILE_POSTPAID, "SKYFILE_POSTPAID", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_CITRIX_ONLINE, "CITRIX_ONLINE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_APPLE, "APPLE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WEBEX, "WEBEX", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WHATSAPP, "WHATSAPP", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_APPLE_ICLOUD, "APPLE_ICLOUD", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_VIBER, "VIBER", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_APPLE_ITUNES, "APPLE_ITUNES", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_RADIUS, "RADIUS", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_WINDOWS_UPDATE, "WINDOWS_UPDATE", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TEAMVIEWER, "TEAMVIEWER", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_TUENTI, "TUENTI", ndpi_build_default_ports(0, 0, 0) / TCP /, ndpi_build_default_ports(0, 0, 0) / UDP /); + + for(i=0; i<NDPI_MAX_SUPPORTED_PROTOCOLS; i++) { + if(ndpi_mod->proto_defaults[i].protoName == NULL) { + printf("[NDPI] %s(missing protoId=%d) INTERNAL ERROR: not all protocols have been initialized\n", __FUNCTION__, i); + } else { + int debug = 0; + + if(debug) + printf("[NDPI] (%p) %d/%s [%p/%p]\n", ndpi_mod, i, ndpi_mod->proto_defaults[i].protoName, + ndpi_mod->proto_defaults[i].tcpDefaultPorts, + ndpi_mod->proto_defaults[i].udpDefaultPorts); + } + } +} + + +void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct ndpi_struct, + const NDPI_PROTOCOL_BITMASK * dbm) { NDPI_PROTOCOL_BITMASK detection_bitmask_local; NDPI_PROTOCOL_BITMASK detection_bitmask = &detection_bitmask_local; - + u_int16_t tcpPorts, udpPorts; u_int32_t a = 0; + ndpi_init_protocol_defaults(ndpi_struct); + NDPI_BITMASK_SET(detection_bitmask_local, dbm); NDPI_BITMASK_SET(ndpi_struct->detection_bitmask, dbm); @@ -180,7 +432,6 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_HTTP); - #ifdef NDPI_PROTOCOL_MPEG NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_MPEG); #endif @@ -247,7 +498,6 @@ NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_XBOX); - NDPI_BITMASK_SET(ndpi_struct->generic_http_packet_bitmask, ndpi_struct->callback_buffer[a].detection_bitmask); @@ -295,6 +545,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); #ifdef NDPI_PROTOCOL_STUN NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_STUN); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_RTP); @@ -325,6 +576,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SIP); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_SIP); a++; } @@ -337,6 +589,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_BITTORRENT); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_BITTORRENT); a++; @@ -349,6 +602,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_EDONKEY); + #ifdef NDPI_PROTOCOL_BITTORRENT NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_BITTORRENT); #endif @@ -380,9 +634,11 @@ #ifdef NDPI_PROTOCOL_XBOX NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_XBOX); + #endif #ifdef NDPI_PROTOCOL_WINDOWS_UPDATE NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_WINDOWS_UPDATE); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_GNUTELLA); @@ -426,11 +682,14 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_MSN); + #ifdef NDPI_PROTOCOL_HTTP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_HTTP); + #endif #ifdef NDPI_PROTOCOL_SSL NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SSL); + #endif NDPI_BITMASK_RESET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask); NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_MSN); @@ -445,11 +704,14 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_YAHOO); + #ifdef NDPI_PROTOCOL_SSL NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SSL); + #endif #ifdef NDPI_PROTOCOL_HTTP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_HTTP); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_YAHOO); @@ -464,6 +726,7 @@ NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION; NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_OSCAR); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_OSCAR); a++; } @@ -490,6 +753,7 @@ NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SOULSEEK); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_SOULSEEK); @@ -505,8 +769,10 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_IRC); + #ifdef NDPI_PROTOCOL_HTTP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_HTTP); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_IRC); @@ -523,8 +789,10 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER); + #ifdef NDPI_PROTOCOL_SSL NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SSL); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER); @@ -533,6 +801,7 @@ / also exlude truphone since this is detected in jabber / NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_TRUPHONE); + #endif a++; } @@ -585,6 +854,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_FTP); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_FTP); a++; } @@ -651,6 +921,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SSL); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_IMESH); a++; @@ -693,38 +964,47 @@ #ifdef NDPI_PROTOCOL_IPSEC NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_IPSEC); + #endif #ifdef NDPI_PROTOCOL_GRE NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_GRE); + #endif #ifdef NDPI_PROTOCOL_IGMP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_ICMP); + #endif #ifdef NDPI_PROTOCOL_IGMP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_IGMP); + #endif #ifdef NDPI_PROTOCOL_EGP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_EGP); + #endif #ifdef NDPI_PROTOCOL_SCTP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_SCTP); + #endif #ifdef NDPI_PROTOCOL_OSPF NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_OSPF); + #endif #ifdef NDPI_PROTOCOL_IP_IN_IP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_IP_IN_IP); + #endif #ifdef NDPI_PROTOCOL_ICMPV6 NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_ICMPV6); + #endif a++; } @@ -785,6 +1065,7 @@ if (NDPI_COMPARE_PROTOCOL_TO_BITMASK(detection_bitmask, NDPI_PROTOCOL_PPLIVE) != 0) { ndpi_struct->callback_buffer[a].func = ndpi_search_pplive_tcp_udp; NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_PPLIVE); + ndpi_struct->callback_buffer[a].ndpi_selection_bitmask = NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD; @@ -803,6 +1084,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_IAX); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_IAX); a++; @@ -846,11 +1128,14 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_ZATTOO); + #ifdef NDPI_PROTOCOL_FLASH NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_FLASH); + #endif #ifdef NDPI_PROTOCOL_HTTP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_HTTP); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_ZATTOO); @@ -866,6 +1151,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_QQ); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_QQ); a++; @@ -941,6 +1227,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_TEAMVIEWER); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_TEAMVIEWER); a++; } @@ -1116,6 +1403,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_FLASH); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_FLASH); a++; } @@ -1194,6 +1482,7 @@ #ifdef NDPI_PROTOCOL_SSL NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SSL); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_SECONDLIFE); @@ -1243,25 +1532,32 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); #ifdef NDPI_PROTOCOL_HTTP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_HTTP); + #endif #ifdef NDPI_PROTOCOL_MPEG NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_MPEG); + #endif #ifdef NDPI_PROTOCOL_QUICKTIME NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_QUICKTIME); + #endif #ifdef NDPI_PROTOCOL_REALMEDIA NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_REALMEDIA); + #endif #ifdef NDPI_PROTOCOL_WINDOWSMEDIA NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_WINDOWSMEDIA); + #endif #ifdef NDPI_PROTOCOL_AVI NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_AVI); + #endif #ifdef NDPI_PROTOCOL_OGG NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_OGG); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_ICECAST); @@ -1292,6 +1588,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); #ifdef NDPI_PROTOCOL_HTTP NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_HTTP); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV); @@ -1434,6 +1731,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_WARCRAFT3); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_WARCRAFT3); a++; @@ -1450,6 +1748,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_XDMCP); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_XDMCP); a++; @@ -1522,6 +1821,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); #ifdef NDPI_PROTOCOL_FLASH NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_FLASH); + #endif NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_MEEBO); @@ -1661,6 +1961,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_DROPBOX); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_DROPBOX); a++; } @@ -1674,6 +1975,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_SKYPE); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_SKYPE); a++; } @@ -1687,6 +1989,7 @@ NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[a].detection_bitmask, NDPI_PROTOCOL_RADIUS); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_RADIUS); a++; } @@ -1809,7 +2112,6 @@ ndpi_struct->callback_buffer_size_non_tcp_udp++; } } - } #ifdef NDPI_DETECTION_SUPPORT_IPV6 @@ -1915,9 +2217,14 @@ #endif if (iph != NULL && ndpi_iph_is_valid_and_not_fragmented(iph, l3_len)) { + u_int16_t len = ntohs(iph->tot_len); + u_int16_t hlen = (iph->ihl * 4); l4ptr = (((const u_int8_t ) iph) + iph->ihl 4); - l4len = ntohs(iph->tot_len) - (iph->ihl * 4); + + if(len == 0) len = l3_len; + + l4len = (len > hlen) ? (len - hlen) : 0; l4protocol = iph->protocol; } #ifdef NDPI_DETECTION_SUPPORT_IPV6 @@ -1967,7 +2274,7 @@ #endif } -static int ndpi_init_packet_header(struct ndpi_detection_module_struct ndpi_struct, +static int ndpi_init_packet_header(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow, unsigned short packetlen) { @@ -2223,7 +2530,7 @@ struct ndpi_flow_struct flow, const unsigned char packet, const unsigned short packetlen, - const u_int32_t current_tick, + const u_int32_t current_tick, struct ndpi_id_struct src, struct ndpi_id_struct dst) { @@ -2621,7 +2928,7 @@ / internal function for every detection to parse one packet and to increase the info buffer / void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow) -{ +{ u_int32_t a; struct ndpi_packet_struct packet = &flow->packet; u_int16_t end = packet->payload_packet_len - 1; @@ -2846,7 +3153,7 @@ -u_int16_t ndpi_check_for_email_address(struct ndpi_detection_module_struct ndpi_struct, +u_int16_t ndpi_check_for_email_address(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow, u_int16_t counter) { @@ -3252,7 +3559,7 @@ leaves the library but it could also use the flow stack. / u_int8_t ndpi_detection_flow_protocol_history_contains_protocol(struct ndpi_detection_module_struct ndpi_struct, - struct ndpi_flow_struct flow, + struct ndpi_flow_struct flow, u_int16_t protocol_id) { u_int8_t a; @@ -3310,7 +3617,7 @@ * 1.update the flow protocol stack with the new protocol * 2.update the packet protocol stack with the new protocol / -void ndpi_int_change_protocol(struct ndpi_detection_module_struct ndpi_struct, +void ndpi_int_change_protocol(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow, u_int16_t detected_protocol, ndpi_protocol_type_t protocol_type) @@ -3323,7 +3630,7 @@ /* turns a packet back to unknown / void ndpi_int_reset_packet_protocol(struct ndpi_packet_struct packet) { packet->detected_protocol_stack[0] = NDPI_PROTOCOL_UNKNOWN; - + #if NDPI_PROTOCOL_HISTORY_SIZE > 1 packet->protocol_stack_info.current_stack_size_minus_one = 0; packet->protocol_stack_info.entry_is_real_protocol = 0; @@ -3334,7 +3641,7 @@ { if (flow) { flow->detected_protocol_stack[0] = NDPI_PROTOCOL_UNKNOWN; - + #if NDPI_PROTOCOL_HISTORY_SIZE > 1 flow->protocol_stack_info.current_stack_size_minus_one = 0; flow->protocol_stack_info.entry_is_real_protocol = 0; @@ -3464,6 +3771,7 @@ } #endif /* NDPI_ENABLE_DEBUG_MESSAGES / +/ ****************************************************** / u_int16_t ntohs_ndpi_bytestream_to_number(const u_int8_t str, u_int16_t max_chars_to_read, u_int16_t * bytes_read) { @@ -3471,6 +3779,7 @@ return ntohs(val); } +/* ****************************************************** / static u_int is_port(u_int16_t sport, u_int16_t dport, u_int16_t match_port) { return(((match_port == sport) \|\| (match_port == dport)) ? 1 : 0); @@ -3478,7 +3787,8 @@ / ****************************************************** / -unsigned int ndpi_find_port_based_protocol(u_int8_t proto, +unsigned int ndpi_find_port_based_protocol(struct ndpi_detection_module_struct ndpi_struct /* NOTUSED /, + u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport) { / Skyfile (host 193.252.234.246 or host 10.10.102.80) / @@ -3494,34 +3804,46 @@ / ****************************************************** / -unsigned int ndpi_guess_undetected_protocol(u_int8_t proto, +unsigned int ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct ndpi_struct, + u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport) { + int i; + // printf("ndpi_guess_undetected_protocol (proto=%d, %d -> %d)\n", proto, sport, dport); - if(proto == IPPROTO_UDP) { - if(is_port(sport, dport, 67) \|\| is_port(sport, dport, 68)) return(NDPI_PROTOCOL_DHCP); - else if(is_port(sport, dport, 137) \|\| is_port(sport, dport, 138)) return(NDPI_PROTOCOL_NETBIOS); - else if(is_port(sport, dport, 161) \|\| is_port(sport, dport, 162)) return(NDPI_PROTOCOL_SNMP); - else if(is_port(sport, dport, 5353) \|\| is_port(sport, dport, 5354)) return(NDPI_PROTOCOL_MDNS); - else if(is_port(sport, dport, 53)) return(NDPI_PROTOCOL_DNS); - } else if(proto == IPPROTO_TCP) { - if(is_port(sport, dport, 443)) return(NDPI_PROTOCOL_SSL); - else if(is_port(sport, dport, 22)) return(NDPI_PROTOCOL_SSH); - else if(is_port(sport, dport, 23)) return(NDPI_PROTOCOL_TELNET); - else if(is_port(sport, dport, 445)) return(NDPI_PROTOCOL_SMB); - else if(is_port(sport, dport, 80)) return(NDPI_PROTOCOL_HTTP); - else if(is_port(sport, dport, 3000)) return(NDPI_PROTOCOL_HTTP); /* ntop / - else if(is_port(sport, dport, 3001)) return(NDPI_PROTOCOL_SSL); / ntop / - else if(is_port(sport, dport, 8080) \|\| is_port(sport, dport, 3128)) return(NDPI_PROTOCOL_HTTP_PROXY); - else if(is_port(sport, dport, 389)) return(NDPI_PROTOCOL_LDAP); - else if(is_port(sport, dport, 143) \|\| is_port(sport, dport, 993)) return(NDPI_PROTOCOL_MAIL_IMAP); - else if(is_port(sport, dport, 25) \|\| is_port(sport, dport, 465)) return(NDPI_PROTOCOL_MAIL_SMTP); - else if(is_port(sport, dport, 135)) return(NDPI_PROTOCOL_DCERPC); - else if(is_port(sport, dport, 1494) \|\| is_port(sport, dport, 2598)) return(NDPI_PROTOCOL_CITRIX); / http://support.citrix.com/article/CTX104147 / - else if(is_port(sport, dport, 389)) return(NDPI_PROTOCOL_LDAP); + for(i=0; i<NDPI_MAX_SUPPORTED_PROTOCOLS; i++) { + u_int16_t defaultPorts; + + defaultPorts = (proto == IPPROTO_TCP) ? ndpi_struct->proto_defaults[i].tcpDefaultPorts : ndpi_struct->proto_defaults[i].udpDefaultPorts; + + if(defaultPorts != NULL) { + int j; + + for(j=0; j<MAX_DEFAULT_PORTS; j++) { + if(defaultPorts[j] == 0) break; + if(is_port(sport, dport, defaultPorts[j])) + return(i /* protocolId /); + } + } } return(NDPI_PROTOCOL_UNKNOWN); } +/ ****************************************************** / + +char ndpi_get_proto_name(struct ndpi_detection_module_struct mod, + u_int16_t proto_id) { + if(proto_id > NDPI_LAST_IMPLEMENTED_PROTOCOL) proto_id = NDPI_PROTOCOL_UNKNOWN; + return(mod->proto_defaults[proto_id].protoName); +} + +/ ****************************************************** / + +void ndpi_dump_protocols(struct ndpi_detection_module_struct mod) { + int i; + + for(i=0; i<NDPI_MAX_SUPPORTED_PROTOCOLS; i++) + printf("[%3d] %s\n", i, mod->proto_defaults[i].protoName); +}
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/dns.c ^
@@ -1,23 +1,7 @@ /* * dns.c - * Copyright (C) 2009-2011 by ipoque GmbH - * - * This file is part of OpenDPI, an open source deep packet inspection - * library based on the PACE technology by ipoque GmbH - * - * OpenDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * OpenDPI 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with OpenDPI. If not, see <http://www.gnu.org/licenses/>. - * + * Copyright (C) 2012 ntop.org + * / @@ -25,90 +9,79 @@ #ifdef NDPI_PROTOCOL_DNS -/ -This module should detect DNS -/ - -static void ndpi_int_dns_add_connection(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow) -{ - ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_DNS, NDPI_REAL_PROTOCOL); -} - +struct dns_packet_header { + u_int16_t transaction_id, flags, num_queries, answer_rrs, authority_rrs, additional_rrs; +} __attribute__((packed)); void ndpi_search_dns(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow) { - struct ndpi_packet_struct packet = &flow->packet; - -// struct ndpi_id_struct src=ndpi_struct->src; -// struct ndpi_id_struct dst=ndpi_struct->dst; - - - u_int16_t dport = 0; - + struct ndpi_packet_struct packet = &flow->packet; + u_int16_t dport = 0, sport = 0; + #define NDPI_MAX_DNS_REQUESTS 16 - NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "search DNS.\n"); - - - if (packet->udp != NULL) { - // const u_int16_t sport=ntohs(packet->udp->source); - dport = ntohs(packet->udp->dest); - NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "calculated dport over UDP.\n"); - } - if (packet->tcp != NULL) { - // const u_int16_t sport=ntohs(packet->tcp->source); - dport = ntohs(packet->tcp->dest); - NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "calculated dport over tcp.\n"); - } - - /check standard DNS to port 53 / - if (dport == 53 && packet->payload_packet_len >= 12) { - - NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "dport==53, packet-payload-packet-len>=12.\n"); - - / dns header - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - \| ID \| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - \|QR\| Opcode \|AA\|TC\|RD\|RA\| Z \| RCODE \| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - \| QDCOUNT \| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - \| ANCOUNT \| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - \| NSCOUNT \| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - \| ARCOUNT \| - +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ - * - * dns query check: query: QR set, ancount = 0, nscount = 0, QDCOUNT < MAX_DNS, ARCOUNT < MAX_DNS - * - / - - if (((packet->payload[2] & 0x80) == 0 && - ntohs(get_u_int16_t(packet->payload, 4)) <= NDPI_MAX_DNS_REQUESTS && - ntohs(get_u_int16_t(packet->payload, 4)) != 0 && - ntohs(get_u_int16_t(packet->payload, 6)) == 0 && - ntohs(get_u_int16_t(packet->payload, 8)) == 0 && ntohs(get_u_int16_t(packet->payload, 10)) <= NDPI_MAX_DNS_REQUESTS) - \|\| - ((ntohs(get_u_int16_t(packet->payload, 0)) == packet->payload_packet_len - 2) && - (packet->payload[4] & 0x80) == 0 && - ntohs(get_u_int16_t(packet->payload, 6)) <= NDPI_MAX_DNS_REQUESTS && - ntohs(get_u_int16_t(packet->payload, 6)) != 0 && - ntohs(get_u_int16_t(packet->payload, 8)) == 0 && - ntohs(get_u_int16_t(packet->payload, 10)) == 0 && - packet->payload_packet_len >= 14 && ntohs(get_u_int16_t(packet->payload, 12)) <= NDPI_MAX_DNS_REQUESTS)) { - - NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "found DNS.\n"); - - ndpi_int_dns_add_connection(ndpi_struct, flow); - return; - } - } - - NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n"); - NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS); - + NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "search DNS.\n"); + + if (packet->udp != NULL) { + sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest); + NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "calculated dport over UDP.\n"); + } else if(packet->tcp != NULL) { + sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest); + NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "calculated dport over tcp.\n"); + } + + if((dport == 53) \|\| (sport == 53) + && (packet->payload_packet_len > sizeof(struct dns_packet_header))) { + struct dns_packet_header header, dns = (struct dns_packet_header)&packet->payload[packet->tcp ? 2 : 0]; + u_int8_t is_query, ret_code, standard_query, is_dns = 0; + + header.flags = ntohs(dns->flags); + header.transaction_id = ntohs(dns->transaction_id); + header.num_queries = ntohs(dns->num_queries); + header.answer_rrs = ntohs(dns->answer_rrs); + header.authority_rrs = ntohs(dns->authority_rrs); + header.additional_rrs = ntohs(dns->additional_rrs); + is_query = (header.flags & 0x8000) ? 0 : 1; + ret_code = is_query ? 0 : (header.flags & 0x0F); + + if(is_query) { + / DNS Request / + if((header.num_queries > 0) && (header.num_queries <= NDPI_MAX_DNS_REQUESTS) + && (header.answer_rrs == 0) + && (header.authority_rrs == 0)) { + / This is a good query / + is_dns = 1; + } + } else { + / DNS Reply / + if((header.num_queries <= NDPI_MAX_DNS_REQUESTS) / Don't assume that num_queries must be zero / + && (((header.answer_rrs > 0) && (header.answer_rrs <= NDPI_MAX_DNS_REQUESTS)) + \|\| ((header.authority_rrs > 0) && (header.authority_rrs <= NDPI_MAX_DNS_REQUESTS)) + \|\| ((header.additional_rrs > 0) && (header.additional_rrs <= NDPI_MAX_DNS_REQUESTS))) + ) { + / This is a good reply / + is_dns = 1; + } + + if((header.num_queries <= NDPI_MAX_DNS_REQUESTS) + && ((header.answer_rrs == 0) + \|\| (header.authority_rrs == 0) + \|\| (header.additional_rrs == 0)) + && (ret_code != 0 / 0 == OK /) + ) { + / This is a good reply */ + is_dns = 1; + } + + } + + if(is_dns) { + NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "found DNS.\n"); + ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_DNS, NDPI_REAL_PROTOCOL); + } else { + NDPI_LOG(NDPI_PROTOCOL_DNS, ndpi_struct, NDPI_LOG_DEBUG, "exclude DNS.\n"); + NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_DNS); + } + } } #endif
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/sip.c ^
@@ -84,21 +84,52 @@ ndpi_int_sip_add_connection(ndpi_struct, flow, 0); return; } + if ((memcmp(packet_payload, "INVITE ", 7) == 0 \|\| memcmp(packet_payload, "invite ", 7) == 0) && (memcmp(&packet_payload[7], "SIP:", 4) == 0 \|\| memcmp(&packet_payload[7], "sip:", 4) == 0)) { NDPI_LOG(NDPI_PROTOCOL_SIP, ndpi_struct, NDPI_LOG_DEBUG, "found sip INVITE.\n"); ndpi_int_sip_add_connection(ndpi_struct, flow, 0); return; } + /* seen this in second direction on the third position, * maybe it could be deleted, if somebody sees it in the first direction, * please delete this comment. / + + / if (memcmp(packet_payload, "SIP/2.0 200 OK", 14) == 0 \|\| memcmp(packet_payload, "sip/2.0 200 OK", 14) == 0) { NDPI_LOG(NDPI_PROTOCOL_SIP, ndpi_struct, NDPI_LOG_DEBUG, "found sip SIP/2.0 0K.\n"); ndpi_int_sip_add_connection(ndpi_struct, flow, 0); return; } + / + if (memcmp(packet_payload, "SIP/2.0 ", 8) == 0 \|\| memcmp(packet_payload, "sip/2.0 ", 8) == 0) { + NDPI_LOG(NDPI_PROTOCOL_SIP, ndpi_struct, NDPI_LOG_DEBUG, "found sip SIP/2.0 .\n"); + ndpi_int_sip_add_connection(ndpi_struct, flow, 0); + return; + } + + if ((memcmp(packet_payload, "BYE ", 4) == 0 \|\| memcmp(packet_payload, "bye ", 4) == 0) + && (memcmp(&packet_payload[4], "SIP:", 4) == 0 \|\| memcmp(&packet_payload[4], "sip:", 4) == 0)) { + NDPI_LOG(NDPI_PROTOCOL_SIP, ndpi_struct, NDPI_LOG_DEBUG, "found sip BYE.\n"); + ndpi_int_sip_add_connection(ndpi_struct, flow, 0); + return; + } + + if ((memcmp(packet_payload, "ACK ", 4) == 0 \|\| memcmp(packet_payload, "ack ", 4) == 0) + && (memcmp(&packet_payload[4], "SIP:", 4) == 0 \|\| memcmp(&packet_payload[4], "sip:", 4) == 0)) { + NDPI_LOG(NDPI_PROTOCOL_SIP, ndpi_struct, NDPI_LOG_DEBUG, "found sip ACK.\n"); + ndpi_int_sip_add_connection(ndpi_struct, flow, 0); + return; + } + + if ((memcmp(packet_payload, "CANCEL ", 7) == 0 \|\| memcmp(packet_payload, "cancel ", 7) == 0) + && (memcmp(&packet_payload[4], "SIP:", 7) == 0 \|\| memcmp(&packet_payload[4], "sip:", 7) == 0)) { + NDPI_LOG(NDPI_PROTOCOL_SIP, ndpi_struct, NDPI_LOG_DEBUG, "found sip CANCEL.\n"); + ndpi_int_sip_add_connection(ndpi_struct, flow, 0); + return; + } /* Courtesy of Miguel Quesada <mquesadab@gmail.com> */ if ((memcmp(packet_payload, "OPTIONS ", 8) == 0
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/ssl.c ^
@@ -188,11 +188,13 @@ int sslDetectProtocolFromCertificate(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow) { struct ndpi_packet_struct packet = &flow->packet; + if(!packet->iph / IPv4 /) return; + if((packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) \|\| (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL)) { char certificate[64]; int rc = getSSLcertificate(ndpi_struct, flow, certificate, sizeof(certificate)); - + if(rc > 0) { / printf("***** [SSL] %s\n", certificate); / if(matchStringProtocol(ndpi_struct, flow, certificate, strlen(certificate)) != -1) @@ -293,54 +295,56 @@ sslDetectProtocolFromCertificate(ndpi_struct, flow); - if((packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) - \|\| (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL)) { - / - Citrix GotoMeeting (AS16815, AS21866) - 216.115.208.0/20 - 216.219.112.0/20 - / - - / printf("[SSL] %08X / %08X\n", ntohl(packet->iph->saddr) , ntohl(packet->iph->daddr)); / - - if(((ntohl(packet->iph->saddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD873D000 / 216.115.208.0 /) - \|\| ((ntohl(packet->iph->daddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD873D000 / 216.115.208.0 /) - - \|\| ((ntohl(packet->iph->saddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD8DB7000 / 216.219.112.0 /) - \|\| ((ntohl(packet->iph->daddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD8DB7000 / 216.219.112.0 /) - ) { - ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_CITRIX_ONLINE, NDPI_REAL_PROTOCOL); - return; - } + if(packet->iph / IPv4 Only: we need to support packet->iphv6 at some point /) { + if((packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) + \|\| (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_SSL)) { + / + Citrix GotoMeeting (AS16815, AS21866) + 216.115.208.0/20 + 216.219.112.0/20 + / + + / printf("[SSL] %08X / %08X\n", ntohl(packet->iph->saddr) , ntohl(packet->iph->daddr)); / + + if(((ntohl(packet->iph->saddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD873D000 / 216.115.208.0 /) + \|\| ((ntohl(packet->iph->daddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD873D000 / 216.115.208.0 /) + + \|\| ((ntohl(packet->iph->saddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD8DB7000 / 216.219.112.0 /) + \|\| ((ntohl(packet->iph->daddr) & 0xFFFFF000 / 255.255.240.0 /) == 0xD8DB7000 / 216.219.112.0 /) + ) { + ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_CITRIX_ONLINE, NDPI_REAL_PROTOCOL); + return; + } - / - Apple (FaceTime, iMessage,...) - 17.0.0.0/8 - / - if(((ntohl(packet->iph->saddr) & 0xFF000000 / 255.0.0.0 /) == 0x11000000 / 17.0.0.0 /) - \|\| ((ntohl(packet->iph->daddr) & 0xFF000000 / 255.0.0.0 /) == 0x11000000 / 17.0.0.0 /)) { - ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_APPLE, NDPI_REAL_PROTOCOL); - return; - } + / + Apple (FaceTime, iMessage,...) + 17.0.0.0/8 + / + if(((ntohl(packet->iph->saddr) & 0xFF000000 / 255.0.0.0 /) == 0x11000000 / 17.0.0.0 /) + \|\| ((ntohl(packet->iph->daddr) & 0xFF000000 / 255.0.0.0 /) == 0x11000000 / 17.0.0.0 /)) { + ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_APPLE, NDPI_REAL_PROTOCOL); + return; + } - / - Webex - 66.114.160.0/20 - / - if(((ntohl(packet->iph->saddr) & 0xFFFFF000 / 255.255.240.0 /) == 0x4272A000 / 66.114.160.0 /) - \|\| ((ntohl(packet->iph->daddr) & 0xFFFFF000 / 255.255.240.0 /) ==0x4272A000 / 66.114.160.0 /)) { - ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_WEBEX, NDPI_REAL_PROTOCOL); - return; - } + / + Webex + 66.114.160.0/20 + / + if(((ntohl(packet->iph->saddr) & 0xFFFFF000 / 255.255.240.0 /) == 0x4272A000 / 66.114.160.0 /) + \|\| ((ntohl(packet->iph->daddr) & 0xFFFFF000 / 255.255.240.0 /) ==0x4272A000 / 66.114.160.0 /)) { + ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_WEBEX, NDPI_REAL_PROTOCOL); + return; + } - / - Google - 173.194.0.0/16 - / - if(((ntohl(packet->iph->saddr) & 0xFFFF0000 / 255.255.0.0 /) == 0xADC20000 / 66.114.160.0 /) - \|\| ((ntohl(packet->iph->daddr) & 0xFFFF0000 / 255.255.0.0 /) ==0xDC20000 / 66.114.160.0 /)) { - ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_GOOGLE, NDPI_REAL_PROTOCOL); - return; + / + Google + 173.194.0.0/16 + / + if(((ntohl(packet->iph->saddr) & 0xFFFF0000 / 255.255.0.0 /) == 0xADC20000 / 66.114.160.0 /) + \|\| ((ntohl(packet->iph->daddr) & 0xFFFF0000 / 255.255.0.0 /) ==0xDC20000 / 66.114.160.0 */)) { + ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_GOOGLE, NDPI_REAL_PROTOCOL); + return; + } } }
	Added	nprobe_6.9.11_120912_svn2881_proplugins.tgz ^