kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "n" option to allow disabling of masq optimization

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1619 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-10-08 02:11:56 +00:00
parent 0f007abd86
commit 55637d3de5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_local.c
View File

@@ -65,6 +65,7 @@ static struct local_pvt {
int cancelqueue; /* Cancel queue */ int cancelqueue; /* Cancel queue */
int alreadymasqed; /* Already masqueraded */ int alreadymasqed; /* Already masqueraded */
int launchedpbx; /* Did we launch the PBX */ int launchedpbx; /* Did we launch the PBX */
int nooptimization;
struct ast_channel *owner; /* Master Channel */ struct ast_channel *owner; /* Master Channel */
struct ast_channel *chan; /* Outbound channel */ struct ast_channel *chan; /* Outbound channel */
struct local_pvt *next; /* Next entity */ struct local_pvt *next; /* Next entity */
@@ -131,7 +132,7 @@ static int local_answer(struct ast_channel *ast)
static void check_bridge(struct local_pvt *p, int isoutbound) static void check_bridge(struct local_pvt *p, int isoutbound)
{ {
if (p->alreadymasqed) if (p->alreadymasqed || p->nooptimization)
return; return;
if (isoutbound && p->chan && p->chan->bridge && p->owner) { if (isoutbound && p->chan && p->chan->bridge && p->owner) {
/* Masquerade bridged channel into owner */ /* Masquerade bridged channel into owner */
@@ -326,6 +327,7 @@ static struct local_pvt *local_alloc(char *data, int format)
{ {
struct local_pvt *tmp; struct local_pvt *tmp;
char *c; char *c;
char *opts;
tmp = malloc(sizeof(struct local_pvt)); tmp = malloc(sizeof(struct local_pvt));
if (tmp) { if (tmp) {
memset(tmp, 0, sizeof(struct local_pvt)); memset(tmp, 0, sizeof(struct local_pvt));
@@ -338,6 +340,13 @@ static struct local_pvt *local_alloc(char *data, int format)
strncpy(tmp->context, c, sizeof(tmp->context) - 1); strncpy(tmp->context, c, sizeof(tmp->context) - 1);
} else } else
strncpy(tmp->context, "default", sizeof(tmp->context) - 1); strncpy(tmp->context, "default", sizeof(tmp->context) - 1);
opts = strchr(tmp->context, '/');
if (opts) {
*opts='\0';
opts++;
if (strchr(opts, 'n'))
tmp->nooptimization = 1;
}
tmp->reqformat = format; tmp->reqformat = format;
if (!ast_exists_extension(NULL, tmp->context, tmp->exten, 1, NULL)) { if (!ast_exists_extension(NULL, tmp->context, tmp->exten, 1, NULL)) {
ast_log(LOG_NOTICE, "No such extension/context %s@%s creating local channel\n", tmp->context, tmp->exten); ast_log(LOG_NOTICE, "No such extension/context %s@%s creating local channel\n", tmp->context, tmp->exten);