[svn-commits] qwell: branch qwell/ari-originate2 r391829 - in /team/qwell/ari-originate2: r...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jun 14 11:52:22 CDT 2013
Author: qwell
Date: Fri Jun 14 11:52:20 2013
New Revision: 391829
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391829
Log:
take 1
Modified:
team/qwell/ari-originate2/res/res_stasis_http_channels.c
team/qwell/ari-originate2/res/stasis_http/resource_channels.c
team/qwell/ari-originate2/res/stasis_http/resource_channels.h
team/qwell/ari-originate2/rest-api/api-docs/channels.json
Modified: team/qwell/ari-originate2/res/res_stasis_http_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/ari-originate2/res/res_stasis_http_channels.c?view=diff&rev=391829&r1=391828&r2=391829
==============================================================================
--- team/qwell/ari-originate2/res/res_stasis_http_channels.c (original)
+++ team/qwell/ari-originate2/res/res_stasis_http_channels.c Fri Jun 14 11:52:20 2013
@@ -83,17 +83,20 @@
if (strcmp(i->name, "context") == 0) {
args.context = (i->value);
} else
+ if (strcmp(i->name, "priority") == 0) {
+ args.priority = atol(i->value);
+ } else
+ if (strcmp(i->name, "app") == 0) {
+ args.app = (i->value);
+ } else
+ if (strcmp(i->name, "appArgs") == 0) {
+ args.app_args = (i->value);
+ } else
if (strcmp(i->name, "callerId") == 0) {
args.caller_id = (i->value);
} else
if (strcmp(i->name, "timeout") == 0) {
args.timeout = atoi(i->value);
- } else
- if (strcmp(i->name, "app") == 0) {
- args.app = (i->value);
- } else
- if (strcmp(i->name, "appArgs") == 0) {
- args.app_args = (i->value);
} else
{}
}
Modified: team/qwell/ari-originate2/res/stasis_http/resource_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/ari-originate2/res/stasis_http/resource_channels.c?view=diff&rev=391829&r1=391828&r2=391829
==============================================================================
--- team/qwell/ari-originate2/res/stasis_http/resource_channels.c (original)
+++ team/qwell/ari-originate2/res/stasis_http/resource_channels.c Fri Jun 14 11:52:20 2013
@@ -323,19 +323,6 @@
char *cid_name = NULL;
int timeout = 30000;
- const char *app = "Stasis";
- RAII_VAR(struct ast_str *, appdata, ast_str_create(64), ast_free);
-
- if (!appdata) {
- stasis_http_response_alloc_failed(response);
- return;
- }
-
- ast_str_set(&appdata, 0, "%s", args->app);
- if (!ast_strlen_zero(args->app_args)) {
- ast_str_append(&appdata, 0, ",%s", args->app_args);
- }
-
if (args->timeout > 0) {
timeout = args->timeout * 1000;
} else if (args->timeout == -1) {
@@ -351,15 +338,11 @@
dialtech = tmp;
ast_copy_string(dialdevice, stuff, sizeof(dialdevice));
}
- } else if (!ast_strlen_zero(args->extension) && !ast_strlen_zero(args->context)) {
- dialtech = "Local";
- snprintf(dialdevice, sizeof(dialdevice), "%s@%s", args->extension, args->context);
}
if (ast_strlen_zero(dialtech) || ast_strlen_zero(dialdevice)) {
- stasis_http_response_error(
- response, 500, "Internal server error",
- "Invalid endpoint or extension and context specified");
+ stasis_http_response_error(response, 500, "Internal server error",
+ "Invalid endpoint specified");
return;
}
@@ -372,11 +355,35 @@
}
}
- ast_debug(1, "Dialing %s/%s\n", dialtech, dialdevice);
-
- /* originate a channel, putting it into an application */
- if (ast_pbx_outgoing_app(dialtech, NULL, dialdevice, timeout, app, ast_str_buffer(appdata), NULL, 0, cid_num, cid_name, NULL, NULL, NULL)) {
- stasis_http_response_alloc_failed(response);
+ if (!ast_strlen_zero(args->app)) {
+ const char *app = "Stasis";
+
+ RAII_VAR(struct ast_str *, appdata, ast_str_create(64), ast_free);
+
+ if (!appdata) {
+ stasis_http_response_alloc_failed(response);
+ return;
+ }
+
+ ast_str_set(&appdata, 0, "%s", args->app);
+ if (!ast_strlen_zero(args->app_args)) {
+ ast_str_append(&appdata, 0, ",%s", args->app_args);
+ }
+
+ /* originate a channel, putting it into an application */
+ if (ast_pbx_outgoing_app(dialtech, NULL, dialdevice, timeout, app, ast_str_buffer(appdata), NULL, 0, cid_num, cid_name, NULL, NULL, NULL)) {
+ stasis_http_response_alloc_failed(response);
+ return;
+ }
+ } else if (!ast_strlen_zero(args->extension)) {
+ /* originate a channel, sending it to an extension */
+ if (ast_pbx_outgoing_exten(dialtech, NULL, dialdevice, timeout, S_OR(args->context, "default"), args->extension, args->priority ? args->priority : 1, NULL, 0, cid_num, cid_name, NULL, NULL, NULL, 0)) {
+ stasis_http_response_alloc_failed(response);
+ return;
+ }
+ } else {
+ stasis_http_response_error(response, 500, "Internal server error",
+ "Application or extension must be specified");
return;
}
Modified: team/qwell/ari-originate2/res/stasis_http/resource_channels.h
URL: http://svnview.digium.com/svn/asterisk/team/qwell/ari-originate2/res/stasis_http/resource_channels.h?view=diff&rev=391829&r1=391828&r2=391829
==============================================================================
--- team/qwell/ari-originate2/res/stasis_http/resource_channels.h (original)
+++ team/qwell/ari-originate2/res/stasis_http/resource_channels.h Fri Jun 14 11:52:20 2013
@@ -52,20 +52,22 @@
void stasis_http_get_channels(struct ast_variable *headers, struct ast_get_channels_args *args, struct stasis_http_response *response);
/*! \brief Argument struct for stasis_http_originate() */
struct ast_originate_args {
- /*! \brief Endpoint to call. If not specified, originate is routed via dialplan */
+ /*! \brief Endpoint to call. */
const char *endpoint;
- /*! \brief When routing via dialplan, the extension to dial */
+ /*! \brief The extension to dial after the endpoint answers */
const char *extension;
- /*! \brief When routing via dialplan, the context to use. If omitted, uses 'default' */
+ /*! \brief The context to dial after the endpoint answers. If omitted, uses 'default' */
const char *context;
+ /*! \brief The priority to dial after the endpoint answers. If omitted, uses 1 */
+ long priority;
+ /*! \brief The application name to pass to the Stasis application. */
+ const char *app;
+ /*! \brief The application arguments to pass to the Stasis application. */
+ const char *app_args;
/*! \brief CallerID to use when dialing the endpoint or extension. */
const char *caller_id;
/*! \brief Timeout (in seconds) before giving up dialing, or -1 for no timeout. */
int timeout;
- /*! \brief Application name to pass to the Stasis application. */
- const char *app;
- /*! \brief Application arguments to pass to the Stasis application. */
- const char *app_args;
};
/*!
* \brief Create a new channel (originate).
Modified: team/qwell/ari-originate2/rest-api/api-docs/channels.json
URL: http://svnview.digium.com/svn/asterisk/team/qwell/ari-originate2/rest-api/api-docs/channels.json?view=diff&rev=391829&r1=391828&r2=391829
==============================================================================
--- team/qwell/ari-originate2/rest-api/api-docs/channels.json (original)
+++ team/qwell/ari-originate2/rest-api/api-docs/channels.json Fri Jun 14 11:52:20 2013
@@ -25,15 +25,15 @@
"parameters": [
{
"name": "endpoint",
- "description": "Endpoint to call. If not specified, originate is routed via dialplan",
- "paramType": "query",
- "required": false,
+ "description": "Endpoint to call.",
+ "paramType": "query",
+ "required": true,
"allowMultiple": false,
"dataType": "string"
},
{
"name": "extension",
- "description": "When routing via dialplan, the extension to dial",
+ "description": "The extension to dial after the endpoint answers",
"paramType": "query",
"required": false,
"allowMultiple": false,
@@ -41,7 +41,31 @@
},
{
"name": "context",
- "description": "When routing via dialplan, the context to use. If omitted, uses 'default'",
+ "description": "The context to dial after the endpoint answers. If omitted, uses 'default'",
+ "paramType": "query",
+ "required": false,
+ "allowMultiple": false,
+ "dataType": "string"
+ },
+ {
+ "name": "priority",
+ "description": "The priority to dial after the endpoint answers. If omitted, uses 1",
+ "paramType": "query",
+ "required": false,
+ "allowMultiple": false,
+ "dataType": "long"
+ },
+ {
+ "name": "app",
+ "description": "The application name to pass to the Stasis application.",
+ "paramType": "query",
+ "required": false,
+ "allowMultiple": false,
+ "dataType": "string"
+ },
+ {
+ "name": "appArgs",
+ "description": "The application arguments to pass to the Stasis application.",
"paramType": "query",
"required": false,
"allowMultiple": false,
@@ -63,22 +87,6 @@
"allowMultiple": false,
"dataType": "int",
"defaultValue": 30
- },
- {
- "name": "app",
- "description": "Application name to pass to the Stasis application.",
- "paramType": "query",
- "required": true,
- "allowMultiple": false,
- "dataType": "string"
- },
- {
- "name": "appArgs",
- "description": "Application arguments to pass to the Stasis application.",
- "paramType": "query",
- "required": false,
- "allowMultiple": false,
- "dataType": "string"
}
]
}
More information about the svn-commits
mailing list