@@ -1,3 +1,7 @@

+Sun Nov 13 03:05:52 CET 2005 (tk)

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

+  * libclamav: prepare for hardware acceleration

+

 Sat Nov 12 02:25:03 CET 2005 (tk)

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

   * libclamav/readdb.c: add cl_load(), successor of cl_loaddb and cl_loaddbdir

@@ -63,6 +63,9 @@ extern "C"

 #define CL_EIO		-12 /* general I/O error */

 #define CL_EFORMAT	-13 /* bad format or broken file */

+/* db options */

+#define CL_DB_HWACCEL		1

+

 /* scan options */

 #define CL_SCAN_RAW		0

 #define CL_SCAN_ARCHIVE		1

@@ -142,6 +145,7 @@ struct cli_matcher {

 struct cl_engine {

     unsigned int refcount; /* reference counter */

+    unsigned short hwaccel;

     /* Roots table */

     struct cli_matcher **root;

@@ -199,6 +203,7 @@ extern const char *cl_retver(void);

 /* database */

 extern int cl_loaddb(const char *filename, struct cl_engine **engine, unsigned int *signo);

 extern int cl_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo);

+extern int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, unsigned int options);

 extern const char *cl_retdbdir(void);

 extern struct cl_engine *cl_dup(struct cl_engine *engine);

@@ -286,7 +286,14 @@ int cli_addtypesigs(struct cl_engine *engine)

 	    cli_errmsg("cli_addtypesigs: Can't initialise AC pattern matcher\n");

 	    return CL_EMEM;

 	}

-	root->ac_depth = AC_DEFAULT_DEPTH;

+

+	if(engine->hwaccel) {

+	    cli_dbgmsg("cli_addtypesigs: AC depth 10 (hwaccel mode)\n");

+	    root->ac_depth = 10;

+	} else {

+	    root->ac_depth = AC_DEFAULT_DEPTH;

+	}

+

 	root->ac_root =  (struct cli_ac_node *) cli_calloc(1, sizeof(struct cli_ac_node));

 	if(!root->ac_root) {

 	    cli_errmsg("cli_addtypesigs: Can't initialise AC pattern matcher\n");

@@ -1056,6 +1056,7 @@ int cl_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *s

 int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, unsigned int options)

 {

 	struct stat sb;

+	int ret;

     if(stat(path, &sb) == -1) {

@@ -1063,7 +1064,19 @@ int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, un

         return CL_EIO;

     }

-    switch(sb.st_mode & S_IFMT) {

+    if((ret = cli_initengine(engine))) {

+	cl_free(*engine);

+	return ret;

+    }

+

+    if(options & CL_DB_HWACCEL) {

+	(*engine)->hwaccel = 1;

+

+	/* load hw db  */

+

+	return 0;

+

+    } else switch(sb.st_mode & S_IFMT) {

 	case S_IFREG: 

 	    return cli_load(path, engine, signo, options);