dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

don't generate any message for native bridge attempts unless all the basic checks have passed and we're actually going to try it 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8120 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2006-01-17 05:15:33 +00:00
parent 8d535ff32b
commit 2684505cef
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
channel.c
View File

@ -3460,8 +3460,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
!nativefailed && !c0->monitor && !c1->monitor &&
!c0->spies && !c1->spies) {
/* Looks like they share a bridge method and nothing else is in the way */
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Attempting native bridge of %s and %s\n", c0->name, c1->name);
ast_set_flag(c0, AST_FLAG_NBRIDGE);
ast_set_flag(c1, AST_FLAG_NBRIDGE);
if ((res = c0->tech->bridge(c0, c1, config->flags, fo, rc, to)) == AST_BRIDGE_COMPLETE) {
@ -3493,7 +3491,9 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
case AST_BRIDGE_RETRY:
continue;
default:
ast_log(LOG_WARNING, "Private bridge between %s and %s failed\n", c0->name, c1->name);
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3, "Native bridging %s and %s ended\n",
c0->name, c1->name);
/* fallthrough */
case AST_BRIDGE_FAILED_NOWARN:
nativefailed++;

3
channels/chan_misdn.c
View File

@ -2023,6 +2023,9 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0,
misdn_lib_bridge(ch1->bc,ch2->bc);
}
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
chan_misdn_log(1, ch1->bc->port, "* Makeing Native Bridge between %s and %s\n", ch1->bc->oad, ch2->bc->oad);
while(1) {

3
channels/chan_vpb.c
View File

@ -476,6 +476,9 @@ static enum ast_bridge_result vpb_bridge(struct ast_channel *c0, struct ast_chan
ast_verbose(VERBOSE_PREFIX_2 "%s: vpb_bridge: Bridging call entered with [%s, %s]\n",p0->dev, c0->name, c1->name);
}
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
#ifdef HALF_DUPLEX_BRIDGE
if (option_verbose>1)

3
channels/chan_zap.c
View File

@ -3207,6 +3207,9 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann
return AST_BRIDGE_FAILED;
}
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
if (!(flags & AST_BRIDGE_DTMF_CHANNEL_0) && (oi0 == SUB_REAL))
disable_dtmf_detect(op0);

3
rtp.c
View File

@ -1655,6 +1655,9 @@ enum ast_bridge_result ast_rtp_bridge(struct ast_channel *c0, struct ast_channel
}
}
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
/* Ok, we should be able to redirect the media. Start with one channel */
if (pr0->set_rtp_peer(c0, p1, vp1, codec1, ast_test_flag(p1, FLAG_NAT_ACTIVE)))
ast_log(LOG_WARNING, "Channel '%s' failed to talk to '%s'\n", c0->name, c1->name);