From 164b27f0c908f203af585fcd999033b62ba54a22 Mon Sep 17 00:00:00 2001 From: sapanb Date: Mon, 14 Jan 2008 20:00:47 +0000 Subject: [PATCH] Decrease granularity to reduce the size of the dataset git-svn-id: http://svn.planet-lab.org/svn/fprobe-ulog/trunk@7792 8c455092-636d-4788-adf5-e71def0336e8 --- fprobe-initscript | 2 +- src/Makefile | 16 ++++++++-------- src/fprobe-ulog.c | 1 + src/fprobe-ulog.h | 2 +- src/libipulog/Makefile | 16 ++++++++-------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/fprobe-initscript b/fprobe-initscript index 6cbae79..17dc144 100644 --- a/fprobe-initscript +++ b/fprobe-initscript @@ -34,7 +34,7 @@ case "$1" in rm -f $pidfile fi - /sbin/fprobe-ulog -M -E 60 -T 168 -f pf2 -q 1000 -s 30 -D 250000 + /sbin/fprobe-ulog -M -e 3600 -d 3600 -E 60 -T 168 -f pf2 -q 1000 -s 30 -D 250000 sleep 1 cmd=success diff --git a/src/Makefile b/src/Makefile index ef3c21a..0b92877 100644 --- a/src/Makefile +++ b/src/Makefile @@ -79,13 +79,13 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run tar -AUTOCONF = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run autoconf -AUTOHEADER = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run autoheader -AUTOMAKE = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run automake-1.9 +AMTAR = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run tar +AUTOCONF = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run autoconf +AUTOHEADER = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run autoheader +AUTOMAKE = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run automake-1.9 AWK = gawk CC = gcc CCDEPMODE = depmode=none @@ -93,7 +93,7 @@ CFLAGS = -g -O2 -D_BSD_SOURCE -D_REENTRANT -DWALL -W -Wall CPP = gcc -E CPPFLAGS = CYGPATH_W = echo -DATE = 2007-11-26 +DATE = 2008-01-14 DEFS = -DHAVE_CONFIG_H DEPDIR = .deps ECHO_C = @@ -109,7 +109,7 @@ LDFLAGS = LIBOBJS = LIBS = -lpthread LTLIBOBJS = -MAKEINFO = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run makeinfo +MAKEINFO = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run makeinfo OBJEXT = o PACKAGE = fprobe-ulog PACKAGE_BUGREPORT = @@ -148,7 +148,7 @@ host_os = linux-gnu host_vendor = pc includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /home/sapan/Projects/planetlab/4.1/fprobe/install-sh +install_sh = /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c index 9a7f365..8c66067 100644 --- a/src/fprobe-ulog.c +++ b/src/fprobe-ulog.c @@ -96,6 +96,7 @@ struct ipulog_handle { #include #define PIDFILE "/var/log/fprobe-ulog.pid" +#define STD_NETFLOW_PDU enum { aflag, diff --git a/src/fprobe-ulog.h b/src/fprobe-ulog.h index c8aed64..9de0dba 100644 --- a/src/fprobe-ulog.h +++ b/src/fprobe-ulog.h @@ -20,7 +20,7 @@ #define MAX_DIGIT 5 #define SCHED SCHED_FIFO -#define EMIT_TIMEOUT 5 +#define EMIT_TIMEOUT 600 #define UNPENDING_TIMEOUT 5 #define CAPTURE_SIZE 131072 #define THREADS 5 diff --git a/src/libipulog/Makefile b/src/libipulog/Makefile index 6ed9c58..f1d5ac9 100644 --- a/src/libipulog/Makefile +++ b/src/libipulog/Makefile @@ -67,13 +67,13 @@ DIST_SOURCES = $(libipulog_a_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run tar -AUTOCONF = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run autoconf -AUTOHEADER = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run autoheader -AUTOMAKE = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run automake-1.9 +AMTAR = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run tar +AUTOCONF = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run autoconf +AUTOHEADER = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run autoheader +AUTOMAKE = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run automake-1.9 AWK = gawk CC = gcc CCDEPMODE = depmode=none @@ -81,7 +81,7 @@ CFLAGS = -g -O2 -D_BSD_SOURCE -D_REENTRANT -DWALL -W -Wall CPP = gcc -E CPPFLAGS = CYGPATH_W = echo -DATE = 2007-11-26 +DATE = 2008-01-14 DEFS = -DHAVE_CONFIG_H DEPDIR = .deps ECHO_C = @@ -97,7 +97,7 @@ LDFLAGS = LIBOBJS = LIBS = -lpthread LTLIBOBJS = -MAKEINFO = ${SHELL} /home/sapan/Projects/planetlab/4.1/fprobe/missing --run makeinfo +MAKEINFO = ${SHELL} /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/missing --run makeinfo OBJEXT = o PACKAGE = fprobe-ulog PACKAGE_BUGREPORT = @@ -136,7 +136,7 @@ host_os = linux-gnu host_vendor = pc includedir = ${prefix}/include infodir = ${prefix}/info -install_sh = /home/sapan/Projects/planetlab/4.1/fprobe/install-sh +install_sh = /home/sapan/Projects/planetlab/fprobe/fprobe-ulog/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var -- 2.43.0