kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up app_page

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-12-20 04:32:59 +00:00
parent e54265a914
commit 1546495afc
1 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
apps/app_page.c
View File

@@ -88,9 +88,12 @@ struct calloutdata {
static void *page_thread(void *data) static void *page_thread(void *data)
{ {
struct calloutdata *cd = data; struct calloutdata *cd = data;
ast_pbx_outgoing_app(cd->tech, AST_FORMAT_SLINEAR, cd->resource, 30000, ast_pbx_outgoing_app(cd->tech, AST_FORMAT_SLINEAR, cd->resource, 30000,
"MeetMe", cd->meetmeopts, NULL, 0, cd->cidnum, cd->cidname, cd->variables, NULL, NULL); "MeetMe", cd->meetmeopts, NULL, 0, cd->cidnum, cd->cidname, cd->variables, NULL, NULL);
free(cd); free(cd);
return NULL; return NULL;
} }
@@ -102,42 +105,46 @@ static void launch_page(struct ast_channel *chan, const char *meetmeopts, const
struct ast_var_t *varptr; struct ast_var_t *varptr;
pthread_t t; pthread_t t;
pthread_attr_t attr; pthread_attr_t attr;
if ((cd = ast_calloc(1, sizeof(*cd)))) {
ast_copy_string(cd->cidnum, chan->cid.cid_num ? chan->cid.cid_num : "", sizeof(cd->cidnum));
ast_copy_string(cd->cidname, chan->cid.cid_name ? chan->cid.cid_name : "", sizeof(cd->cidname));
ast_copy_string(cd->tech, tech, sizeof(cd->tech));
ast_copy_string(cd->resource, resource, sizeof(cd->resource));
ast_copy_string(cd->meetmeopts, meetmeopts, sizeof(cd->meetmeopts));
AST_LIST_TRAVERSE(&chan->varshead, varptr, entries) { if (!(cd = ast_calloc(1, sizeof(*cd))))
if (!(varname = ast_var_full_name(varptr))) return;
continue;
if (varname[0] == '_') {
struct ast_variable *newvar = NULL;
if (varname[1] == '_') { /* Copy data from our page over */
newvar = ast_variable_new(varname, ast_var_value(varptr)); ast_copy_string(cd->cidnum, chan->cid.cid_num ? chan->cid.cid_num : "", sizeof(cd->cidnum));
} else { ast_copy_string(cd->cidname, chan->cid.cid_name ? chan->cid.cid_name : "", sizeof(cd->cidname));
newvar = ast_variable_new(&varname[1], ast_var_value(varptr)); ast_copy_string(cd->tech, tech, sizeof(cd->tech));
} ast_copy_string(cd->resource, resource, sizeof(cd->resource));
ast_copy_string(cd->meetmeopts, meetmeopts, sizeof(cd->meetmeopts));
AST_LIST_TRAVERSE(&chan->varshead, varptr, entries) {
struct ast_variable *newvar = NULL;
if (newvar) { if (!(varname = ast_var_full_name(varptr)) || (varname[0] != '_'))
if (lastvar) continue;
lastvar->next = newvar;
else if (varname[1] == '_')
cd->variables = newvar; newvar = ast_variable_new(varname, ast_var_value(varptr));
lastvar = newvar; else
} newvar = ast_variable_new(&varname[1], ast_var_value(varptr));
}
} if (newvar) {
if (lastvar)
pthread_attr_init(&attr); lastvar->next = newvar;
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); else
if (ast_pthread_create(&t, &attr, page_thread, cd)) { cd->variables = newvar;
ast_log(LOG_WARNING, "Unable to create paging thread: %s\n", strerror(errno)); lastvar = newvar;
free(cd);
} }
} }
/* Spawn thread to handle this page */
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&t, &attr, page_thread, cd)) {
ast_log(LOG_WARNING, "Unable to create paging thread: %s\n", strerror(errno));
free(cd);
}
return;
} }
static int page_exec(struct ast_channel *chan, void *data) static int page_exec(struct ast_channel *chan, void *data)
@@ -197,6 +204,7 @@ static int page_exec(struct ast_channel *chan, void *data)
if (!res) if (!res)
res = ast_waitstream(chan, ""); res = ast_waitstream(chan, "");
} }
if (!res) { if (!res) {
snprintf(meetmeopts, sizeof(meetmeopts), "%ud|A%s%sqxd", confid, (ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "t"), snprintf(meetmeopts, sizeof(meetmeopts), "%ud|A%s%sqxd", confid, (ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "t"),
(ast_test_flag(&flags, PAGE_RECORD) ? "r" : "") ); (ast_test_flag(&flags, PAGE_RECORD) ? "r" : "") );