ari: Provide the caller ID RDNIS for the channels

Provide the caller ID RDNIS when available. This will allow an
application to follow the redirect.

diff --git a/main/stasis_channels.c b/main/stasis_channels.c
index 97024ea4df0489d7bba472c2b35f44f8e9ee8533..e37c5ca5c3275029bea17481e43ad9543c9572a9 100644 (file)
--- a/main/stasis_channels.c
+++ b/main/stasis_channels.c
@@ -1323,6 +1323,10 @@ struct ast_json *ast_channel_snapshot_to_json(
                "creationtime", ast_json_timeval(snapshot->base->creationtime, NULL),
                "language", snapshot->base->language);
 
+       if (!ast_strlen_zero(snapshot->caller->rdnis)) {
+               ast_json_object_set(json_chan, "caller_rdnis", ast_json_string_create(snapshot->caller->rdnis));
+       }
+
        if (snapshot->ari_vars && !AST_LIST_EMPTY(snapshot->ari_vars)) {
                ast_json_object_set(json_chan, "channelvars", ast_json_channel_vars(snapshot->ari_vars));
        }

diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c
index fffb87a1624f047c3afe8c71414d44a0c04a73b4..a5ba5cc768d134555d223453bb10340ae582de6f 100644 (file)
--- a/res/ari/ari_model_validators.c
+++ b/res/ari/ari_model_validators.c
@@ -1067,6 +1067,15 @@ int ast_ari_validate_channel(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("caller_rdnis", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Channel field caller_rdnis failed validation\n");
+                               res = 0;
+                       }
+               } else
                if (strcmp("channelvars", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
                        prop_is_valid = ast_ari_validate_object(

diff --git a/res/ari/ari_model_validators.h b/res/ari/ari_model_validators.h
index 64f167c07cdc1dd20994636980ba16fd055c2a36..f350c8de33c8455c29c75e48244a28b6fee4ad53 100644 (file)
--- a/res/ari/ari_model_validators.h
+++ b/res/ari/ari_model_validators.h
@@ -1346,6 +1346,7 @@ ari_validator ast_ari_validate_application_fn(void);
  * Channel
  * - accountcode: string (required)
  * - caller: CallerID (required)
+ * - caller_rdnis: string
  * - channelvars: object
  * - connected: CallerID (required)
  * - creationtime: Date (required)

diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json
index e3b4fcbbbadb2f4e303952183b9decc98a190b59..90658039685b456ba6c11dec5ebd1f8a85b05901 100644 (file)
--- a/rest-api/api-docs/channels.json
+++ b/rest-api/api-docs/channels.json
@@ -2187,6 +2187,10 @@
                                        "required": false,
                                        "type": "object",
                                        "description": "Channel variables"
+                               },
+                               "caller_rdnis": {
+                                       "type": "string",
+                                       "description": "The Caller ID RDNIS"
                                }
                        }
                }