@@ -1,3 +1,9 @@

+Thu Feb 12 19:49:06 EET 2009 (edwin)

+------------------------------------

+ * unit_tests/Makefile.am, unit_tests/Makefile.in,

+ unit_tests/check_clamd.sh, unit_tests/checks.h: add some unit tests

+ for the new clamd protocol

+

 Thu Feb 12 18:30:29 CET 2009 (acab)

 -----------------------------------

  * shared, clamdscan, clamscan, doc, build system:

@@ -15,21 +15,25 @@ else

 TESTS_ENVIRONMENT += export unrar_disabled=1;

 endif

 TESTS = $(programs) $(scripts)

-check_PROGRAMS = $(programs)

+check_PROGRAMS = $(programs) check_clamd

 check_SCRIPTS = $(scripts)

 if HAVE_LIBCHECK

-check_clamav_SOURCES = check_clamav.c checks.h $(top_builddir)/libclamav/clamav.h\

+check_clamav_SOURCES = check_clamav.c checks.h checks_common.h $(top_builddir)/libclamav/clamav.h\

 		       check_jsnorm.c check_str.c check_regex.c\

 		       check_disasm.c check_uniq.c check_matchers.c\

 		       check_htmlnorm.c

 check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

 check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@

+check_clamd_SOURCES = check_clamd.c checks_common.h

+check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\"

+check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@

 else

+check_clamd_SOURCES = check_clamav_skip.c

 check_clamav_SOURCES = check_clamav_skip.c

 endif

-check_clamd.sh: $(top_builddir)/test/clam.exe

+check_clamd.sh: $(top_builddir)/test/clam.exe check_clamd

 check_clamscan.sh: $(top_builddir)/test/clam.exe

 $(top_builddir)/test/clam.exe:

@@ -34,7 +34,7 @@ host_triplet = @host@

 target_triplet = @target@

 @ENABLE_UNRAR_FALSE@am__append_1 = export unrar_disabled=1;

 TESTS = $(am__EXEEXT_1) $(scripts)

-check_PROGRAMS = $(am__EXEEXT_1)

+check_PROGRAMS = $(am__EXEEXT_1) check_clamd$(EXEEXT)

 subdir = unit_tests

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

@@ -53,9 +53,9 @@ CONFIG_HEADER = $(top_builddir)/clamav-config.h

 CONFIG_CLEAN_FILES =

 am__EXEEXT_1 = check_clamav$(EXEEXT)

 am__check_clamav_SOURCES_DIST = check_clamav_skip.c check_clamav.c \

-	checks.h $(top_builddir)/libclamav/clamav.h check_jsnorm.c \

-	check_str.c check_regex.c check_disasm.c check_uniq.c \

-	check_matchers.c check_htmlnorm.c

+	checks.h checks_common.h $(top_builddir)/libclamav/clamav.h \

+	check_jsnorm.c check_str.c check_regex.c check_disasm.c \

+	check_uniq.c check_matchers.c check_htmlnorm.c

 @HAVE_LIBCHECK_FALSE@am_check_clamav_OBJECTS =  \

 @HAVE_LIBCHECK_FALSE@	check_clamav-check_clamav_skip.$(OBJEXT)

 @HAVE_LIBCHECK_TRUE@am_check_clamav_OBJECTS =  \

@@ -70,6 +70,14 @@ am__check_clamav_SOURCES_DIST = check_clamav_skip.c check_clamav.c \

 check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)

 @HAVE_LIBCHECK_TRUE@check_clamav_DEPENDENCIES =  \

 @HAVE_LIBCHECK_TRUE@	$(top_builddir)/libclamav/libclamav.la

+am__check_clamd_SOURCES_DIST = check_clamav_skip.c check_clamd.c \

+	checks_common.h

+@HAVE_LIBCHECK_FALSE@am_check_clamd_OBJECTS =  \

+@HAVE_LIBCHECK_FALSE@	check_clamd-check_clamav_skip.$(OBJEXT)

+@HAVE_LIBCHECK_TRUE@am_check_clamd_OBJECTS =  \

+@HAVE_LIBCHECK_TRUE@	check_clamd-check_clamd.$(OBJEXT)

+check_clamd_OBJECTS = $(am_check_clamd_OBJECTS)

+check_clamd_DEPENDENCIES =

 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

@@ -82,8 +90,9 @@ CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

 	$(LDFLAGS) -o $@

-SOURCES = $(check_clamav_SOURCES)

-DIST_SOURCES = $(am__check_clamav_SOURCES_DIST)

+SOURCES = $(check_clamav_SOURCES) $(check_clamd_SOURCES)

+DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) \

+	$(am__check_clamd_SOURCES_DIST)

 ETAGS = etags

 CTAGS = ctags

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

@@ -249,13 +258,17 @@ TESTS_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK); \

 	$(am__append_1)

 check_SCRIPTS = $(scripts)

 @HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c

-@HAVE_LIBCHECK_TRUE@check_clamav_SOURCES = check_clamav.c checks.h $(top_builddir)/libclamav/clamav.h\

+@HAVE_LIBCHECK_TRUE@check_clamav_SOURCES = check_clamav.c checks.h checks_common.h $(top_builddir)/libclamav/clamav.h\

 @HAVE_LIBCHECK_TRUE@		       check_jsnorm.c check_str.c check_regex.c\

 @HAVE_LIBCHECK_TRUE@		       check_disasm.c check_uniq.c check_matchers.c\

 @HAVE_LIBCHECK_TRUE@		       check_htmlnorm.c

 @HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

 @HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@

+@HAVE_LIBCHECK_FALSE@check_clamd_SOURCES = check_clamav_skip.c

+@HAVE_LIBCHECK_TRUE@check_clamd_SOURCES = check_clamd.c checks_common.h

+@HAVE_LIBCHECK_TRUE@check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\"

+@HAVE_LIBCHECK_TRUE@check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@

 CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log valgrind-*.log duma.log duma2.log clamscan2.log

 EXTRA_DIST = .split $(srcdir)/*.ref input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh

 @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out

@@ -307,6 +320,9 @@ clean-checkPROGRAMS:

 check_clamav$(EXEEXT): $(check_clamav_OBJECTS) $(check_clamav_DEPENDENCIES) 

 	@rm -f check_clamav$(EXEEXT)

 	$(LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS)

+check_clamd$(EXEEXT): $(check_clamd_OBJECTS) $(check_clamd_DEPENDENCIES) 

+	@rm -f check_clamd$(EXEEXT)

+	$(LINK) $(check_clamd_OBJECTS) $(check_clamd_LDADD) $(LIBS)

 mostlyclean-compile:

 	-rm -f *.$(OBJEXT)

@@ -323,6 +339,8 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_regex.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_str.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_uniq.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamd-check_clamav_skip.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamd-check_clamd.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -471,6 +489,34 @@ check_clamav-check_htmlnorm.obj: check_htmlnorm.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_htmlnorm.obj `if test -f 'check_htmlnorm.c'; then $(CYGPATH_W) 'check_htmlnorm.c'; else $(CYGPATH_W) '$(srcdir)/check_htmlnorm.c'; fi`

+check_clamd-check_clamav_skip.o: check_clamav_skip.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamav_skip.o -MD -MP -MF $(DEPDIR)/check_clamd-check_clamav_skip.Tpo -c -o check_clamd-check_clamav_skip.o `test -f 'check_clamav_skip.c' || echo '$(srcdir)/'`check_clamav_skip.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamav_skip.Tpo $(DEPDIR)/check_clamd-check_clamav_skip.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamav_skip.c' object='check_clamd-check_clamav_skip.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamav_skip.o `test -f 'check_clamav_skip.c' || echo '$(srcdir)/'`check_clamav_skip.c

+

+check_clamd-check_clamav_skip.obj: check_clamav_skip.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamav_skip.obj -MD -MP -MF $(DEPDIR)/check_clamd-check_clamav_skip.Tpo -c -o check_clamd-check_clamav_skip.obj `if test -f 'check_clamav_skip.c'; then $(CYGPATH_W) 'check_clamav_skip.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav_skip.c'; fi`

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamav_skip.Tpo $(DEPDIR)/check_clamd-check_clamav_skip.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamav_skip.c' object='check_clamd-check_clamav_skip.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamav_skip.obj `if test -f 'check_clamav_skip.c'; then $(CYGPATH_W) 'check_clamav_skip.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav_skip.c'; fi`

+

+check_clamd-check_clamd.o: check_clamd.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamd.o -MD -MP -MF $(DEPDIR)/check_clamd-check_clamd.Tpo -c -o check_clamd-check_clamd.o `test -f 'check_clamd.c' || echo '$(srcdir)/'`check_clamd.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamd.Tpo $(DEPDIR)/check_clamd-check_clamd.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamd.c' object='check_clamd-check_clamd.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamd.o `test -f 'check_clamd.c' || echo '$(srcdir)/'`check_clamd.c

+

+check_clamd-check_clamd.obj: check_clamd.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamd.obj -MD -MP -MF $(DEPDIR)/check_clamd-check_clamd.Tpo -c -o check_clamd-check_clamd.obj `if test -f 'check_clamd.c'; then $(CYGPATH_W) 'check_clamd.c'; else $(CYGPATH_W) '$(srcdir)/check_clamd.c'; fi`

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamd.Tpo $(DEPDIR)/check_clamd-check_clamd.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamd.c' object='check_clamd-check_clamd.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamd.obj `if test -f 'check_clamd.c'; then $(CYGPATH_W) 'check_clamd.c'; else $(CYGPATH_W) '$(srcdir)/check_clamd.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -736,7 +782,7 @@ check_clamd.sh: $(FILES)

 $(FILES) :

 	cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@

-check_clamd.sh: $(top_builddir)/test/clam.exe

+check_clamd.sh: $(top_builddir)/test/clam.exe check_clamd

 check_clamscan.sh: $(top_builddir)/test/clam.exe

 $(top_builddir)/test/clam.exe:

@@ -56,7 +56,7 @@ start_clamd()

 		{ error "Failed to start clamd!"; die 1; }

 }

-run_clamdscan() {

+run_clamdscan_fileonly() {

 	rm -f clamdscan.log clamdscan-multiscan.log

 	$TOP/clamdscan/clamdscan --version --config-file=test-clamd.conf 2>&1|grep "^ClamAV" >/dev/null || 

 		{ error "clamdscan can't get version of clamd!"; die 1;}

@@ -74,6 +74,23 @@ run_clamdscan() {

 	fi

 }

+run_clamdscan() {

+	run_clamdscan_fileonly $*

+	rm -f clamdscan-fdpass.log clamdscan-multiscan-fdpass.log

+	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* --fdpass --log=clamdscan-fdpass.log

+	if test $? = 2; then 

+		error "Failed to run clamdscan (fdpass)!"

+		cat clamdscan-multiscan.log

+		die 1

+	fi

+	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* -m --fdpass --log=clamdscan-multiscan-fdpass.log

+	if test $? = 2; then 

+		error "Failed to run clamdscan (fdpass + multiscan)!"

+		cat clamdscan-multiscan.log

+		die 1

+	fi

+}

+

 run_reload_test()

 {

 	rm -f reload-testfile

@@ -160,6 +177,8 @@ run_clamdscan $FILES

 NFILES=`ls -1 $FILES | wc -l`

 NINFECTED=`grep "Infected files" clamdscan.log | cut -f2 -d:|sed -e 's/ //g'`

 NINFECTED_MULTI=`grep "Infected files" clamdscan-multiscan.log | cut -f2 -d:|sed -e 's/ //g'`

+NINFECTED_FDPASS=`grep "Infected files" clamdscan-fdpass.log | cut -f2 -d:|sed -e 's/ //g'`

+NINFECTED_MULTI_FDPASS=`grep "Infected files" clamdscan-multiscan-fdpass.log | cut -f2 -d:|sed -e 's/ //g'`

 if test "$NFILES" -ne "0$NINFECTED"; then

 	grep OK clamdscan.log

 	scan_failed clamdscan.log "clamd did not detect all testfiles correctly!"

@@ -168,7 +187,21 @@ if test "$NFILES" -ne "0$NINFECTED_MULTI"; then

 	grep OK clamdscan-multiscan.log

 	scan_failed clamdscan-multiscan.log "clamd did not detect all testfiles correctly in multiscan mode!"

 fi

+if test "$NFILES" -ne "0$NINFECTED_FDPASS"; then

+	grep OK clamdscan-fdpass.log

+	scan_failed clamdscan-multiscan.log "clamd did not detect all testfiles correctly in fdpass mode!"

+fi

+if test "$NFILES" -ne "0$NINFECTED_MULTI_FDPASS"; then

+	grep OK clamdscan-multiscan-fdpass.log

+	scan_failed clamdscan-multiscan.log "clamd did not detect all testfiles correctly in fdpass+multiscan mode!"

+fi

+$TOP/unit_tests/check_clamd

+ecode=$?

+if test $ecode -ne 77 && test $ecode -ne 0; then

+    error "Failed clamd protocol test!"

+    die 1

+fi

 # Test HeuristicScanPrecedence off feature

 run_clamdscan ../clam-phish-exe

 grep "ClamAV-Test-File" clamdscan.log >/dev/null 2>/dev/null;

@@ -186,7 +219,7 @@ pid1=$!

 start_clamd test-clamd.conf

 # Test VirusEvent feature

-run_clamdscan $TOP/test/clam.exe

+run_clamdscan_fileonly $TOP/test/clam.exe

 grep "Virus found: ClamAV-Test-File.UNOFFICIAL" test-clamd.log >/dev/null 2>/dev/null; 

 if test $? -ne 0; then

 	error "Virusaction test failed!" 

@@ -1,18 +1,7 @@

 #ifndef CHECKS_H

 #define CHECKS_H

-#if CHECK_MAJOR_VERSION > 0 || ( CHECK_MINOR_VERSION > 9 || ( CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION > 3))

-#define CHECK_HAVE_LOOPS

-#endif

-

-#if CHECK_MAJOR_VERSION > 0 || ( CHECK_MINOR_VERSION > 9 || ( CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION > 0))

-#define fail_unless_fmt fail_unless

-#define fail_fmt fail

-#else

-#define fail_unless_fmt(cond, msg, ...) fail_unless(cond, msg)

-#define fail_fmt(msg, ...) fail(msg)

-#endif

-

+#include "checks_common.h"

 Suite *test_jsnorm_suite(void);

 Suite *test_str_suite(void);

 Suite *test_regex_suite(void);