Changes - j0ke.net Open Build Service

Changes of Revision 74

[-] [+]	Changed	nprobe.changes
@@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Sun Jun 9 09:57:10 UTC 2013 - cs@linux-administrator.com + +- update to release 6.13.130602_svn3472 +- update nDPI to current svn +- update PF_RING to 5.6.0 +- update GeoIP ASnum data +- update GeoIP ASnum v6 data +- update GeoIP City data + +------------------------------------------------------------------- Thu Apr 4 13:24:42 UTC 2013 - cs@linux-administrator.com - update to release 6.12.130327_svn3352
[-] [+]	Changed	nprobe.spec ^
@@ -1,10 +1,10 @@ #!BuildIgnore: post-build-checks %define _default_patch_fuzz 3 -%define reldate 130327_svn3352 +%define reldate 130602_svn3472 %define sodate %(date +%%y%%m%%d) -%define pfringver 5.5.2-svn +%define pfringver 5.6.0 Name: nprobe -Version: 6.12 +Version: 6.13 Release: 1 Group: System Summary: Netflow Probe
[-] [+]	Added	nprobe-6.13-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.13-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	GeoLiteCity.dat.gz ^
	Added	PF_RING-5.6.0.tar.bz2 ^
[-] [+]	Changed	nDPI.tar.bz2/configure ^
@@ -1,9 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nDPI 1.4.0. +# Generated by GNU Autoconf 2.68 for nDPI 1.4.0. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -132,31 +134,6 @@ # 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 @@ -190,8 +167,7 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 \|\| exit 1 -test -x / \|\| exit 1" +test x\$exitcode = x0 \|\| 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'\" && @@ -244,25 +220,21 @@ if test "x$CONFIG_SHELL" != x; then : - 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 + # 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+"$@"} fi if test x$as_have_required = xno; then : @@ -364,14 +336,6 @@ } # 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 @@ -493,10 +457,6 @@ 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). @@ -531,16 +491,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -552,8 +512,28 @@ as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +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 # 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'" @@ -1217,6 +1197,8 @@ 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 @@ -1476,9 +1458,9 @@ if $ac_init_version; then cat <<\_ACEOF nDPI configure 1.4.0 -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1554,7 +1536,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes \|\| - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -1841,7 +1823,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.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2258,7 +2240,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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. @@ -2442,7 +2424,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -2482,7 +2464,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -2533,7 +2515,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" \|\| continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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) '* \| \ @@ -2580,7 +2562,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -2963,7 +2945,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3003,7 +2985,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3056,7 +3038,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3097,7 +3079,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3155,7 +3137,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3199,7 +3181,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3645,7 +3627,8 @@ /* end confdefs.h. / #include <stdarg.h> #include <stdio.h> -struct stat; +#include <sys/types.h> +#include <sys/stat.h> / 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); @@ -3880,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" - as_fn_executable_p "$ac_path_SED" \|\| continue + { test -f "$ac_path_SED" && $as_test_x "$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 @@ -3956,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" - as_fn_executable_p "$ac_path_GREP" \|\| continue + { test -f "$ac_path_GREP" && $as_test_x "$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 @@ -4022,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" - as_fn_executable_p "$ac_path_EGREP" \|\| continue + { test -f "$ac_path_EGREP" && $as_test_x "$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 @@ -4089,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" - as_fn_executable_p "$ac_path_FGREP" \|\| continue + { test -f "$ac_path_FGREP" && $as_test_x "$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 @@ -4345,7 +4328,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4389,7 +4372,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4813,7 +4796,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4853,7 +4836,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5159,7 +5142,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5199,7 +5182,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5303,7 +5286,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5347,7 +5330,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5472,7 +5455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5512,7 +5495,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5571,7 +5554,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -5611,7 +5594,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6260,7 +6243,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6300,7 +6283,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6380,7 +6363,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6420,7 +6403,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6472,7 +6455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6512,7 +6495,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6564,7 +6547,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6604,7 +6587,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6656,7 +6639,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6696,7 +6679,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6748,7 +6731,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -6788,7 +6771,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -11298,7 +11281,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -11338,7 +11321,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -11391,7 +11374,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -11432,7 +11415,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -11490,7 +11473,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -11534,7 +11517,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -11730,7 +11713,8 @@ / end confdefs.h. / #include <stdarg.h> #include <stdio.h> -struct stat; +#include <sys/types.h> +#include <sys/stat.h> / 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); @@ -12434,16 +12418,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\| - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -12503,16 +12487,28 @@ as_mkdir_p=false fi - -# 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 +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 # 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'" @@ -12534,7 +12530,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.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12591,10 +12587,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.69, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -12674,7 +12670,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'
[-] [+]	Added	nDPI.tar.bz2/example/Win32 ^
+(directory)
[-] [+]	Added	nDPI.tar.bz2/example/Win32/Debug ^
+(directory)
[-] [+]	Added	nDPI.tar.bz2/example/Win32/pcapExample ^
+(directory)
[-] [+]	Added	nDPI.tar.bz2/example/Win32/pcapExample.sln ^
@@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcapExample", "pcapExample\pcapExample.vcxproj", "{F6A2C0AE-2110-438A-87E4-7C1CFCE064C6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug\|Win32 = Debug\|Win32 + Release\|Win32 = Release\|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F6A2C0AE-2110-438A-87E4-7C1CFCE064C6}.Debug\|Win32.ActiveCfg = Debug\|Win32 + {F6A2C0AE-2110-438A-87E4-7C1CFCE064C6}.Debug\|Win32.Build.0 = Debug\|Win32 + {F6A2C0AE-2110-438A-87E4-7C1CFCE064C6}.Release\|Win32.ActiveCfg = Release\|Win32 + {F6A2C0AE-2110-438A-87E4-7C1CFCE064C6}.Release\|Win32.Build.0 = Release\|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal
	Added	nDPI.tar.bz2/example/Win32/pcapExample.suo ^
[-] [+]	Added	nDPI.tar.bz2/example/Win32/pcapExample/Debug ^
+(directory)
[-] [+]	Added	nDPI.tar.bz2/example/Win32/pcapExample/pcapExample.cpp ^
@@ -0,0 +1,11 @@ +// pcapExample.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" + + +int _tmain(int argc, _TCHAR* argv[]) +{ + return 0; +} +
[-] [+]	Added	nDPI.tar.bz2/example/Win32/pcapExample/pcapExample.vcxproj ^
@@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug\|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release\|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{F6A2C0AE-2110-438A-87E4-7C1CFCE064C6}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>pcapExample</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>C:\ntop\nprobe\nprobe-win-32;C:\ntop\winpcap\Include;C:\ntop\dependencies\nDPI\src\lib\third_party\include;C:\ntop\dependencies\nDPI\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>Wsock32.lib;Ws2_32.lib;C:\ntop\winpcap\Lib\Packet.lib;C:\ntop\winpcap\Lib\wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>Use</PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\..\nprobe\nprobe-win-32\getopt.c" /> + <ClCompile Include="..\..\..\..\..\nprobe\nprobe-win-32\getopt1.c" /> + <ClCompile Include="..\..\..\src\lib\ndpi_main.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\afp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\aimini.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\applejuice.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\armagetron.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\battlefield.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\bgp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\bittorrent.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ciscovpn.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\citrix.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\corba.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\crossfire.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\dcerpc.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\dhcp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\dhcpv6.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\directconnect.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\directdownloadlink.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\dns.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\dofus.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\dropbox.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\edonkey.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\fasttrack.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\feidian.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\fiesta.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\filetopia.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\flash.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\florensia.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ftp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\gadu_gadu.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\gnutella.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\gtp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\guildwars.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\h323.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\halflife2_and_mods.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\http.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\http_activesync.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\i23v5.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\iax.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\icecast.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\imesh.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ipp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\irc.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\jabber.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\kerberos.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\kontiki.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ldap.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\lotus_notes.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mail_imap.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mail_pop.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mail_smtp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\maplestory.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mdns.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\meebo.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mgcp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mms.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\msn.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mssql.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\mysql.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\netbios.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\netflow.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\nfs.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\noe.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\non_tcp_udp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ntp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\openft.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\openvpn.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\oracle.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\oscar.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\pando.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\pcanywhere.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\popo.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\postgres.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\pplive.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ppstream.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\pptp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\qq.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\quake.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\radius.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\rdp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\rsync.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\rtcp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\rtp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\rtsp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\sflow.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\shoutcast.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\sip.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\skinny.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\skype.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\smb.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\snmp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\socrates.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\sopcast.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\soulseek.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\spotify.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ssdp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ssh.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\ssl.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\stealthnet.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\steam.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\stun.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\syslog.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\tcp_udp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\tds.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\teamspeak.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\teamviewer.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\telnet.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\tftp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\thunder.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\tor.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\tvants.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\tvuplayer.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\usenet.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\veohtv.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\viber.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\vmware.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\vnc.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\warcraft3.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\winmx.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\world_of_kung_fu.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\world_of_warcraft.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\xbox.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\xdmcp.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\yahoo.c" /> + <ClCompile Include="..\..\..\src\lib\protocols\zattoo.c" /> + <ClCompile Include="..\..\..\src\lib\third_party\src\ahocorasick.c" /> + <ClCompile Include="..\..\..\src\lib\third_party\src\node.c" /> + <ClCompile Include="..\..\..\src\lib\third_party\src\sort.c" /> + <ClCompile Include="..\..\pcapReader.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\..\nprobe\nprobe-win-32\getopt.h" /> + <ClInclude Include="..\..\..\src\include\linux_compat.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_api.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_debug_functions.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_define.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_macros.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_main.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_protocols.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_protocols_osdpi.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_protocol_history.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_public_functions.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_structs.h" /> + <ClInclude Include="..\..\..\src\include\ndpi_utils.h" /> + <ClInclude Include="..\..\..\src\lib\third_party\include\actypes.h" /> + <ClInclude Include="..\..\..\src\lib\third_party\include\ahocorasick.h" /> + <ClInclude Include="..\..\..\src\lib\third_party\include\node.h" /> + <ClInclude Include="..\..\..\src\lib\third_party\include\sort.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file
[-] [+]	Added	nDPI.tar.bz2/example/Win32/pcapExample/pcapExample.vcxproj.filters ^
@@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\pcapReader.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\ndpi_main.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\zattoo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\afp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\aimini.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\applejuice.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\armagetron.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\battlefield.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\bgp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\bittorrent.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ciscovpn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\citrix.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\corba.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\crossfire.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\dcerpc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\dhcp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\dhcpv6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\directconnect.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\directdownloadlink.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\dns.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\dofus.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\dropbox.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\edonkey.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\fasttrack.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\feidian.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\fiesta.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\filetopia.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\flash.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\florensia.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ftp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\gadu_gadu.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\gnutella.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\gtp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\guildwars.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\h323.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\halflife2_and_mods.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\http.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\http_activesync.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\i23v5.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\iax.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\icecast.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\imesh.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ipp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\irc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\jabber.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\kerberos.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\kontiki.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ldap.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\lotus_notes.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mail_imap.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mail_pop.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mail_smtp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\maplestory.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mdns.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\meebo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mgcp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mms.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\msn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mssql.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\mysql.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\netbios.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\netflow.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\nfs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\noe.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\non_tcp_udp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ntp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\openft.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\openvpn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\oracle.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\oscar.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\pando.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\pcanywhere.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\popo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\postgres.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\pplive.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ppstream.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\pptp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\qq.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\quake.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\radius.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\rdp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\rsync.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\rtcp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\rtp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\rtsp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\sflow.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\shoutcast.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\sip.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\skinny.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\skype.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\smb.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\snmp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\socrates.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\sopcast.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\soulseek.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\spotify.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ssdp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ssh.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\ssl.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\stealthnet.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\steam.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\stun.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\syslog.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\tcp_udp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\tds.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\teamspeak.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\teamviewer.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\telnet.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\tftp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\thunder.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\tor.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\tvants.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\tvuplayer.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\usenet.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\veohtv.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\viber.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\vmware.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\vnc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\warcraft3.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\winmx.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\world_of_kung_fu.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\world_of_warcraft.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\xbox.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\xdmcp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\protocols\yahoo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\third_party\src\ahocorasick.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\third_party\src\node.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\lib\third_party\src\sort.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\..\nprobe\nprobe-win-32\getopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\..\nprobe\nprobe-win-32\getopt1.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\lib\third_party\include\actypes.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\lib\third_party\include\ahocorasick.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\lib\third_party\include\node.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\lib\third_party\include\sort.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_api.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_debug_functions.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_define.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_macros.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_main.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_protocol_history.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_protocols.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_protocols_osdpi.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_public_functions.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_structs.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\ndpi_utils.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\include\linux_compat.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\..\nprobe\nprobe-win-32\getopt.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file
[-] [+]	Added	nDPI.tar.bz2/example/Win32/pcapExample/pcapExample.vcxproj.user ^
@@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</Project> \ No newline at end of file
[-] [+]	Changed	nDPI.tar.bz2/example/pcapReader.c ^
@@ -21,10 +21,18 @@ #include <stdio.h> #include <stdlib.h> +#ifdef WIN32 +#include <winsock2.h> /* winsock.h is included automatically / +#include <process.h> +#include <io.h> +#include <getopt.h> +#define getopt getopt____ +#else #include <unistd.h> +#include <netinet/in.h> +#endif #include <string.h> #include <stdarg.h> -#include <netinet/in.h> #include <search.h> #include <pcap.h> #include <signal.h> @@ -261,27 +269,26 @@ flow->packets, flow->bytes); } -static void node_print_unknown_proto_walker(const void node, ndpi_VISIT which, int depth) { +static void node_print_unknown_proto_walker(const void node, ndpi_VISIT which, int depth, void user_data) { struct ndpi_flow flow = (struct ndpi_flow*)node; if (flow->detected_protocol != 0 / UNKNOWN /) return; - if((which == preorder) \|\| (which == leaf)) / Avoid walking the same node multiple times / + if((which == ndpi_preorder) \|\| (which == ndpi_leaf)) / Avoid walking the same node multiple times / printFlow(flow); } -static void node_print_known_proto_walker(const void node, ndpi_VISIT which, int depth) { +static void node_print_known_proto_walker(const void node, ndpi_VISIT which, int depth, void user_data) { struct ndpi_flow flow = (struct ndpi_flow*)node; if (flow->detected_protocol == 0 / UNKNOWN /) return; - if((which == preorder) \|\| (which == leaf)) / Avoid walking the same node multiple times / + if((which == ndpi_preorder) \|\| (which == ndpi_leaf)) / Avoid walking the same node multiple times / printFlow(flow); } -static void node_proto_guess_walker(const void node, ndpi_VISIT which, int depth) { +static void node_proto_guess_walker(const void node, ndpi_VISIT which, int depth, void user_data) { struct ndpi_flow flow = (struct ndpi_flow*)node; - char buf1[32], buf2[32]; #if 0 printf("<%d>Walk on node %s (%p)\n", @@ -293,7 +300,7 @@ flow); #endif - if((which == preorder) \|\| (which == leaf)) { / Avoid walking the same node multiple times / + if((which == ndpi_preorder) \|\| (which == ndpi_leaf)) { / Avoid walking the same node multiple times / if(enable_protocol_guess) { if (flow->detected_protocol == 0 / UNKNOWN /) { flow->detected_protocol = ndpi_guess_undetected_protocol(ndpi_struct, @@ -334,7 +341,7 @@ struct ndpi_id_struct src, struct ndpi_id_struct dst) { - u_int32_t i, idx; + u_int32_t idx; u_int16_t l4_packet_len; struct ndpi_tcphdr tcph = NULL; struct ndpi_udphdr udph = NULL; @@ -453,7 +460,6 @@ static void setupDetection(void) { - u_int32_t i; NDPI_PROTOCOL_BITMASK all; // init global detection structure @@ -521,7 +527,7 @@ ndpi_flow = flow->ndpi_flow; flow->packets++, flow->bytes += rawsize; } else - return; + return(0); ip_packet_count++; total_bytes += rawsize + 24 / CRC etc /; @@ -531,7 +537,7 @@ // only handle unfragmented packets if ((frag_off & 0x3FFF) == 0) { // here the actual detection is performed - protocol = ndpi_detection_process_packet(ndpi_struct, ndpi_flow, (uint8_t ) iph, ipsize, time, src, dst); + protocol = (const u_int32_t)ndpi_detection_process_packet(ndpi_struct, ndpi_flow, (uint8_t ) iph, ipsize, time, src, dst); } else { static u_int8_t frag_warning_used = 0; @@ -627,7 +633,7 @@ static void printResults(u_int64_t tot_usec) { - u_int32_t i, j; + u_int32_t i; printf("\x1b[2K\n"); printf("pcap file contains\n"); @@ -647,7 +653,7 @@ } for(i=0; i<NUM_ROOTS; i++) - ndpi_twalk(ndpi_flows_root[i], node_proto_guess_walker); + ndpi_twalk(ndpi_flows_root[i], node_proto_guess_walker, NULL); if(enable_protocol_guess) printf("\tGuessed flow protocols: \x1b[35m%-13u\x1b[0m\n", guessed_flow_protocols); @@ -666,11 +672,11 @@ printf("\n"); for(i=0; i<NUM_ROOTS; i++) - ndpi_twalk(ndpi_flows_root[i], node_print_known_proto_walker); + ndpi_twalk(ndpi_flows_root[i], node_print_known_proto_walker, NULL); printf("\n\nUndetected flows:\n"); for(i=0; i<NUM_ROOTS; i++) - ndpi_twalk(ndpi_flows_root[i], node_print_unknown_proto_walker); + ndpi_twalk(ndpi_flows_root[i], node_print_unknown_proto_walker, NULL); } printf("\n\n"); @@ -732,8 +738,10 @@ if(capture_until > 0) { printf("Capturing traffic up to %u seconds\n", (unsigned int)capture_until); +#ifndef WIN32 alarm(capture_until); signal(SIGALRM, sigproc); +#endif capture_until += time(NULL); } } @@ -881,3 +889,60 @@ return 0; } + + +/ ****************************************************** / + +#ifdef WIN32 +#ifndef __GNUC__ +#define EPOCHFILETIME (116444736000000000i64) +#else +#define EPOCHFILETIME (116444736000000000LL) +#endif + +struct timezone { + int tz_minuteswest; / minutes W of Greenwich / + int tz_dsttime; / type of dst correction / +}; + +#if 0 +int gettimeofday(struct timeval tv, void notUsed) { + tv->tv_sec = time(NULL); + tv->tv_usec = 0; + return(0); +} +#endif + +int gettimeofday(struct timeval tv, struct timezone tz) +{ + FILETIME ft; + LARGE_INTEGER li; + __int64 t; + static int tzflag; + + if (tv) + { + GetSystemTimeAsFileTime(&ft); + li.LowPart = ft.dwLowDateTime; + li.HighPart = ft.dwHighDateTime; + t = li.QuadPart; / In 100-nanosecond intervals / + t -= EPOCHFILETIME; / Offset to the Epoch time / + t /= 10; / In microseconds / + tv->tv_sec = (long)(t / 1000000); + tv->tv_usec = (long)(t % 1000000); + } + + if (tz) + { + if (!tzflag) + { + _tzset(); + tzflag++; + } + tz->tz_minuteswest = _timezone / 60; + tz->tz_dsttime = _daylight; + } + + return 0; +} +#endif / WIN32 */
[-] [+]	Changed	nDPI.tar.bz2/src/include/linux_compat.h ^
@@ -38,11 +38,21 @@ #endif #endif +#pragma pack(push) /* push current alignment to stack / +#pragma pack(1) / set alignment to 1 byte boundary / + +#pragma pack(pop) / restore original alignment from stack / + struct ndpi_ethhdr { u_char h_dest[6]; / destination eth addr / u_char h_source[6]; / source ether addr / u_int16_t h_proto; / packet type ID field */ -} __attribute__((packed)); +}; + +struct ndpi_80211q { + u_int16_t vlanId; + u_int16_t protoType; +}; struct ndpi_iphdr { #if defined(__LITTLE_ENDIAN__)
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_main.h ^
@@ -60,6 +60,15 @@ #endif #ifdef WIN32 +#include <Winsock2.h> /* winsock.h is included automatically / +#include <process.h> +#include <io.h> +#include <getopt.h> / getopt from: http://www.pwilson.net/sample.html. / +#include <process.h> / for getpid() and the exec..() family / + + +#define snprintf _snprintf + #define __attribute__(x) typedef char int8_t; typedef unsigned char u_int8_t; @@ -108,7 +117,7 @@ int ()(const void , const void )); void ndpi_tfind(const void , void , int ()(const void , const void )); void ndpi_tsearch(const void , void*, int ()(const void , const void )); -void ndpi_twalk(const void , void ()(const void , ndpi_VISIT, int)); +void ndpi_twalk(const void , void ()(const void , ndpi_VISIT, int, void), void user_data); void ndpi_tdestroy(void vrootp, void (freefct)(void *));
[-] [+]	Changed	nDPI.tar.bz2/src/include/ndpi_structs.h ^
@@ -649,7 +649,7 @@ struct ndpi_flow_udp_struct udp; } l4; - u_char host_server_name[64]; /* HTTP host or DNS query / + u_char host_server_name[256]; / HTTP host or DNS query / / ALL protocol specific 64 bit variables here */
[-] [+]	Changed	nDPI.tar.bz2/src/lib/ndpi_main.c ^
@@ -36,6 +36,8 @@ #ifdef __KERNEL__ #define printf printk +#else +#include <time.h> #endif typedef struct { @@ -123,29 +125,29 @@ /* Walk the nodes of a tree / static void -trecurse(ndpi_node root, void (action)(const void , ndpi_VISIT, int), int level) +ndpi_trecurse(ndpi_node root, void (action)(const void , ndpi_VISIT, int, void), int level, void user_data) { if (root->left == (ndpi_node )0 && root->right == (ndpi_node )0) - (action)(root, ndpi_leaf, level); + (action)(root, ndpi_leaf, level, user_data); else { - (action)(root, ndpi_preorder, level); + (action)(root, ndpi_preorder, level, user_data); if (root->left != (ndpi_node )0) - trecurse(root->left, action, level + 1); - (action)(root, ndpi_postorder, level); + ndpi_trecurse(root->left, action, level + 1, user_data); + (action)(root, ndpi_postorder, level, user_data); if (root->right != (ndpi_node )0) - trecurse(root->right, action, level + 1); - (action)(root, ndpi_endorder, level); + ndpi_trecurse(root->right, action, level + 1, user_data); + (action)(root, ndpi_endorder, level, user_data); } } / Walk the nodes of a tree / void -ndpi_twalk(const void vroot, void (action)(const void , ndpi_VISIT, int)) +ndpi_twalk(const void vroot, void (action)(const void , ndpi_VISIT, int, void ), void user_data) { ndpi_node root = (ndpi_node )vroot; - if (root != (ndpi_node )0 && action != (void ()(const void , ndpi_VISIT, int))0) - trecurse(root, action, 0); + if (root != (ndpi_node )0 && action != (void ()(const void , ndpi_VISIT, int, void))0) + ndpi_trecurse(root, action, 0, user_data); } /* find a node, or return 0 / @@ -1284,9 +1286,9 @@ #if 0 printf("\nTCP:\n"); - ndpi_twalk(tcpRoot, ndpi_default_ports_tree_node_t_walker); + ndpi_twalk(tcpRoot, ndpi_default_ports_tree_node_t_walker, NULL); printf("\nUDP:\n"); - ndpi_twalk(udpRoot, ndpi_default_ports_tree_node_t_walker); + ndpi_twalk(udpRoot, ndpi_default_ports_tree_node_t_walker, NULL); #endif #endif @@ -4651,7 +4653,7 @@ new_is_real = (packet->protocol_stack_info.entry_is_real_protocol & (~preserve_bitmask)) << 1; new_is_real \|= packet->protocol_stack_info.entry_is_real_protocol & preserve_bitmask; - packet->protocol_stack_info.entry_is_real_protocol = new_is_real; + packet->protocol_stack_info.entry_is_real_protocol = (u_int8_t)new_is_real; / now set the new protocol / @@ -5027,7 +5029,7 @@ struct ndpi_packet_struct packet = &flow->packet; AC_TEXT_t ac_input_text; - if(ndpi_struct->ac_automa == NULL) return(NDPI_PROTOCOL_UNKNOWN); + if((ndpi_struct->ac_automa == NULL) \|\| (string_to_match_len== 0)) return(NDPI_PROTOCOL_UNKNOWN); if(!ndpi_struct->ac_automa_finalized) { ac_automata_finalize((AC_AUTOMATA_t*)ndpi_struct->ac_automa); @@ -5065,3 +5067,6 @@ return(NDPI_PROTOCOL_UNKNOWN); } + + +
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/bittorrent.c ^
@@ -41,7 +41,7 @@ ndpi_struct, struct ndpi_flow_struct flow) { struct ndpi_packet_struct packet = &flow->packet; - + // struct ndpi_id_struct src = flow->src; // struct ndpi_id_struct dst = flow->dst; @@ -347,7 +347,7 @@ { struct ndpi_packet_struct packet = &flow->packet; - + if (packet->payload_packet_len == 0) { return; } @@ -370,6 +370,12 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct ndpi_struct, struct ndpi_flow_struct flow) { struct ndpi_packet_struct packet = &flow->packet; + + / This is broadcast / + if(packet->iph + && ((packet->iph->saddr == 0xFFFFFFFF) \|\| (packet->iph->daddr == 0xFFFFFFFF))) + return; + if (packet->detected_protocol_stack[0] != NDPI_PROTOCOL_BITTORRENT) { / check for tcp retransmission here / @@ -378,12 +384,46 @@ ndpi_int_search_bittorrent_tcp(ndpi_struct, flow); } else if(packet->udp != NULL) { + / + Check for uTP http://www.bittorrent.org/beps/bep_0029.html + + wireshark/epan/dissectors/packet-bt-utp.c + / + + if(packet->payload_packet_len >= 23 / min header size /) { + / Check if this is protocol v0 / + u_int8_t v0_extension = packet->payload[17]; + u_int8_t v0_flags = packet->payload[18]; + + / Check if this is protocol v1 / + u_int8_t v1_version = packet->payload[0]; + u_int8_t v1_extension = packet->payload[1]; + + if(((v1_version & 0x0f) == 1) + && ((v1_version >> 4) < 6 / ST_NUM_STATES /) + && (v1_extension < 3 / EXT_NUM_EXT /)) { + goto bittorrent_found; + } else if((v0_flags < 6 / ST_NUM_STATES /) + && (v0_extension < 3 / EXT_NUM_EXT /)) { + u_int32_t ts, + // ts_usec, + now = (u_int32_t)time(NULL); + + ts = ntohl(((u_int32_t)&(packet->payload[4]))); + // ts_usec = ntohl(((u_int32_t)&(packet->payload[8]))); + + if((ts < (now+86400)) && (ts > (now-86400))) { + goto bittorrent_found; + } + } + } + flow->bittorrent_stage++; if(flow->bittorrent_stage < 10) { if(packet->payload_packet_len > 19 / min size /) { char begin; - + if(ndpi_strnstr(packet->payload, ":target20:", packet->payload_packet_len) \|\| ndpi_strnstr(packet->payload, ":find_node1:", packet->payload_packet_len) \|\| ndpi_strnstr(packet->payload, "d1:ad2:id20:", packet->payload_packet_len)) { @@ -396,7 +436,7 @@ return; } else if((begin = memchr(packet->payload, 'B', packet->payload_packet_len-19)) != NULL) { long offset = (u_long)begin - (u_long)packet->payload; - + if((packet->payload_packet_len-19) > offset) { if(memcmp(begin, "BitTorrent protocol", 19) == 0) { goto bittorrent_found;
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/dns.c ^
@@ -26,6 +26,65 @@ #ifdef NDPI_PROTOCOL_DNS +static u_int getNameLength(u_int i, const u_int8_t payload, u_int payloadLen) { + if(payload[i] == 0x00) + return(1); + else if(payload[i] == 0xC0) + return(2); + else { + u_int8_t len = payload[i]; + u_int8_t off = len + 1; + + if(off == 0) / Bad packet / + return(0); + else + return(off + getNameLength(i+off, payload, payloadLen)); + } +} + +/ *********************************************** / + +static char ndpi_intoa_v4(unsigned int addr, char* buf, u_short bufLen) { + char cp, retStr; + uint byte; + int n; + + cp = &buf[bufLen]; + --cp = '\0'; + + n = 4; + do { + byte = addr & 0xff; + --cp = byte % 10 + '0'; + byte /= 10; + if(byte > 0) { + --cp = byte % 10 + '0'; + byte /= 10; + if(byte > 0) + --cp = byte + '0'; + } + --cp = '.'; + addr >>= 8; + } while (--n > 0); + + / Convert the string to lowercase / + retStr = (char)(cp+1); + + return(retStr); +} + +/* *********************************************** / + +static u_int16_t get16(int i, const u_int8_t payload) { + u_int16_t v = (u_int16_t)&payload[i]; + + (i) += 2; + + return(ntohs(v)); +} + +/ *********************************************** / + struct dns_packet_header { u_int16_t transaction_id, flags, num_queries, answer_rrs, authority_rrs, additional_rrs; } __attribute__((packed)); @@ -52,7 +111,8 @@ int i = packet->tcp ? 2 : 0; struct dns_packet_header header, dns = (struct dns_packet_header)&packet->payload[i]; u_int8_t is_query, ret_code, is_dns = 0; - + u_int32_t a_record[NDPI_MAX_DNS_REQUESTS] = { 0 }, query_offset, num_a_records = 0; + header.flags = ntohs(dns->flags); header.transaction_id = ntohs(dns->transaction_id); header.num_queries = ntohs(dns->num_queries); @@ -61,6 +121,8 @@ header.additional_rrs = ntohs(dns->additional_rrs); is_query = (header.flags & 0x8000) ? 0 : 1; ret_code = is_query ? 0 : (header.flags & 0x0F); + i += sizeof(struct dns_packet_header); + query_offset = i; if(is_query) { / DNS Request / @@ -79,6 +141,64 @@ ) { / This is a good reply / is_dns = 1; + + i++; + + if(packet->payload[i] != '\0') { + while((i < packet->payload_packet_len) + && (packet->payload[i] != '\0')) { + i++; + } + + i++; + } + + i += 4; + + if(header.answer_rrs > 0) { + u_int16_t rsp_type, rsp_class; + u_int16_t num; + + for(num = 0; num < header.answer_rrs; num++) { + u_int16_t data_len; + + if((i+6) >= packet->payload_packet_len) { + break; + } + + if((data_len = getNameLength(i, packet->payload, packet->payload_packet_len)) == 0) { + break; + } else + i += data_len; + + rsp_type = get16(&i, packet->payload); + rsp_class = get16(&i, packet->payload); + + i += 4; + data_len = get16(&i, packet->payload); + + if((data_len <= 1) \|\| (data_len > (packet->payload_packet_len-i))) { + break; + } + + if(rsp_type == 1 / A /) { + if(data_len == 4) { + u_int32_t v = ntohl(((u_int32_t)&packet->payload[i])); + + if(num_a_records < (NDPI_MAX_DNS_REQUESTS-1)) + a_record[num_a_records++] = v; + else + break; / One record is enough / + } + } + + if(data_len == 0) { + break; + } + + i += data_len; + } / for / + } } if((header.num_queries <= NDPI_MAX_DNS_REQUESTS) @@ -98,9 +218,8 @@ u_int16_t query_type, query_class; #endif - i += sizeof(struct dns_packet_header); + i = query_offset+1; - i++; while((i < packet->payload_packet_len) && (j < (sizeof(flow->host_server_name)-1)) && (packet->payload[i] != '\0')) { @@ -110,8 +229,26 @@ j++, i++; } + if(a_record != 0) { + char a_buf[32]; + int i; + + for(i=0; i<num_a_records; i++) { + j += snprintf(&flow->host_server_name[j], sizeof(flow->host_server_name)-1-j, "%s%s", + (i == 0) ? "@" : ";", + ndpi_intoa_v4(a_record[i], a_buf, sizeof(a_buf))); + } + } + flow->host_server_name[j] = '\0'; + if(j > 0) { +#ifdef DEBUG + printf("==> %s\n", flow->host_server_name); +#endif + ndpi_match_string_subprotocol(ndpi_struct, flow, flow->host_server_name, strlen(flow->host_server_name)); + } + #ifdef DEBUG i++; memcpy(&query_type, &packet->payload[i], 2); query_type = ntohs(query_type), i += 2; @@ -120,8 +257,14 @@ printf("%s [type=%04X][class=%04X]\n", flow->host_server_name, query_type, query_class); #endif - 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); + if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) { + / + Do not set the protocol with DNS if ndpi_match_string_subprotocol() has + matched a subprotocol + */ + 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);
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/http.c ^
@@ -509,7 +509,8 @@ if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP) { /* Try matching subprotocols / - ndpi_match_string_subprotocol(ndpi_struct, flow, (char)packet->host_line.ptr, packet->host_line.len); + // ndpi_match_string_subprotocol(ndpi_struct, flow, (char)packet->host_line.ptr, packet->host_line.len); + ndpi_match_string_subprotocol(ndpi_struct, flow, flow->host_server_name, strlen(flow->host_server_name)); } } @@ -602,7 +603,7 @@ / Copy result for nDPI apps / len = ndpi_min(packet->host_line.len, sizeof(flow->host_server_name)-1); - strncpy(flow->host_server_name, packet->host_line.ptr, len); + strncpy((char)flow->host_server_name, (char*)packet->host_line.ptr, len); flow->host_server_name[len] = '\0'; parseHttpSubprotocol(ndpi_struct, flow);
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/postgres.c ^
@@ -97,7 +97,7 @@ ndpi_int_postgres_add_connection(ndpi_struct, flow); return; } - size = ntohl(get_u_int32_t(packet->payload, 1)) + 1; + size = (u_int16_t)ntohl(get_u_int32_t(packet->payload, 1)) + 1; if (packet->payload[size - 1] == 'S') { if ((size + get_u_int32_t(packet->payload, (size + 1))) == packet->payload_packet_len) { NDPI_LOG(NDPI_PROTOCOL_POSTGRES, ndpi_struct, NDPI_LOG_DEBUG, "found postgres asymmetrically.\n");
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/rtcp.c ^
@@ -38,10 +38,10 @@ } else if(packet->udp != NULL) { sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest); NDPI_LOG(NDPI_PROTOCOL_RTCP, ndpi_struct, NDPI_LOG_DEBUG, "calculating dport over udp.\n"); - if((packet->payload_packet_len >= 28 \|\| packet->payload_packet_len <= 1200) && - ((packet->payload[0] == 0x80) && ((packet->payload[1] == 0xc8) \|\| (packet->payload[1] == 0xc9)) && (packet->payload[2] == 0x00)) - \|\| ((packet->payload[0] == 0x81) && ((packet->payload[1] == 0xc8) \|\| (packet->payload[1] == 0xc9)) - && (packet->payload[2] == 0x00))) { + if(((packet->payload_packet_len >= 28 \|\| packet->payload_packet_len <= 1200) && + ((packet->payload[0] == 0x80) && ((packet->payload[1] == 0xc8) \|\| (packet->payload[1] == 0xc9)) && (packet->payload[2] == 0x00))) + \|\| (((packet->payload[0] == 0x81) && ((packet->payload[1] == 0xc8) \|\| (packet->payload[1] == 0xc9)) + && (packet->payload[2] == 0x00)))) { NDPI_LOG(NDPI_PROTOCOL_RTCP, ndpi_struct, NDPI_LOG_DEBUG, "found rtcp.\n"); ndpi_int_rtcp_add_connection(ndpi_struct, flow); }
[-] [+]	Changed	nDPI.tar.bz2/src/lib/protocols/skinny.c ^
@@ -43,16 +43,15 @@ if(packet->tcp != NULL) { sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest); NDPI_LOG(NDPI_PROTOCOL_SKINNY, ndpi_struct, NDPI_LOG_DEBUG, "calculating SKINNY over tcp.\n"); - if (dport == 2000 && (packet->payload_packet_len == 24 && - memcmp(&packet->payload[0], keypadmsg_8_bytes, 8) == 0) \|\| - (packet->payload_packet_len == 64 && - memcmp(&packet->payload[0], pattern_8_bytes, 8) == 0)) { + if (dport == 2000 && ((packet->payload_packet_len == 24 && + memcmp(&packet->payload[0], keypadmsg_8_bytes, 8) == 0) + \|\| ((packet->payload_packet_len == 64) && memcmp(&packet->payload[0], pattern_8_bytes, 8) == 0))) { NDPI_LOG(NDPI_PROTOCOL_SKINNY, ndpi_struct, NDPI_LOG_DEBUG, "found skinny.\n"); ndpi_int_skinny_add_connection(ndpi_struct, flow); - } else if (sport == 2000 && (packet->payload_packet_len == 28 && + } else if (sport == 2000 && ((packet->payload_packet_len == 28 && memcmp(&packet->payload[0], selectmsg_8_bytes, 8) == 0 ) \|\| (packet->payload_packet_len == 44 && - memcmp(&packet->payload[0], pattern_9_bytes, 9) == 0 )) { + memcmp(&packet->payload[0], pattern_9_bytes, 9) == 0))) { NDPI_LOG(NDPI_PROTOCOL_SKINNY, ndpi_struct, NDPI_LOG_DEBUG, "found skinny.\n"); ndpi_int_skinny_add_connection(ndpi_struct, flow); }
[-] [+]	Changed	nDPI.tar.bz2/src/lib/third_party/src/node.c ^
@@ -28,7 +28,7 @@ #include "ndpi_protocols.h" #include "ndpi_utils.h" -#include "node.h" +#include "../include/node.h" #include "sort.h" /* reallocation step for AC_NODE_t.matched_patterns */
	Added	nprobe_6.13.130602_svn3472_proplugins.tgz ^