Merged revisions 72806 via svnmerge from
[asterisk/asterisk.git] / pbx / pbx_spool.c
index eb40500..6c045d3 100644 (file)
@@ -166,11 +166,11 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
                                printf("'%s' is '%s' at line %d\n", buf, c, lineno);
 #endif
                                if (!strcasecmp(buf, "channel")) {
-                                       strncpy(o->tech, c, sizeof(o->tech) - 1);
+                                       ast_copy_string(o->tech, c, sizeof(o->tech));
                                        if ((c2 = strchr(o->tech, '/'))) {
                                                *c2 = '\0';
                                                c2++;
-                                               strncpy(o->dest, c2, sizeof(o->dest) - 1);
+                                               ast_copy_string(o->dest, c2, sizeof(o->dest));
                                        } else {
                                                ast_log(LOG_NOTICE, "Channel should be in form Tech/Dest at line %d of %s\n", lineno, fn);
                                                o->tech[0] = '\0';
@@ -178,18 +178,18 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
                                } else if (!strcasecmp(buf, "callerid")) {
                                        ast_callerid_split(c, o->cid_name, sizeof(o->cid_name), o->cid_num, sizeof(o->cid_num));
                                } else if (!strcasecmp(buf, "application")) {
-                                       strncpy(o->app, c, sizeof(o->app) - 1);
+                                       ast_copy_string(o->app, c, sizeof(o->app));
                                } else if (!strcasecmp(buf, "data")) {
-                                       strncpy(o->data, c, sizeof(o->data) - 1);
+                                       ast_copy_string(o->data, c, sizeof(o->data));
                                } else if (!strcasecmp(buf, "maxretries")) {
                                        if (sscanf(c, "%d", &o->maxretries) != 1) {
                                                ast_log(LOG_WARNING, "Invalid max retries at line %d of %s\n", lineno, fn);
                                                o->maxretries = 0;
                                        }
                                } else if (!strcasecmp(buf, "context")) {
-                                       strncpy(o->context, c, sizeof(o->context) - 1);
+                                       ast_copy_string(o->context, c, sizeof(o->context));
                                } else if (!strcasecmp(buf, "extension")) {
-                                       strncpy(o->exten, c, sizeof(o->exten) - 1);
+                                       ast_copy_string(o->exten, c, sizeof(o->exten));
                                } else if (!strcasecmp(buf, "priority")) {
                                        if ((sscanf(c, "%d", &o->priority) != 1) || (o->priority < 1)) {
                                                ast_log(LOG_WARNING, "Invalid priority at line %d of %s\n", lineno, fn);
@@ -240,7 +240,7 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
                                ast_log(LOG_NOTICE, "Syntax error at line %d of %s\n", lineno, fn);
                }
        }
-       strncpy(o->fn, fn, sizeof(o->fn) - 1);
+       ast_copy_string(o->fn, fn, sizeof(o->fn));
        if (ast_strlen_zero(o->tech) || ast_strlen_zero(o->dest) || (ast_strlen_zero(o->app) && ast_strlen_zero(o->exten))) {
                ast_log(LOG_WARNING, "At least one of app or extension must be specified, along with tech and dest in file %s\n", fn);
                return -1;
@@ -257,7 +257,7 @@ static void safe_append(struct outgoing *o, time_t now, char *s)
        if (fd > -1) {
                f = fdopen(fd, "a");
                if (f) {
-                       fprintf(f, "%s: %ld %d (%ld)\n", s, (long)ast_mainpid, o->retries, (long) now);
+                       fprintf(f, "\n%s: %ld %d (%ld)\n", s, (long)ast_mainpid, o->retries, (long) now);
                        fclose(f);
                } else
                        close(fd);
@@ -294,7 +294,7 @@ static int remove_from_queue(struct outgoing *o, const char *status)
                unlink(o->fn);
                return 0;
        }
-       if (mkdir(qdonedir, 0700) && (errno != EEXIST)) {
+       if (ast_mkdir(qdonedir, 0777)) {
                ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool archiving disabled\n", qdonedir);
                unlink(o->fn);
                return -1;
@@ -359,11 +359,9 @@ static void *attempt_thread(void *data)
 static void launch_service(struct outgoing *o)
 {
        pthread_t t;
-       pthread_attr_t attr;
        int ret;
-       pthread_attr_init(&attr);
-       pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-       if ((ret = ast_pthread_create(&t,&attr,attempt_thread, o)) != 0) {
+
+       if ((ret = ast_pthread_create_detached(&t, NULL, attempt_thread, o))) {
                ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
                free_outgoing(o);
        }
@@ -387,8 +385,8 @@ static int scan_service(char *fn, time_t now, time_t atime)
                                        now += o->retrytime;
                                        if (o->callingpid && (o->callingpid == ast_mainpid)) {
                                                safe_append(o, time(NULL), "DelayedRetry");
-                                               free_outgoing(o);
                                                ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn);
+                                               free_outgoing(o);
                                        } else {
                                                /* Increment retries */
                                                o->retries++;
@@ -403,20 +401,20 @@ static int scan_service(char *fn, time_t now, time_t atime)
                                        return now;
                                } else {
                                        ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt%s\n", o->tech, o->dest, o->retries - 1, ((o->retries - 1) != 1) ? "s" : "");
-                                       free_outgoing(o);
                                        remove_from_queue(o, "Expired");
+                                       free_outgoing(o);
                                        return 0;
                                }
                        } else {
+                               remove_from_queue(o, "Failed");
                                free_outgoing(o);
                                ast_log(LOG_WARNING, "Invalid file contents in %s, deleting\n", fn);
                                fclose(f);
-                               remove_from_queue(o, "Failed");
                        }
                } else {
+                       remove_from_queue(o, "Failed");
                        free_outgoing(o);
                        ast_log(LOG_WARNING, "Unable to open %s: %s, deleting\n", fn, strerror(errno));
-                       remove_from_queue(o, "Failed");
                }
        } else
                ast_log(LOG_WARNING, "Out of memory :(\n");
@@ -477,39 +475,28 @@ static void *scan_thread(void *unused)
        return NULL;
 }
 
-static int unload_module(void *mod)
+static int unload_module(void)
 {
        return -1;
 }
 
-static int load_module(void *mod)
+static int load_module(void)
 {
        pthread_t thread;
-       pthread_attr_t attr;
        int ret;
        snprintf(qdir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing");
-       if (mkdir(qdir, 0700) && (errno != EEXIST)) {
+       if (ast_mkdir(qdir, 0777)) {
                ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool disabled\n", qdir);
                return 0;
        }
        snprintf(qdonedir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing_done");
-       pthread_attr_init(&attr);
-       pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-       if ((ret = ast_pthread_create(&thread,&attr,scan_thread, NULL)) != 0) {
+
+       if ((ret = ast_pthread_create_detached_background(&thread, NULL, scan_thread, NULL))) {
                ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
                return -1;
        }
-       return 0;
-}
-
-static const char *description(void)
-{
-       return "Outgoing Spool Support";
-}
 
-static const char *key(void)
-{
-       return ASTERISK_GPL_KEY;
+       return 0;
 }
 
-STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Outgoing Spool Support");