kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic errors from 208746

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@208923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-07-27 01:18:31 +00:00
parent fc5db2b241
commit f622e06bbe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_iax2.c
View File

@@ -3722,7 +3722,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
return AST_BRIDGE_FAILED; return AST_BRIDGE_FAILED;
} }
/* Put them in native bridge mode */ /* Put them in native bridge mode */
if ((!flags) & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) { if (!(flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))) {
iaxs[callno0]->bridgecallno = callno1; iaxs[callno0]->bridgecallno = callno1;
iaxs[callno1]->bridgecallno = callno0; iaxs[callno1]->bridgecallno = callno0;
} }

4
main/translate.c
View File

@@ -920,7 +920,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
destination format. */ destination format. */
for (x = 1; src_audio && x < AST_FORMAT_MAX_AUDIO; x <<= 1) { for (x = 1; src_audio && x < AST_FORMAT_MAX_AUDIO; x <<= 1) {
/* if this is not a desired format, nothing to do */ /* if this is not a desired format, nothing to do */
if ((!dest) & x) if (!(dest & x))
continue; continue;
/* if the source is supplying this format, then /* if the source is supplying this format, then
@@ -946,7 +946,7 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
destination format. */ destination format. */
for (; src_video && x < AST_FORMAT_MAX_VIDEO; x <<= 1) { for (; src_video && x < AST_FORMAT_MAX_VIDEO; x <<= 1) {
/* if this is not a desired format, nothing to do */ /* if this is not a desired format, nothing to do */
if ((!dest) & x) if (!(dest & x))
continue; continue;
/* if the source is supplying this format, then /* if the source is supplying this format, then