pbx_spool: Set AST_OUTGOING_ATTEMPT variable on channel

Set a variable on the channel that indicates which attempt number we
are currently performing to allow for attempt-specific behavior.

ASTERISK-26568 #close
Reported by: Roman Shubovich

Change-Id: Iacd7e8d43b0ed5b6cb021c62f41f1a1f5733dd89

diff --git a/CHANGES b/CHANGES
index 371e9e14249dd2fb44b91dc5c716737f1667900b..2a4f6584ac7d12d87250cb9dd1ddc12d19f9daac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -79,6 +79,12 @@ app_queue
  * Add 'QueueUpdate' application which can be used to track outbound calls
    using app_queue.
 
+pbx_spool
+------------------
+ * Asterisk will now set the AST_OUTGOING_ATTEMPT channel variable so that
+   attempt-specific behavior is possible. This is a 1-based number that
+   simply increases by 1 for each attempt.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 14.3.0 to Asterisk 14.4.0 ------------
 ------------------------------------------------------------------------------

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 0c6c401cebdffb4ef9b7bd03a84d6bc53a553683..644347fcb86cd741862f600ce8db619273ef7039 100644 (file)
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -161,6 +161,19 @@ static struct outgoing *new_outgoing(const char *fn)
        return o;
 }
 
+static void append_variable(struct outgoing *o, const char *name, const char *value)
+{
+       struct ast_variable *var = ast_variable_new(name, value, o->fn);
+
+       if (!var) {
+               return;
+       }
+
+       /* Always insert at the end, because some people want to treat the spool
+        * file as a script */
+       ast_variable_list_append(&o->vars, var);
+}
+
 static void parse_line(char *line, unsigned int lineno, struct outgoing *o)
 {
        char *c;
@@ -261,20 +274,7 @@ static void parse_line(char *line, unsigned int lineno, struct outgoing *o)
 
                strsep(&c2, "=");
                if (c2) {
-                       struct ast_variable *var = ast_variable_new(c, c2, o->fn);
-
-                       if (var) {
-                               /*
-                                * Always insert at the end, because some people
-                                * want to treat the spool file as a script
-                                */
-                               struct ast_variable **tail = &o->vars;
-
-                               while (*tail) {
-                                       tail = &(*tail)->next;
-                               }
-                               *tail = var;
-                       }
+                       append_variable(o, c, c2);
                } else {
                        ast_log(LOG_WARNING, "Malformed \"%s\" argument.  Should be \"%s: variable=value\"\n", line, line);
                }
@@ -328,6 +328,11 @@ static int apply_outgoing(struct outgoing *o, FILE *f)
                        "along with tech and dest in file %s\n", o->fn);
                return -1;
        }
+
+       if (snprintf(buf, sizeof(buf), "%d", o->retries + 1) < sizeof(buf)) {
+               append_variable(o, "AST_OUTGOING_ATTEMPT", buf);
+       }
+
        return 0;
 }