@@ -76,9 +76,10 @@ static int onas_send_stream(CURL *curl, const char *filename, int fd, int64_t ti

 {

     uint32_t buf[BUFSIZ / sizeof(uint32_t)];

     uint64_t len;

-    uint64_t todo  = maxstream;

     int ret        = 1;

     int close_flag = 0;

+    STATBUF statbuf;

+    uint64_t bytesRead = 0;

     if (-1 == fd) {

         if (NULL == filename) {

@@ -94,30 +95,51 @@ static int onas_send_stream(CURL *curl, const char *filename, int fd, int64_t ti

         }

     }

+    if (FSTAT(fd, &statbuf)){

+        logg("!onas_send_stream: Invalid args, bad file descriptor.\n");

+        ret = -1;

+        goto strm_out;

+    }

+

+    if (S_ISDIR(statbuf.st_mode)){

+        ret = 0;

+        goto strm_out;

+    }

+

+    if ((uint64_t) statbuf.st_size > maxstream){

+        ret = 0;

+        goto strm_out;

+    }

+

     if (onas_sendln(curl, "zINSTREAM", 10, timeout)) {

         ret = -1;

         goto strm_out;

     }

-    while ((len = read(fd, &buf[1], sizeof(buf) - sizeof(uint32_t))) > 0) {

-        if ((uint64_t)len > todo) len = todo;

-        buf[0] = htonl(len);

-        if (onas_sendln(curl, (const char *)buf, len + sizeof(uint32_t), timeout)) {

+    len = statbuf.st_size;

+    buf[0] = htonl(len);

+    if (onas_sendln(curl, (const char *) buf, sizeof(uint32_t), timeout)){

+        ret = -1;

+        goto strm_out;

+    }

+

+    while (bytesRead < len){

+        ssize_t ret = read(fd, buf, sizeof(buf));

+        if (ret < 0){

+            logg("!Failed to read from %s.\n", filename ? filename : "FD");

             ret = -1;

             goto strm_out;

-        }

-        todo -= len;

-        if (!todo) {

-            len = 0;

+        } else if (0 == ret){

             break;

         }

-    }

+        bytesRead += ret;

-    if (len) {

-        logg("!Failed to read from %s.\n", filename ? filename : "FD");

-        ret = -1;

-        goto strm_out;

+        if (onas_sendln(curl, (const char *) buf, ret, timeout)) {

+            ret = -1;

+            goto strm_out;

+        }

     }

+

     *buf = 0;

     onas_sendln(curl, (const char *)buf, 4, timeout);

@@ -72,6 +72,7 @@ static int onas_ddd_unwatch_hierarchy(const char *pathname, size_t len, int fd,

 static void onas_ddd_handle_in_moved_to(struct onas_context *ctx, const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask);

 static void onas_ddd_handle_in_create(struct onas_context *ctx, const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask);

+static void onas_ddd_handle_in_close_write(struct onas_context *ctx, const char *child_path);

 static void onas_ddd_handle_in_moved_from(struct onas_context *ctx, const char *path, const char *child_path, const struct inotify_event *event, int wd);

 static void onas_ddd_handle_in_delete(struct onas_context *ctx, const char *path, const char *child_path, const struct inotify_event *event, int wd);

 static void onas_ddd_handle_extra_scanning(struct onas_context *ctx, const char *pathname, int extra_options);

@@ -363,7 +364,7 @@ void *onas_ddd_th(void *arg)

     const struct optstruct *pt;

     const struct optstruct *pt_tmpdir;

     const char *clamd_tmpdir;

-    uint64_t in_mask = IN_ONLYDIR | IN_MOVE | IN_DELETE | IN_CREATE;

+    uint64_t in_mask = IN_ONLYDIR | IN_MOVE | IN_DELETE | IN_CREATE | IN_CLOSE_WRITE;

     fd_set rfds;

     char buf[4096];

     ssize_t bread;

@@ -659,6 +660,9 @@ void *onas_ddd_th(void *arg)

                 } else if (event->mask & IN_CREATE) {

                     onas_ddd_handle_in_create(ctx, path, child_path, event, wd, in_mask);

+                } else if (event->mask & IN_CLOSE_WRITE) {

+                    onas_ddd_handle_in_close_write(ctx, child_path);

+

                 } else if (event->mask & IN_MOVED_TO) {

                     onas_ddd_handle_in_moved_to(ctx, path, child_path, event, wd, in_mask);

                 }

@@ -708,26 +712,29 @@ static void onas_ddd_handle_in_create(struct onas_context *ctx,

                                       const char *path, const char *child_path, const struct inotify_event *event, int wd, uint64_t in_mask)

 {

+    if (!(event->mask & IN_ISDIR)){

+        return;

+    }

+

+    if (optget(ctx->clamdopts, "OnAccessExtraScanning")->enabled) {

+        logg("*ClamInotif: CREATE - adding %s to %s with wd:%d\n", child_path, path, wd);

+        onas_ddd_handle_extra_scanning(ctx, child_path, ONAS_SCTH_B_DIR);

+    }

+

+    onas_ht_add_hierarchy(ddd_ht, child_path);

+    onas_ddd_watch(child_path, ctx->fan_fd, ctx->fan_mask, onas_in_fd, in_mask);

+

+    return;

+}

+

+static void onas_ddd_handle_in_close_write(struct onas_context *ctx, const char *child_path)

+{

     struct stat s;

     if (optget(ctx->clamdopts, "OnAccessExtraScanning")->enabled) {

         if (stat(child_path, &s) == 0 && S_ISREG(s.st_mode)) {

             onas_ddd_handle_extra_scanning(ctx, child_path, ONAS_SCTH_B_FILE);

-

-        } else if (event->mask & IN_ISDIR) {

-            logg("*ClamInotif: CREATE - adding %s to %s with wd:%d\n", child_path, path, wd);

-            onas_ddd_handle_extra_scanning(ctx, child_path, ONAS_SCTH_B_DIR);

-

-            onas_ht_add_hierarchy(ddd_ht, child_path);

-            onas_ddd_watch(child_path, ctx->fan_fd, ctx->fan_mask, onas_in_fd, in_mask);

         }

-    } else {

-        if (stat(child_path, &s) == 0 && S_ISREG(s.st_mode)) return;

-        if (!(event->mask & IN_ISDIR)) return;

-

-        logg("*ClamInotif: MOVED_TO - adding %s to %s with wd:%d\n", child_path, path, wd);

-        onas_ht_add_hierarchy(ddd_ht, child_path);

-        onas_ddd_watch(child_path, ctx->fan_fd, ctx->fan_mask, onas_in_fd, in_mask);

     }

     return;