[asterisk-commits] tilghman: trunk r285390 - in /trunk: ./ pbx/pbx_spool.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Sep  7 16:21:00 2010
New Revision: 285390

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285390
Log:
Merged revisions 285386 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285386 | tilghman | 2010-09-07 16:20:16 -0500 (Tue, 07 Sep 2010) | 13 lines
  
  Don't notify on attribute changes, and change how the queuing mechanism works.
  
  Fixes call spools in 1.8.
  
  (closes issue #17337)
   Reported by: loloski
   Patches: 
         20100827__issue17337.diff.txt uploaded by tilghman (license 14)
  
  (closes issue #17924)
   Reported by: mkeuter
   Tested by: mkeuter
........

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_spool.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/pbx/pbx_spool.c
URL: http://svnview.digium.com/svn/asterisk/trunk/pbx/pbx_spool.c?view=diff&rev=285390&r1=285389&r2=285390
==============================================================================
--- trunk/pbx/pbx_spool.c (original)
+++ trunk/pbx/pbx_spool.c Tue Sep  7 16:21:00 2010
@@ -372,6 +372,7 @@
 	}
 }
 
+/* Called from scan_thread or queue_file */
 static int scan_service(const char *fn, time_t now)
 {
 	struct outgoing *o = NULL;
@@ -551,7 +552,7 @@
 	}
 
 #ifdef HAVE_INOTIFY
-	inotify_add_watch(inotify_fd, qdir, IN_CREATE | IN_ATTRIB | IN_MOVED_TO);
+	inotify_add_watch(inotify_fd, qdir, IN_CREATE | IN_MOVED_TO);
 #endif
 
 	/* First, run through the directory and clear existing entries */
@@ -590,8 +591,16 @@
 			/* When a file arrives, add it to the queue, in mtime order. */
 			if ((res = poll(&pfd, 1, waittime)) > 0 && (stage = 1) &&
 				(res = read(inotify_fd, &buf, sizeof(buf))) >= sizeof(buf.iev)) {
-				/* File added to directory, add it to my list */
-				queue_file(buf.iev.name, 0);
+				/* File(s) added to directory, add them to my list */
+				do {
+					queue_file(buf.iev.name, 0);
+					res -= sizeof(buf.iev) + buf.iev.len;
+					if (res >= sizeof(buf.iev)) {
+						memmove(&buf.iev, &buf.iev.name[buf.iev.len], res);
+						continue;
+					}
+					break;
+				} while (1);
 			} else if (res < 0 && errno != EINTR && errno != EAGAIN) {
 				ast_debug(1, "Got an error back from %s(2): %s\n", stage ? "read" : "poll", strerror(errno));
 			}