kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "pbx/pbx_spool: Fix issue when call files were executed too early"

Browse Source
This commit is contained in:
Joshua Colp
2015-05-12 05:06:23 -05:00
committed by Gerrit Code Review
parent 4f84142c94 e6ebddd9ae
commit 9bb9d22563
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pbx/pbx_spool.c
View File

@@ -102,6 +102,14 @@ struct outgoing {
};
#if defined(HAVE_INOTIFY) || defined(HAVE_KQUEUE)
struct direntry {
AST_LIST_ENTRY(direntry) list;
time_t mtime;
char name[0];
};
static AST_LIST_HEAD_STATIC(dirlist, direntry);
static void queue_file(const char *filename, time_t when);
#endif
@@ -323,6 +331,10 @@ static int remove_from_queue(struct outgoing *o, const char *status)
char newfn[256];
const char *bname;
#if defined(HAVE_INOTIFY) || defined(HAVE_KQUEUE)
struct direntry *cur;
#endif
if (!ast_test_flag(&o->options, SPOOL_FLAG_ALWAYS_DELETE)) {
struct stat current_file_status;
@@ -333,6 +345,19 @@ static int remove_from_queue(struct outgoing *o, const char *status)
}
}
#if defined(HAVE_INOTIFY) || defined(HAVE_KQUEUE)
AST_LIST_LOCK(&dirlist);
AST_LIST_TRAVERSE_SAFE_BEGIN(&dirlist, cur, list) {
if (!strcmp(cur->name, o->fn)) {
AST_LIST_REMOVE_CURRENT(list);
ast_free(cur);
break;
}
}
AST_LIST_TRAVERSE_SAFE_END;
AST_LIST_UNLOCK(&dirlist);
#endif
if (!ast_test_flag(&o->options, SPOOL_FLAG_ARCHIVE)) {
unlink(o->fn);
return 0;
@@ -486,14 +511,6 @@ static int scan_service(const char *fn, time_t now)
return 0;
}
#if defined(HAVE_INOTIFY) || defined(HAVE_KQUEUE)
struct direntry {
AST_LIST_ENTRY(direntry) list;
time_t mtime;
char name[0];
};
static AST_LIST_HEAD_STATIC(dirlist, direntry);
#if defined(HAVE_INOTIFY)
/* Only one thread is accessing this list, so no lock is necessary */
@@ -501,6 +518,8 @@ static AST_LIST_HEAD_NOLOCK_STATIC(createlist, direntry);
static AST_LIST_HEAD_NOLOCK_STATIC(openlist, direntry);
#endif
#if defined(HAVE_INOTIFY) || defined(HAVE_KQUEUE)
static void queue_file(const char *filename, time_t when)
{
struct stat st;