git-svn: trunk@2381
Tomasz Kojm authored on 2006/10/15 09:25:32... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Sun Oct 15 02:20:25 CEST 2006 (tk) |
|
2 |
+---------------------------------- |
|
3 |
+ * clamd: s/HardwareAcceleration/NodalCoreAcceleration |
|
4 |
+ * clamscan: s/--hwaccel/--ncore |
|
5 |
+ |
|
1 | 6 |
Sun Oct 15 01:56:34 CEST 2006 (tk) |
2 | 7 |
---------------------------------- |
3 | 8 |
* clamd: s/PhishingScanAllDomains/PhishingStrictURLCheck |
... | ... |
@@ -313,7 +313,7 @@ int main(int argc, char **argv) |
313 | 313 |
logg("Not loading phishing signatures.\n"); |
314 | 314 |
} |
315 | 315 |
|
316 |
- if(cfgopt(copt, "HardwareAcceleration")->enabled) { |
|
316 |
+ if(cfgopt(copt, "NodalCoreAcceleration")->enabled) { |
|
317 | 317 |
#ifdef HAVE_HWACCEL |
318 | 318 |
dboptions |= CL_DB_HWACCEL; |
319 | 319 |
logg("Enabling support for hardware acceleration.\n"); |
... | ... |
@@ -58,7 +58,7 @@ |
58 | 58 |
|
59 | 59 |
void move_infected(const char *filename, const struct optstruct *opt); |
60 | 60 |
int notremoved = 0, notmoved = 0; |
61 |
-static int hwaccel = 0; |
|
61 |
+static int ncore = 0; |
|
62 | 62 |
|
63 | 63 |
static int dsresult(int sockd, const struct optstruct *opt) |
64 | 64 |
{ |
... | ... |
@@ -391,9 +391,9 @@ static int dconnect(const struct optstruct *opt) |
391 | 391 |
return -1; |
392 | 392 |
} |
393 | 393 |
|
394 |
-#ifdef HAVE_HWACCEL |
|
395 |
- if(cfgopt(copt, "HardwareAcceleration")->enabled) |
|
396 |
- hwaccel = 1; |
|
394 |
+#ifdef HAVE_NCORE |
|
395 |
+ if(cfgopt(copt, "NodalCoreAcceleration")->enabled) |
|
396 |
+ ncore = 1; |
|
397 | 397 |
#endif |
398 | 398 |
|
399 | 399 |
freecfg(copt); |
... | ... |
@@ -425,7 +425,7 @@ int client(const struct optstruct *opt, int *infected) |
425 | 425 |
/* TODO: add a cmdline option to allow using MULTISCAN on systems |
426 | 426 |
* without hardware accelerators (but with multiple CPUs) |
427 | 427 |
*/ |
428 |
- if(hwaccel) |
|
428 |
+ if(ncore) |
|
429 | 429 |
scantype = "MULTISCAN"; |
430 | 430 |
|
431 | 431 |
if((ret = dsfile(sockd, scantype, cwd, opt)) >= 0) |
... | ... |
@@ -486,7 +486,7 @@ int client(const struct optstruct *opt, int *infected) |
486 | 486 |
if((sockd = dconnect(opt)) < 0) |
487 | 487 |
return 2; |
488 | 488 |
|
489 |
- if(hwaccel) |
|
489 |
+ if(ncore) |
|
490 | 490 |
scantype = "MULTISCAN"; |
491 | 491 |
|
492 | 492 |
if((ret = dsfile(sockd, scantype, fullpath, opt)) >= 0) |
... | ... |
@@ -185,8 +185,8 @@ int main(int argc, char **argv) |
185 | 185 |
dms += (dms < 0) ? (1000000):(0); |
186 | 186 |
logg("\n----------- SCAN SUMMARY -----------\n"); |
187 | 187 |
logg("Known viruses: %d\n", claminfo.signs); |
188 |
- if(opt_check(opt, "hwaccel")) |
|
189 |
- logg("Engine version: %s [hwaccel]\n", cl_retver()); |
|
188 |
+ if(opt_check(opt, "ncore")) |
|
189 |
+ logg("Engine version: %s [ncore]\n", cl_retver()); |
|
190 | 190 |
else |
191 | 191 |
logg("Engine version: %s\n", cl_retver()); |
192 | 192 |
logg("Scanned directories: %d\n", claminfo.dirs); |
... | ... |
@@ -246,8 +246,8 @@ void help(void) |
246 | 246 |
mprintf(" --include=PATT Only scan file names containing PATT\n"); |
247 | 247 |
mprintf(" --include-dir=PATT Only scan directories containing PATT\n"); |
248 | 248 |
#endif |
249 |
-#ifdef HAVE_HWACCEL |
|
250 |
- mprintf("\n --hwaccel Use hardware acceleration\n"); |
|
249 |
+#ifdef HAVE_NCORE |
|
250 |
+ mprintf("\n --ncore Use hardware acceleration\n"); |
|
251 | 251 |
#endif |
252 | 252 |
mprintf("\n"); |
253 | 253 |
mprintf(" --no-mail Disable mail file support\n"); |
... | ... |
@@ -61,8 +61,8 @@ static struct option clamscan_longopt[] = { |
61 | 61 |
{"max-ratio", 1, 0, 0}, |
62 | 62 |
{"max-recursion", 1, 0, 0}, |
63 | 63 |
{"max-dir-recursion", 1, 0, 0}, |
64 |
-#ifdef HAVE_HWACCEL |
|
65 |
- {"hwaccel", 0, 0, 0}, |
|
64 |
+#ifdef HAVE_NCORE |
|
65 |
+ {"ncore", 0, 0, 0}, |
|
66 | 66 |
#endif |
67 | 67 |
{"disable-archive", 0, 0, 0}, |
68 | 68 |
{"no-archive", 0, 0, 0}, |
... | ... |
@@ -86,8 +86,8 @@ int scanmanager(const struct optstruct *opt) |
86 | 86 |
compression = 1; |
87 | 87 |
|
88 | 88 |
|
89 |
- if(opt_check(opt, "hwaccel")) |
|
90 |
- dboptions |= CL_DB_HWACCEL; |
|
89 |
+ if(opt_check(opt, "ncore")) |
|
90 |
+ dboptions |= CL_DB_NCORE; |
|
91 | 91 |
|
92 | 92 |
if(opt_check(opt, "no-phishing")) |
93 | 93 |
dboptions |= CL_DB_NOPHISHING; |
... | ... |
@@ -1,6 +1,6 @@ |
1 | 1 |
#! /bin/sh |
2 | 2 |
# Guess values for system-dependent variables and create Makefiles. |
3 |
-# Generated by GNU Autoconf 2.60. |
|
3 |
+# Generated by GNU Autoconf 2.60a. |
|
4 | 4 |
# |
5 | 5 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
6 | 6 |
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
... | ... |
@@ -724,36 +724,36 @@ ac_unique_file="clamscan/clamscan.c" |
724 | 724 |
# Factoring default headers for most tests. |
725 | 725 |
ac_includes_default="\ |
726 | 726 |
#include <stdio.h> |
727 |
-#if HAVE_SYS_TYPES_H |
|
727 |
+#ifdef HAVE_SYS_TYPES_H |
|
728 | 728 |
# include <sys/types.h> |
729 | 729 |
#endif |
730 |
-#if HAVE_SYS_STAT_H |
|
730 |
+#ifdef HAVE_SYS_STAT_H |
|
731 | 731 |
# include <sys/stat.h> |
732 | 732 |
#endif |
733 |
-#if STDC_HEADERS |
|
733 |
+#ifdef STDC_HEADERS |
|
734 | 734 |
# include <stdlib.h> |
735 | 735 |
# include <stddef.h> |
736 | 736 |
#else |
737 |
-# if HAVE_STDLIB_H |
|
737 |
+# ifdef HAVE_STDLIB_H |
|
738 | 738 |
# include <stdlib.h> |
739 | 739 |
# endif |
740 | 740 |
#endif |
741 |
-#if HAVE_STRING_H |
|
742 |
-# if !STDC_HEADERS && HAVE_MEMORY_H |
|
741 |
+#ifdef HAVE_STRING_H |
|
742 |
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H |
|
743 | 743 |
# include <memory.h> |
744 | 744 |
# endif |
745 | 745 |
# include <string.h> |
746 | 746 |
#endif |
747 |
-#if HAVE_STRINGS_H |
|
747 |
+#ifdef HAVE_STRINGS_H |
|
748 | 748 |
# include <strings.h> |
749 | 749 |
#endif |
750 |
-#if HAVE_INTTYPES_H |
|
750 |
+#ifdef HAVE_INTTYPES_H |
|
751 | 751 |
# include <inttypes.h> |
752 | 752 |
#endif |
753 |
-#if HAVE_STDINT_H |
|
753 |
+#ifdef HAVE_STDINT_H |
|
754 | 754 |
# include <stdint.h> |
755 | 755 |
#endif |
756 |
-#if HAVE_UNISTD_H |
|
756 |
+#ifdef HAVE_UNISTD_H |
|
757 | 757 |
# include <unistd.h> |
758 | 758 |
#endif" |
759 | 759 |
|
... | ... |
@@ -1469,7 +1469,7 @@ Optional Features: |
1469 | 1469 |
(and sometimes confusing) to the casual installer |
1470 | 1470 |
--disable-zlib-vcheck do not check for buggy zlib version |
1471 | 1471 |
--disable-bzip2 disable bzip2 support |
1472 |
- --disable-hwaccel disable support for hardware acceleration |
|
1472 |
+ --disable-ncore disable support for NodalCore acceleration (default=auto) |
|
1473 | 1473 |
--disable-dns disable support for database verification through |
1474 | 1474 |
DNS |
1475 | 1475 |
--disable-clamuko disable clamuko support (Linux, DragonFly and FreeBSD only) |
... | ... |
@@ -1577,7 +1577,7 @@ test -n "$ac_init_help" && exit $ac_status |
1577 | 1577 |
if $ac_init_version; then |
1578 | 1578 |
cat <<\_ACEOF |
1579 | 1579 |
configure |
1580 |
-generated by GNU Autoconf 2.60 |
|
1580 |
+generated by GNU Autoconf 2.60a |
|
1581 | 1581 |
|
1582 | 1582 |
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
1583 | 1583 |
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
... | ... |
@@ -1591,7 +1591,7 @@ This file contains any messages produced by compilers while |
1591 | 1591 |
running configure, to aid debugging if configure makes a mistake. |
1592 | 1592 |
|
1593 | 1593 |
It was created by $as_me, which was |
1594 |
-generated by GNU Autoconf 2.60. Invocation command line was |
|
1594 |
+generated by GNU Autoconf 2.60a. Invocation command line was |
|
1595 | 1595 |
|
1596 | 1596 |
$ $0 $@ |
1597 | 1597 |
|
... | ... |
@@ -3165,7 +3165,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
3165 | 3165 |
# in a Makefile. We should not override ac_cv_exeext if it was cached, |
3166 | 3166 |
# so that the user can short-circuit this test for compilers unknown to |
3167 | 3167 |
# Autoconf. |
3168 |
-for ac_file in $ac_files |
|
3168 |
+for ac_file in $ac_files '' |
|
3169 | 3169 |
do |
3170 | 3170 |
test -f "$ac_file" || continue |
3171 | 3171 |
case $ac_file in |
... | ... |
@@ -3193,6 +3193,12 @@ done |
3193 | 3193 |
test "$ac_cv_exeext" = no && ac_cv_exeext= |
3194 | 3194 |
|
3195 | 3195 |
else |
3196 |
+ ac_file='' |
|
3197 |
+fi |
|
3198 |
+ |
|
3199 |
+{ echo "$as_me:$LINENO: result: $ac_file" >&5 |
|
3200 |
+echo "${ECHO_T}$ac_file" >&6; } |
|
3201 |
+if test -z "$ac_file"; then |
|
3196 | 3202 |
echo "$as_me: failed program was:" >&5 |
3197 | 3203 |
sed 's/^/| /' conftest.$ac_ext >&5 |
3198 | 3204 |
|
... | ... |
@@ -3204,8 +3210,6 @@ See \`config.log' for more details." >&2;} |
3204 | 3204 |
fi |
3205 | 3205 |
|
3206 | 3206 |
ac_exeext=$ac_cv_exeext |
3207 |
-{ echo "$as_me:$LINENO: result: $ac_file" >&5 |
|
3208 |
-echo "${ECHO_T}$ac_file" >&6; } |
|
3209 | 3207 |
|
3210 | 3208 |
# Check that the compiler produces executables we can run. If not, either |
3211 | 3209 |
# the compiler is broken, or we cross compile. |
... | ... |
@@ -5883,7 +5887,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
5883 | 5883 |
case $host in |
5884 | 5884 |
*-*-irix6*) |
5885 | 5885 |
# Find out which ABI we are using. |
5886 |
- echo '#line 5886 "configure"' > conftest.$ac_ext |
|
5886 |
+ echo '#line 5890 "configure"' > conftest.$ac_ext |
|
5887 | 5887 |
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5888 | 5888 |
(eval $ac_compile) 2>&5 |
5889 | 5889 |
ac_status=$? |
... | ... |
@@ -5995,7 +5999,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
5995 | 5995 |
lt_cv_cc_needs_belf=no |
5996 | 5996 |
fi |
5997 | 5997 |
|
5998 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
5998 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
5999 | 5999 |
conftest$ac_exeext conftest.$ac_ext |
6000 | 6000 |
ac_ext=c |
6001 | 6001 |
ac_cpp='$CPP $CPPFLAGS' |
... | ... |
@@ -6471,7 +6475,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
6471 | 6471 |
|
6472 | 6472 |
fi |
6473 | 6473 |
|
6474 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
6474 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
6475 | 6475 |
conftest$ac_exeext conftest.$ac_ext |
6476 | 6476 |
LDFLAGS="$save_LDFLAGS" |
6477 | 6477 |
|
... | ... |
@@ -6516,7 +6520,7 @@ chmod -w . |
6516 | 6516 |
save_CFLAGS="$CFLAGS" |
6517 | 6517 |
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" |
6518 | 6518 |
compiler_c_o=no |
6519 |
-if { (eval echo configure:6519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
6519 |
+if { (eval echo configure:6523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
6520 | 6520 |
# The compiler can only warn and ignore the option if not recognized |
6521 | 6521 |
# So say no if there are warnings |
6522 | 6522 |
if test -s out/conftest.err; then |
... | ... |
@@ -8077,7 +8081,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
8077 | 8077 |
ac_cv_func_shl_load=no |
8078 | 8078 |
fi |
8079 | 8079 |
|
8080 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
8080 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
8081 | 8081 |
conftest$ac_exeext conftest.$ac_ext |
8082 | 8082 |
fi |
8083 | 8083 |
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 |
... | ... |
@@ -8156,7 +8160,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
8156 | 8156 |
ac_cv_lib_dld_shl_load=no |
8157 | 8157 |
fi |
8158 | 8158 |
|
8159 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
8159 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
8160 | 8160 |
conftest$ac_exeext conftest.$ac_ext |
8161 | 8161 |
LIBS=$ac_check_lib_save_LIBS |
8162 | 8162 |
fi |
... | ... |
@@ -8257,7 +8261,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
8257 | 8257 |
ac_cv_func_dlopen=no |
8258 | 8258 |
fi |
8259 | 8259 |
|
8260 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
8260 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
8261 | 8261 |
conftest$ac_exeext conftest.$ac_ext |
8262 | 8262 |
fi |
8263 | 8263 |
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 |
... | ... |
@@ -8336,7 +8340,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
8336 | 8336 |
ac_cv_lib_dl_dlopen=no |
8337 | 8337 |
fi |
8338 | 8338 |
|
8339 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
8339 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
8340 | 8340 |
conftest$ac_exeext conftest.$ac_ext |
8341 | 8341 |
LIBS=$ac_check_lib_save_LIBS |
8342 | 8342 |
fi |
... | ... |
@@ -8416,7 +8420,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
8416 | 8416 |
ac_cv_lib_svld_dlopen=no |
8417 | 8417 |
fi |
8418 | 8418 |
|
8419 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
8419 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
8420 | 8420 |
conftest$ac_exeext conftest.$ac_ext |
8421 | 8421 |
LIBS=$ac_check_lib_save_LIBS |
8422 | 8422 |
fi |
... | ... |
@@ -8496,7 +8500,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
8496 | 8496 |
ac_cv_lib_dld_dld_link=no |
8497 | 8497 |
fi |
8498 | 8498 |
|
8499 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
8499 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
8500 | 8500 |
conftest$ac_exeext conftest.$ac_ext |
8501 | 8501 |
LIBS=$ac_check_lib_save_LIBS |
8502 | 8502 |
fi |
... | ... |
@@ -8552,7 +8556,7 @@ else |
8552 | 8552 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
8553 | 8553 |
lt_status=$lt_dlunknown |
8554 | 8554 |
cat > conftest.$ac_ext <<EOF |
8555 |
-#line 8555 "configure" |
|
8555 |
+#line 8559 "configure" |
|
8556 | 8556 |
#include "confdefs.h" |
8557 | 8557 |
|
8558 | 8558 |
#if HAVE_DLFCN_H |
... | ... |
@@ -8650,7 +8654,7 @@ else |
8650 | 8650 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
8651 | 8651 |
lt_status=$lt_dlunknown |
8652 | 8652 |
cat > conftest.$ac_ext <<EOF |
8653 |
-#line 8653 "configure" |
|
8653 |
+#line 8657 "configure" |
|
8654 | 8654 |
#include "confdefs.h" |
8655 | 8655 |
|
8656 | 8656 |
#if HAVE_DLFCN_H |
... | ... |
@@ -10424,7 +10428,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
10424 | 10424 |
ac_cv_lib_socket_bind=no |
10425 | 10425 |
fi |
10426 | 10426 |
|
10427 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
10427 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
10428 | 10428 |
conftest$ac_exeext conftest.$ac_ext |
10429 | 10429 |
LIBS=$ac_check_lib_save_LIBS |
10430 | 10430 |
fi |
... | ... |
@@ -10505,7 +10509,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
10505 | 10505 |
ac_cv_lib_nsl_gethostent=no |
10506 | 10506 |
fi |
10507 | 10507 |
|
10508 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
10508 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
10509 | 10509 |
conftest$ac_exeext conftest.$ac_ext |
10510 | 10510 |
LIBS=$ac_check_lib_save_LIBS |
10511 | 10511 |
fi |
... | ... |
@@ -10623,7 +10627,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
10623 | 10623 |
eval "$as_ac_var=no" |
10624 | 10624 |
fi |
10625 | 10625 |
|
10626 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
10626 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
10627 | 10627 |
conftest$ac_exeext conftest.$ac_ext |
10628 | 10628 |
fi |
10629 | 10629 |
ac_res=`eval echo '${'$as_ac_var'}'` |
... | ... |
@@ -10898,7 +10902,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
10898 | 10898 |
eval "$as_ac_var=no" |
10899 | 10899 |
fi |
10900 | 10900 |
|
10901 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
10901 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
10902 | 10902 |
conftest$ac_exeext conftest.$ac_ext |
10903 | 10903 |
fi |
10904 | 10904 |
ac_res=`eval echo '${'$as_ac_var'}'` |
... | ... |
@@ -10955,21 +10959,21 @@ $ac_includes_default |
10955 | 10955 |
#include <fcntl.h> |
10956 | 10956 |
#include <sys/mman.h> |
10957 | 10957 |
|
10958 |
-#if !STDC_HEADERS && !HAVE_STDLIB_H |
|
10958 |
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H |
|
10959 | 10959 |
char *malloc (); |
10960 | 10960 |
#endif |
10961 | 10961 |
|
10962 | 10962 |
/* This mess was copied from the GNU getpagesize.h. */ |
10963 |
-#if !HAVE_GETPAGESIZE |
|
10963 |
+#ifndef HAVE_GETPAGESIZE |
|
10964 | 10964 |
/* Assume that all systems that can run configure have sys/param.h. */ |
10965 |
-# if !HAVE_SYS_PARAM_H |
|
10965 |
+# ifndef HAVE_SYS_PARAM_H |
|
10966 | 10966 |
# define HAVE_SYS_PARAM_H 1 |
10967 | 10967 |
# endif |
10968 | 10968 |
|
10969 | 10969 |
# ifdef _SC_PAGESIZE |
10970 | 10970 |
# define getpagesize() sysconf(_SC_PAGESIZE) |
10971 | 10971 |
# else /* no _SC_PAGESIZE */ |
10972 |
-# if HAVE_SYS_PARAM_H |
|
10972 |
+# ifdef HAVE_SYS_PARAM_H |
|
10973 | 10973 |
# include <sys/param.h> |
10974 | 10974 |
# ifdef EXEC_PAGESIZE |
10975 | 10975 |
# define getpagesize() EXEC_PAGESIZE |
... | ... |
@@ -11301,7 +11305,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
11301 | 11301 |
ac_cv_func_fseeko=no |
11302 | 11302 |
fi |
11303 | 11303 |
|
11304 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
11304 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
11305 | 11305 |
conftest$ac_exeext conftest.$ac_ext |
11306 | 11306 |
fi |
11307 | 11307 |
{ echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5 |
... | ... |
@@ -11697,7 +11701,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
11697 | 11697 |
ac_cv_lib_z_inflateEnd=no |
11698 | 11698 |
fi |
11699 | 11699 |
|
11700 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
11700 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
11701 | 11701 |
conftest$ac_exeext conftest.$ac_ext |
11702 | 11702 |
LIBS=$ac_check_lib_save_LIBS |
11703 | 11703 |
fi |
... | ... |
@@ -11787,7 +11791,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
11787 | 11787 |
ac_cv_lib_z_inflateEnd=no |
11788 | 11788 |
fi |
11789 | 11789 |
|
11790 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
11790 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
11791 | 11791 |
conftest$ac_exeext conftest.$ac_ext |
11792 | 11792 |
LIBS=$ac_check_lib_save_LIBS |
11793 | 11793 |
fi |
... | ... |
@@ -11889,7 +11893,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
11889 | 11889 |
ac_cv_lib_bz2_bzReadOpen=no |
11890 | 11890 |
fi |
11891 | 11891 |
|
11892 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
11892 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
11893 | 11893 |
conftest$ac_exeext conftest.$ac_ext |
11894 | 11894 |
LIBS=$ac_check_lib_save_LIBS |
11895 | 11895 |
fi |
... | ... |
@@ -12066,15 +12070,15 @@ fi |
12066 | 12066 |
|
12067 | 12067 |
fi |
12068 | 12068 |
|
12069 |
-# Check whether --enable-hwaccel was given. |
|
12070 |
-if test "${enable_hwaccel+set}" = set; then |
|
12071 |
- enableval=$enable_hwaccel; want_hwaccel=$enableval |
|
12069 |
+# Check whether --enable-ncore was given. |
|
12070 |
+if test "${enable_ncore+set}" = set; then |
|
12071 |
+ enableval=$enable_ncore; want_ncore=$enableval |
|
12072 | 12072 |
else |
12073 |
- want_hwaccel="yes" |
|
12073 |
+ want_ncore="yes" |
|
12074 | 12074 |
fi |
12075 | 12075 |
|
12076 | 12076 |
|
12077 |
-if test "$want_hwaccel" = "yes" |
|
12077 |
+if test "$want_ncore" = "yes" |
|
12078 | 12078 |
then |
12079 | 12079 |
{ echo "$as_me:$LINENO: checking for sn_sigscan_initdb in -lsn_sigscan" >&5 |
12080 | 12080 |
echo $ECHO_N "checking for sn_sigscan_initdb in -lsn_sigscan... $ECHO_C" >&6; } |
... | ... |
@@ -12147,7 +12151,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
12147 | 12147 |
ac_cv_lib_sn_sigscan_sn_sigscan_initdb=no |
12148 | 12148 |
fi |
12149 | 12149 |
|
12150 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
12150 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
12151 | 12151 |
conftest$ac_exeext conftest.$ac_ext |
12152 | 12152 |
LIBS=$ac_check_lib_save_LIBS |
12153 | 12153 |
fi |
... | ... |
@@ -12311,7 +12315,7 @@ fi |
12311 | 12311 |
if test $ac_cv_header_sn_sigscan_sn_sigscan_h = yes; then |
12312 | 12312 |
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lsn_sigscan"; |
12313 | 12313 |
cat >>confdefs.h <<\_ACEOF |
12314 |
-#define HAVE_HWACCEL 1 |
|
12314 |
+#define HAVE_NCORE 1 |
|
12315 | 12315 |
_ACEOF |
12316 | 12316 |
|
12317 | 12317 |
else |
... | ... |
@@ -12403,7 +12407,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
12403 | 12403 |
ac_cv_lib_resolv___dn_expand=no |
12404 | 12404 |
fi |
12405 | 12405 |
|
12406 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
12406 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
12407 | 12407 |
conftest$ac_exeext conftest.$ac_ext |
12408 | 12408 |
LIBS=$ac_check_lib_save_LIBS |
12409 | 12409 |
fi |
... | ... |
@@ -12485,7 +12489,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
12485 | 12485 |
ac_cv_lib_resolv_dn_expand=no |
12486 | 12486 |
fi |
12487 | 12487 |
|
12488 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
12488 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
12489 | 12489 |
conftest$ac_exeext conftest.$ac_ext |
12490 | 12490 |
LIBS=$ac_check_lib_save_LIBS |
12491 | 12491 |
fi |
... | ... |
@@ -12916,7 +12920,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
12916 | 12916 |
ac_cv_lib_gmp___gmpz_init=no |
12917 | 12917 |
fi |
12918 | 12918 |
|
12919 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
12919 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
12920 | 12920 |
conftest$ac_exeext conftest.$ac_ext |
12921 | 12921 |
LIBS=$ac_check_lib_save_LIBS |
12922 | 12922 |
fi |
... | ... |
@@ -13000,7 +13004,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
13000 | 13000 |
ac_cv_lib_gmp_mpz_init=no |
13001 | 13001 |
fi |
13002 | 13002 |
|
13003 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
13003 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
13004 | 13004 |
conftest$ac_exeext conftest.$ac_ext |
13005 | 13005 |
LIBS=$ac_check_lib_save_LIBS |
13006 | 13006 |
fi |
... | ... |
@@ -13923,7 +13927,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
13923 | 13923 |
ac_cv_lib_milter_mi_stop=no |
13924 | 13924 |
fi |
13925 | 13925 |
|
13926 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
13926 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
13927 | 13927 |
conftest$ac_exeext conftest.$ac_ext |
13928 | 13928 |
LIBS=$ac_check_lib_save_LIBS |
13929 | 13929 |
fi |
... | ... |
@@ -14010,7 +14014,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
14010 | 14010 |
|
14011 | 14011 |
fi |
14012 | 14012 |
|
14013 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
14013 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
14014 | 14014 |
conftest$ac_exeext |
14015 | 14015 |
if test "${ac_cv_search_strlcpy+set}" = set; then |
14016 | 14016 |
break |
... | ... |
@@ -14105,7 +14109,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
14105 | 14105 |
ac_cv_lib_milter_mi_stop=no |
14106 | 14106 |
fi |
14107 | 14107 |
|
14108 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
14108 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
14109 | 14109 |
conftest$ac_exeext conftest.$ac_ext |
14110 | 14110 |
LIBS=$ac_check_lib_save_LIBS |
14111 | 14111 |
fi |
... | ... |
@@ -14424,7 +14428,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
14424 | 14424 |
eval "$as_ac_var=no" |
14425 | 14425 |
fi |
14426 | 14426 |
|
14427 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
14427 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
14428 | 14428 |
conftest$ac_exeext conftest.$ac_ext |
14429 | 14429 |
fi |
14430 | 14430 |
ac_res=`eval echo '${'$as_ac_var'}'` |
... | ... |
@@ -14915,11 +14919,11 @@ echo "${ECHO_T}no" >&6; } |
14915 | 14915 |
LIBS=$save_LIBS |
14916 | 14916 |
fi |
14917 | 14917 |
|
14918 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
14918 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
14919 | 14919 |
conftest$ac_exeext conftest.$ac_ext |
14920 | 14920 |
fi |
14921 | 14921 |
|
14922 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
14922 |
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
14923 | 14923 |
conftest$ac_exeext conftest.$ac_ext |
14924 | 14924 |
else |
14925 | 14925 |
have_wrappers=no |
... | ... |
@@ -15734,10 +15738,10 @@ main () |
15734 | 15734 |
#ifndef __cplusplus |
15735 | 15735 |
/* Ultrix mips cc rejects this. */ |
15736 | 15736 |
typedef int charset[2]; |
15737 |
- const charset x; |
|
15737 |
+ const charset cs; |
|
15738 | 15738 |
/* SunOS 4.1.1 cc rejects this. */ |
15739 |
- char const *const *ccp; |
|
15740 |
- char **p; |
|
15739 |
+ char const *const *pcpcc; |
|
15740 |
+ char **ppc; |
|
15741 | 15741 |
/* NEC SVR4.0.2 mips cc rejects this. */ |
15742 | 15742 |
struct point {int x, y;}; |
15743 | 15743 |
static struct point const zero = {0,0}; |
... | ... |
@@ -15746,11 +15750,11 @@ main () |
15746 | 15746 |
an arm of an if-expression whose if-part is not a constant |
15747 | 15747 |
expression */ |
15748 | 15748 |
const char *g = "string"; |
15749 |
- ccp = &g + (g ? g-g : 0); |
|
15749 |
+ pcpcc = &g + (g ? g-g : 0); |
|
15750 | 15750 |
/* HPUX 7.0 cc rejects these. */ |
15751 |
- ++ccp; |
|
15752 |
- p = (char**) ccp; |
|
15753 |
- ccp = (char const *const *) p; |
|
15751 |
+ ++pcpcc; |
|
15752 |
+ ppc = (char**) pcpcc; |
|
15753 |
+ pcpcc = (char const *const *) ppc; |
|
15754 | 15754 |
{ /* SCO 3.2v4 cc rejects this. */ |
15755 | 15755 |
char *t; |
15756 | 15756 |
char const *s = 0 ? (char *) 0 : (char const *) 0; |
... | ... |
@@ -15777,7 +15781,7 @@ main () |
15777 | 15777 |
const int foo = 10; |
15778 | 15778 |
if (!foo) return 0; |
15779 | 15779 |
} |
15780 |
- return !x[0] && !zero.x; |
|
15780 |
+ return !cs[0] && !zero.x; |
|
15781 | 15781 |
#endif |
15782 | 15782 |
|
15783 | 15783 |
; |
... | ... |
@@ -15942,7 +15946,8 @@ cat >>conftest.$ac_ext <<_ACEOF |
15942 | 15942 |
int |
15943 | 15943 |
main () |
15944 | 15944 |
{ |
15945 |
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN |
|
15945 |
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ |
|
15946 |
+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) |
|
15946 | 15947 |
bogus endian macros |
15947 | 15948 |
#endif |
15948 | 15949 |
|
... | ... |
@@ -17040,7 +17045,7 @@ exec 6>&1 |
17040 | 17040 |
# values after options handling. |
17041 | 17041 |
ac_log=" |
17042 | 17042 |
This file was extended by $as_me, which was |
17043 |
-generated by GNU Autoconf 2.60. Invocation command line was |
|
17043 |
+generated by GNU Autoconf 2.60a. Invocation command line was |
|
17044 | 17044 |
|
17045 | 17045 |
CONFIG_FILES = $CONFIG_FILES |
17046 | 17046 |
CONFIG_HEADERS = $CONFIG_HEADERS |
... | ... |
@@ -17069,7 +17074,7 @@ current configuration. |
17069 | 17069 |
Usage: $0 [OPTIONS] [FILE]... |
17070 | 17070 |
|
17071 | 17071 |
-h, --help print this help, then exit |
17072 |
- -V, --version print version number, then exit |
|
17072 |
+ -V, --version print version number and configuration settings, then exit |
|
17073 | 17073 |
-q, --quiet do not print progress messages |
17074 | 17074 |
-d, --debug don't remove temporary files |
17075 | 17075 |
--recheck update $as_me by reconfiguring in the same conditions |
... | ... |
@@ -17093,7 +17098,7 @@ _ACEOF |
17093 | 17093 |
cat >>$CONFIG_STATUS <<_ACEOF |
17094 | 17094 |
ac_cs_version="\\ |
17095 | 17095 |
config.status |
17096 |
-configured by $0, generated by GNU Autoconf 2.60, |
|
17096 |
+configured by $0, generated by GNU Autoconf 2.60a, |
|
17097 | 17097 |
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
17098 | 17098 |
|
17099 | 17099 |
Copyright (C) 2006 Free Software Foundation, Inc. |
... | ... |
@@ -139,16 +139,16 @@ then |
139 | 139 |
AC_CHECK_HEADER(bzlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; AC_DEFINE(HAVE_BZLIB_H,1,have bzip2)], AC_MSG_WARN([****** bzip2 support disabled])) |
140 | 140 |
fi |
141 | 141 |
|
142 |
-AC_ARG_ENABLE(hwaccel, |
|
143 |
-[ --disable-hwaccel disable support for hardware acceleration], |
|
144 |
-want_hwaccel=$enableval, want_hwaccel="yes") |
|
142 |
+AC_ARG_ENABLE(ncore, |
|
143 |
+[ --disable-ncore disable support for NodalCore acceleration (default=auto)], |
|
144 |
+want_ncore=$enableval, want_ncore="yes") |
|
145 | 145 |
|
146 |
-if test "$want_hwaccel" = "yes" |
|
146 |
+if test "$want_ncore" = "yes" |
|
147 | 147 |
then |
148 | 148 |
AC_CHECK_LIB(sn_sigscan, sn_sigscan_initdb, have_sigscan=yes,) |
149 | 149 |
if test "$have_sigscan" = "yes" |
150 | 150 |
then |
151 |
- AC_CHECK_HEADER(sn_sigscan/sn_sigscan.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lsn_sigscan"; AC_DEFINE(HAVE_HWACCEL,1,hardware acceleration)], AC_MSG_WARN([****** hardware acceleration support disabled -- please install libsigscan-devel ])) |
|
151 |
+ AC_CHECK_HEADER(sn_sigscan/sn_sigscan.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lsn_sigscan"; AC_DEFINE(HAVE_NCORE,1,hardware acceleration)], AC_MSG_WARN([****** hardware acceleration support disabled -- please install libsigscan-devel ])) |
|
152 | 152 |
fi |
153 | 153 |
fi |
154 | 154 |
|
... | ... |
@@ -287,7 +287,7 @@ Mark archives as viruses (e.g RAR.ExceededFileSize, Zip.ExceededFilesLimit) if A |
287 | 287 |
.br |
288 | 288 |
Default: disabled |
289 | 289 |
.TP |
290 |
-\fBHardwareAcceleration\fR |
|
290 |
+\fBNodalCoreAcceleration\fR |
|
291 | 291 |
Enable support for Sensory Networks' NodalCore hardware accelerator. |
292 | 292 |
.br |
293 | 293 |
Default: disabled |
... | ... |
@@ -71,7 +71,7 @@ extern "C" |
71 | 71 |
|
72 | 72 |
|
73 | 73 |
/* db options */ |
74 |
-#define CL_DB_HWACCEL 1 |
|
74 |
+#define CL_DB_NCORE 1 |
|
75 | 75 |
#define CL_DB_NOPHISHING 2 |
76 | 76 |
#define CL_DB_ACONLY 4 /* for developers only */ |
77 | 77 |
|
... | ... |
@@ -160,7 +160,7 @@ struct cli_matcher { |
160 | 160 |
|
161 | 161 |
struct cl_engine { |
162 | 162 |
unsigned int refcount; /* reference counter */ |
163 |
- unsigned short hwaccel; |
|
163 |
+ unsigned short ncore; |
|
164 | 164 |
unsigned short sdb; |
165 | 165 |
|
166 | 166 |
/* Roots table */ |
... | ... |
@@ -294,9 +294,9 @@ int cli_addtypesigs(struct cl_engine *engine) |
294 | 294 |
return CL_EMEM; |
295 | 295 |
} |
296 | 296 |
|
297 |
- if(engine->hwaccel) { |
|
297 |
+ if(engine->ncore) { |
|
298 | 298 |
/* |
299 |
- cli_dbgmsg("cli_addtypesigs: AC depth 10 (hwaccel mode)\n"); |
|
299 |
+ cli_dbgmsg("cli_addtypesigs: AC depth 10 (ncore mode)\n"); |
|
300 | 300 |
cli_ac_setdepth(10); |
301 | 301 |
*/ |
302 | 302 |
} |
... | ... |
@@ -46,7 +46,7 @@ static int targettab[CL_TARGET_TABLE_SIZE] = { 0, CL_TYPE_MSEXE, CL_TYPE_MSOLE2, |
46 | 46 |
|
47 | 47 |
extern short cli_debug_flag; |
48 | 48 |
|
49 |
-#ifdef HAVE_HWACCEL |
|
49 |
+#ifdef HAVE_NCORE |
|
50 | 50 |
#include <sn_sigscan/sn_sigscan.h> |
51 | 51 |
#define HWBUFFSIZE 32768 |
52 | 52 |
#endif |
... | ... |
@@ -57,7 +57,7 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, |
57 | 57 |
int ret = CL_CLEAN, i, tid = 0, *partcnt; |
58 | 58 |
unsigned long int *partoff; |
59 | 59 |
struct cli_matcher *groot, *troot = NULL; |
60 |
-#ifdef HAVE_HWACCEL |
|
60 |
+#ifdef HAVE_NCORE |
|
61 | 61 |
void *streamhandle; |
62 | 62 |
void *resulthandle; |
63 | 63 |
uint32_t datamask[2] = { 0xffffffff, 0xffffffff }; |
... | ... |
@@ -72,8 +72,8 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, |
72 | 72 |
return CL_ENULLARG; |
73 | 73 |
} |
74 | 74 |
|
75 |
-#ifdef HAVE_HWACCEL |
|
76 |
- if(engine->hwaccel) { |
|
75 |
+#ifdef HAVE_NCORE |
|
76 |
+ if(engine->ncore) { |
|
77 | 77 |
/* TODO: Setup proper data bitmask (need specs) */ |
78 | 78 |
if((hret = sn_sigscan_createstream(engine->hwdb, datamask, 2, &streamhandle)) < 0) { |
79 | 79 |
cli_errmsg("cli_scanbuff: can't create new hardware stream: %d\n", hret); |
... | ... |
@@ -191,7 +191,7 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname, |
191 | 191 |
|
192 | 192 |
return ret; |
193 | 193 |
} |
194 |
-#endif /* HAVE_HWACCEL */ |
|
194 |
+#endif /* HAVE_NCORE */ |
|
195 | 195 |
|
196 | 196 |
|
197 | 197 |
groot = engine->root[0]; /* generic signatures */ |
... | ... |
@@ -416,7 +416,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f |
416 | 416 |
unsigned char digest[16]; |
417 | 417 |
struct cli_md5_node *md5_node; |
418 | 418 |
struct cli_matcher *groot, *troot = NULL; |
419 |
-#ifdef HAVE_HWACCEL |
|
419 |
+#ifdef HAVE_NCORE |
|
420 | 420 |
void *streamhandle; |
421 | 421 |
void *resulthandle; |
422 | 422 |
unsigned long long hoffset; |
... | ... |
@@ -431,8 +431,8 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f |
431 | 431 |
return CL_ENULLARG; |
432 | 432 |
} |
433 | 433 |
|
434 |
-#ifdef HAVE_HWACCEL |
|
435 |
- if(ctx->engine->hwaccel) { |
|
434 |
+#ifdef HAVE_NCORE |
|
435 |
+ if(ctx->engine->ncore) { |
|
436 | 436 |
/* TODO: Setup proper data bitmask (need specs) */ |
437 | 437 |
if((hret = sn_sigscan_createstream(ctx->engine->hwdb, datamask, 2, &streamhandle)) < 0) { |
438 | 438 |
cli_errmsg("cli_scandesc: can't create new hardware stream: %d\n", hret); |
... | ... |
@@ -621,7 +621,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f |
621 | 621 |
return CL_EIO; |
622 | 622 |
} |
623 | 623 |
} |
624 |
-#endif /* HAVE_HWACCEL */ |
|
624 |
+#endif /* HAVE_NCORE */ |
|
625 | 625 |
|
626 | 626 |
|
627 | 627 |
groot = ctx->engine->root[0]; /* generic signatures */ |
... | ... |
@@ -78,7 +78,7 @@ |
78 | 78 |
static pthread_mutex_t cli_ref_mutex = PTHREAD_MUTEX_INITIALIZER; |
79 | 79 |
#endif |
80 | 80 |
|
81 |
-#ifdef HAVE_HWACCEL |
|
81 |
+#ifdef HAVE_NCORE |
|
82 | 82 |
#include <sn_sigscan/sn_sigscan.h> |
83 | 83 |
#endif |
84 | 84 |
|
... | ... |
@@ -1090,7 +1090,7 @@ static int cli_loadmd(FILE *fd, struct cl_engine **engine, unsigned int *signo, |
1090 | 1090 |
return CL_SUCCESS; |
1091 | 1091 |
} |
1092 | 1092 |
|
1093 |
-#ifdef HAVE_HWACCEL |
|
1093 |
+#ifdef HAVE_NCORE |
|
1094 | 1094 |
static int cli_loadhw(const char *filename, struct cl_engine **engine, unsigned int *signo, unsigned int options) |
1095 | 1095 |
{ |
1096 | 1096 |
int ret = 0; |
... | ... |
@@ -1102,22 +1102,22 @@ static int cli_loadhw(const char *filename, struct cl_engine **engine, unsigned |
1102 | 1102 |
} |
1103 | 1103 |
|
1104 | 1104 |
if((ret = sn_sigscan_initdb(&(*engine)->hwdb)) < 0) { |
1105 |
- cli_errmsg("hwaccel: error initializing the matcher: %d\n", ret); |
|
1105 |
+ cli_errmsg("ncore: error initializing the matcher: %d\n", ret); |
|
1106 | 1106 |
cl_free(*engine); |
1107 | 1107 |
return CL_EHWINIT; |
1108 | 1108 |
} |
1109 | 1109 |
|
1110 |
- (*engine)->hwaccel = 1; |
|
1110 |
+ (*engine)->ncore = 1; |
|
1111 | 1111 |
|
1112 | 1112 |
if((ret = sn_sigscan_loaddb((*engine)->hwdb, filename, 0, signo)) < 0) { |
1113 |
- cli_errmsg("hwaccel: can't load hardware database: %d\n", ret); |
|
1113 |
+ cli_errmsg("ncore: can't load hardware database: %d\n", ret); |
|
1114 | 1114 |
cl_free(*engine); |
1115 | 1115 |
return CL_EHWLOAD; |
1116 | 1116 |
} |
1117 | 1117 |
|
1118 | 1118 |
return CL_SUCCESS; |
1119 | 1119 |
} |
1120 |
-#endif /* HAVE_HWACCEL */ |
|
1120 |
+#endif /* HAVE_NCORE */ |
|
1121 | 1121 |
|
1122 | 1122 |
static int cli_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo, unsigned int options); |
1123 | 1123 |
|
... | ... |
@@ -1137,7 +1137,7 @@ static int cli_load(const char *filename, struct cl_engine **engine, unsigned in |
1137 | 1137 |
} |
1138 | 1138 |
|
1139 | 1139 |
if(cli_strbcasestr(filename, ".db")) { |
1140 |
- if(options & CL_DB_HWACCEL) |
|
1140 |
+ if(options & CL_DB_NCORE) |
|
1141 | 1141 |
skipped = 1; |
1142 | 1142 |
else |
1143 | 1143 |
ret = cli_loaddb(fd, engine, signo, options); |
... | ... |
@@ -1160,14 +1160,14 @@ static int cli_load(const char *filename, struct cl_engine **engine, unsigned in |
1160 | 1160 |
ret = cli_loadhdb(fd, engine, signo, 2, options); |
1161 | 1161 |
|
1162 | 1162 |
} else if(cli_strbcasestr(filename, ".ndb")) { |
1163 |
- if(options & CL_DB_HWACCEL) |
|
1163 |
+ if(options & CL_DB_NCORE) |
|
1164 | 1164 |
skipped = 1; |
1165 | 1165 |
else |
1166 | 1166 |
ret = cli_loadndb(fd, engine, signo, 0, options); |
1167 | 1167 |
|
1168 | 1168 |
} else if(cli_strbcasestr(filename, ".sdb")) { |
1169 |
- /* FIXME: Add support in hwaccel mode */ |
|
1170 |
- if(options & CL_DB_HWACCEL) |
|
1169 |
+ /* FIXME: Add support in ncore mode */ |
|
1170 |
+ if(options & CL_DB_NCORE) |
|
1171 | 1171 |
skipped = 1; |
1172 | 1172 |
else |
1173 | 1173 |
ret = cli_loadndb(fd, engine, signo, 1, options); |
... | ... |
@@ -1179,8 +1179,8 @@ static int cli_load(const char *filename, struct cl_engine **engine, unsigned in |
1179 | 1179 |
ret = cli_loadmd(fd, engine, signo, 2, options); |
1180 | 1180 |
|
1181 | 1181 |
} else if(cli_strbcasestr(filename, ".hw")) { |
1182 |
-#ifdef HAVE_HWACCEL |
|
1183 |
- if(options & CL_DB_HWACCEL) |
|
1182 |
+#ifdef HAVE_NCORE |
|
1183 |
+ if(options & CL_DB_NCORE) |
|
1184 | 1184 |
ret = cli_loadhw(filename, engine, signo, options); |
1185 | 1185 |
else |
1186 | 1186 |
#endif |
... | ... |
@@ -1538,7 +1538,7 @@ void cl_free(struct cl_engine *engine) |
1538 | 1538 |
struct cli_md5_node *md5pt, *md5h; |
1539 | 1539 |
struct cli_meta_node *metapt, *metah; |
1540 | 1540 |
struct cli_matcher *root; |
1541 |
-#ifdef HAVE_HWACCEL |
|
1541 |
+#ifdef HAVE_NCORE |
|
1542 | 1542 |
int ret; |
1543 | 1543 |
#endif |
1544 | 1544 |
|
... | ... |
@@ -1564,8 +1564,8 @@ void cl_free(struct cl_engine *engine) |
1564 | 1564 |
pthread_mutex_unlock(&cli_ref_mutex); |
1565 | 1565 |
#endif |
1566 | 1566 |
|
1567 |
-#ifdef HAVE_HWACCEL |
|
1568 |
- if(engine->hwaccel) { |
|
1567 |
+#ifdef HAVE_NCORE |
|
1568 |
+ if(engine->ncore) { |
|
1569 | 1569 |
if((ret = sn_sigscan_closedb(engine->hwdb)) < 0) { |
1570 | 1570 |
cli_errmsg("cl_free: can't close hardware database: %d\n", ret); |
1571 | 1571 |
} |
... | ... |
@@ -86,7 +86,7 @@ struct cfgoption cfg_options[] = { |
86 | 86 |
{"AllowSupplementaryGroups", OPT_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM}, |
87 | 87 |
{"SelfCheck", OPT_NUM, 1800, NULL, 0, OPT_CLAMD}, |
88 | 88 |
{"VirusEvent", OPT_FULLSTR, -1, NULL, 0, OPT_CLAMD}, |
89 |
- {"HardwareAcceleration", OPT_BOOL, 0, NULL, 0, OPT_CLAMD}, |
|
89 |
+ {"NodalCoreAcceleration", OPT_BOOL, 0, NULL, 0, OPT_CLAMD}, |
|
90 | 90 |
{"ClamukoScanOnAccess", OPT_BOOL, 0, NULL, 0, OPT_CLAMD}, |
91 | 91 |
{"ClamukoScanOnOpen", OPT_BOOL, 0, NULL, 0, OPT_CLAMD}, |
92 | 92 |
{"ClamukoScanOnClose", OPT_BOOL, 0, NULL, 0, OPT_CLAMD}, |