Changeset 319 for clamav/trunk/clamd/clamukofs.c

Timestamp:

Apr 19, 2011, 11:12:07 PM (14 years ago)

Author:

Yuri Dario

Message:

clamav: update trunk to 0.97.

Location:

clamav/trunk

Files:

• . (modified) (1 prop)
• clamd/clamukofs.c (modified) (4 diffs)

clamav/trunk/clamd/clamukofs.c ¶

@@ -42 +42 @@
 #include "dazukofs.h"
 #include "clamuko.h"
+#include "scanner.h"
 
 static pthread_mutex_t running_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -84 +85 @@
         struct thrarg *tharg = (struct thrarg *) arg;
         sigset_t sigset;
-        unsigned int sizelimit = 0, virsize;
+        unsigned int sizelimit = 0;
         struct stat sb;
         dazukofs_handle_t scan_hndl;
@@ -91 +92 @@
         int skip_scan = 0, extinfo;
         const char *virname;
-        char filename[4096], virhash[33];
+        char filename[4096];
+        struct cb_context context;
 
     /* ignore all signals */
@@ -152 +154 @@
         }
 
+        context.filename = NULL;
+        context.virsize = 0;
         if(skip_scan) {
             acc.deny = 0;
             /* reset skip flag */
             skip_scan = 0;
-        } else if(cli_scandesc_stats(acc.fd, &virname, virhash, &virsize, NULL, tharg->engine,
-                              tharg->options) == CL_VIRUS) {
+        } else if(cl_scandesc_callback(acc.fd, &virname, NULL, tharg->engine,
+                              tharg->options, &context) == CL_VIRUS) {
             dazukofs_get_filename(&acc, filename, sizeof(filename));
-            if(extinfo && virsize)
-                logg("Clamuko: %s: %s(%s:%u) FOUND\n", filename, virname, virhash, virsize);
+            if(context.virsize)
+                detstats_add(virname, filename, context.virsize, context.virhash);
+            if(extinfo && context.virsize)
+                logg("Clamuko: %s: %s(%s:%llu) FOUND\n", filename, virname, context.virhash, context.virsize);
             else
                 logg("Clamuko: %s: %s FOUND\n", filename, virname);