mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Minor fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1235 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
2
pbx.c
2
pbx.c
@@ -1115,7 +1115,9 @@ static int pbx_extension_helper(struct ast_channel *c, char *context, char *exte
|
|||||||
app = pbx_findapp(e->app);
|
app = pbx_findapp(e->app);
|
||||||
pthread_mutex_unlock(&conlock);
|
pthread_mutex_unlock(&conlock);
|
||||||
if (app) {
|
if (app) {
|
||||||
|
if (c->context != context)
|
||||||
strncpy(c->context, context, sizeof(c->context-1));
|
strncpy(c->context, context, sizeof(c->context-1));
|
||||||
|
if (c->exten != exten)
|
||||||
strncpy(c->exten, exten, sizeof(c->exten)-1);
|
strncpy(c->exten, exten, sizeof(c->exten)-1);
|
||||||
c->priority = priority;
|
c->priority = priority;
|
||||||
pbx_substitute_variables(passdata, sizeof(passdata), c, e);
|
pbx_substitute_variables(passdata, sizeof(passdata), c, e);
|
||||||
|
@@ -496,7 +496,7 @@ static int moh_register(char *classname, char *mode, char *param, char *miscargs
|
|||||||
if (!strcasecmp(mode, "mp3") || !strcasecmp(mode, "quietmp3") || !strcasecmp(mode, "httpmp3")) {
|
if (!strcasecmp(mode, "mp3") || !strcasecmp(mode, "quietmp3") || !strcasecmp(mode, "httpmp3")) {
|
||||||
if (!strcasecmp(mode, "quietmp3"))
|
if (!strcasecmp(mode, "quietmp3"))
|
||||||
moh->quiet = 1;
|
moh->quiet = 1;
|
||||||
strncpy(moh->dir, param, sizeof(moh->dir));
|
strncpy(moh->dir, param, sizeof(moh->dir) - 1);
|
||||||
moh->srcfd = -1;
|
moh->srcfd = -1;
|
||||||
#ifdef ZAPATA_MOH
|
#ifdef ZAPATA_MOH
|
||||||
/* It's an MP3 Moh -- Open /dev/zap/pseudo for timing... Is
|
/* It's an MP3 Moh -- Open /dev/zap/pseudo for timing... Is
|
||||||
|
Reference in New Issue
Block a user