kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge connor's exit context patch (#1737)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-27 22:35:47 +00:00
parent e446f4ca81
commit ff2ba012d2
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/app_voicemail.c
View File

@@ -110,6 +110,7 @@ struct ast_vm_user {
char zonetag[80]; char zonetag[80];
char callback[80]; char callback[80];
char dialout[80]; char dialout[80];
char exit[80];
int attach; int attach;
int alloced; int alloced;
int saycid; int saycid;
@@ -231,6 +232,7 @@ static int saycidinfo;
static int hearenv; static int hearenv;
static char dialcontext[80]; static char dialcontext[80];
static char callcontext[80]; static char callcontext[80];
static char exitcontext[80];
static char cidinternalcontexts[MAX_NUM_CID_CONTEXTS][64]; static char cidinternalcontexts[MAX_NUM_CID_CONTEXTS][64];
@@ -262,6 +264,8 @@ static void populate_defaults(struct ast_vm_user *vmu)
strncpy(vmu->callback, callcontext, sizeof(vmu->callback) -1); strncpy(vmu->callback, callcontext, sizeof(vmu->callback) -1);
if (dialcontext) if (dialcontext)
strncpy(vmu->dialout, dialcontext, sizeof(vmu->dialout) -1); strncpy(vmu->dialout, dialcontext, sizeof(vmu->dialout) -1);
if (exitcontext)
strncpy(vmu->exit, exitcontext, sizeof(vmu->exit) -1);
} }
static void apply_options(struct ast_vm_user *vmu, char *options) static void apply_options(struct ast_vm_user *vmu, char *options)
@@ -307,6 +311,8 @@ static void apply_options(struct ast_vm_user *vmu, char *options)
strncpy(vmu->callback, value, sizeof(vmu->callback) -1); strncpy(vmu->callback, value, sizeof(vmu->callback) -1);
} else if (!strcasecmp(var, "dialout")) { } else if (!strcasecmp(var, "dialout")) {
strncpy(vmu->dialout, value, sizeof(vmu->dialout) -1); strncpy(vmu->dialout, value, sizeof(vmu->dialout) -1);
} else if (!strcasecmp(var, "exitcontext")) {
strncpy(vmu->exit, value, sizeof(vmu->exit) -1);
} }
} }
@@ -1583,8 +1589,11 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, int silent, int
other than the operator -- an automated attendant or mailbox login for example */ other than the operator -- an automated attendant or mailbox login for example */
if (res == '*') { if (res == '*') {
strncpy(chan->exten, "a", sizeof(chan->exten) - 1); strncpy(chan->exten, "a", sizeof(chan->exten) - 1);
if (strlen(chan->macrocontext)) if (strlen(vmu->exit)) {
strncpy(chan->context, vmu->exit, sizeof(chan->context) - 1);
} else if (strlen(chan->macrocontext)) {
strncpy(chan->context, chan->macrocontext, sizeof(chan->context) - 1); strncpy(chan->context, chan->macrocontext, sizeof(chan->context) - 1);
}
chan->priority = 0; chan->priority = 0;
free_user(vmu); free_user(vmu);
return 0; return 0;
@@ -1593,8 +1602,11 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, int silent, int
if (res == '0') { if (res == '0') {
transfer: transfer:
strncpy(chan->exten, "o", sizeof(chan->exten) - 1); strncpy(chan->exten, "o", sizeof(chan->exten) - 1);
if (strlen(chan->macrocontext)) if (strlen(vmu->exit)) {
strncpy(chan->context, vmu->exit, sizeof(chan->context) - 1);
} else if (strlen(chan->macrocontext)) {
strncpy(chan->context, chan->macrocontext, sizeof(chan->context) - 1); strncpy(chan->context, chan->macrocontext, sizeof(chan->context) - 1);
}
chan->priority = 0; chan->priority = 0;
free_user(vmu); free_user(vmu);
return 0; return 0;
@@ -3600,6 +3612,7 @@ static int load_config(void)
char *s,*q,*stringp; char *s,*q,*stringp;
char *dialoutcxt = NULL; char *dialoutcxt = NULL;
char *callbackcxt = NULL; char *callbackcxt = NULL;
char *exitcxt = NULL;
int x; int x;
@@ -3764,6 +3777,14 @@ static int load_config(void)
} else { } else {
callcontext[0] = '\0'; callcontext[0] = '\0';
} }
if ((exitcxt = ast_variable_retrieve(cfg, "general", "exitcontext"))) {
strncpy(exitcontext, exitcxt, sizeof(exitcontext) - 1);
ast_log(LOG_DEBUG, "found operator context: %s\n", exitcontext);
} else {
exitcontext[0] = '\0';
}
#ifdef USEMYSQLVM #ifdef USEMYSQLVM
if (!(s=ast_variable_retrieve(cfg, "general", "dbuser"))) { if (!(s=ast_variable_retrieve(cfg, "general", "dbuser"))) {
strcpy(dbuser, "test"); strcpy(dbuser, "test");