diff options
| author | Mark Spencer <markster@digium.com> | 2003-07-16 15:17:25 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2003-07-16 15:17:25 +0000 |
| commit | 4386d3b76461bc15c190fecd9b5a1cb3df86b697 (patch) | |
| tree | 215d241313c41483bd7b832f56c4f1dddfc2d365 /channels/chan_iax2.c | |
| parent | acb58deb48f994e326c4d876704d37eaa0586343 (diff) | |
Don't native bridge when we can't
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rwxr-xr-x | channels/chan_iax2.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 2b6013f77..8e9f021ed 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1807,10 +1807,16 @@ static int iax2_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags if ((c0->type != type) || (c1->type != type)) { if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Can't masquerade, we're different...\n"); + /* Remove from native mode */ + p0->bridgecallno = 0; + p1->bridgecallno = 0; return -2; } if (c0->nativeformats != c1->nativeformats) { ast_verbose(VERBOSE_PREFIX_3 "Operating with different codecs, can't native bridge...\n"); + /* Remove from native mode */ + p0->bridgecallno = 0; + p1->bridgecallno = 0; return -2; } /* check if transfered and if we really want native bridging */ @@ -1867,6 +1873,7 @@ static int iax2_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags *fo = f; /* Take out of conference mode */ res = 0; + /* Remove from native mode */ break; } else goto tackygoto; @@ -1876,6 +1883,7 @@ static int iax2_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags *rc = c1; *fo = f; res = 0; + /* Remove from native mode */ break; } else goto tackygoto; |