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

I found some problems with the code I committed earlier, when

Browse Source 
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@139635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2008-08-22 22:24:02 +00:00
parent d2a637a424
commit d0f001accc
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_features.c
View File

@@ -1663,6 +1663,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
struct ast_cdr *swapper; struct ast_cdr *swapper;
char savelastapp[AST_MAX_EXTENSION]; char savelastapp[AST_MAX_EXTENSION];
char savelastdata[AST_MAX_EXTENSION]; char savelastdata[AST_MAX_EXTENSION];
char save_exten[AST_MAX_EXTENSION];
int save_prio;
if (chan->cdr && ast_opt_end_cdr_before_h_exten) { if (chan->cdr && ast_opt_end_cdr_before_h_exten) {
ast_cdr_end(bridge_cdr); ast_cdr_end(bridge_cdr);
@@ -1674,6 +1676,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
ast_copy_string(savelastdata, bridge_cdr->lastdata, sizeof(bridge_cdr->lastdata)); ast_copy_string(savelastdata, bridge_cdr->lastdata, sizeof(bridge_cdr->lastdata));
chan->cdr = bridge_cdr; chan->cdr = bridge_cdr;
ast_channel_lock(chan); ast_channel_lock(chan);
ast_copy_string(save_exten, chan->exten, sizeof(save_exten));
save_prio = chan->priority;
ast_copy_string(chan->exten, "h", sizeof(chan->exten)); ast_copy_string(chan->exten, "h", sizeof(chan->exten));
chan->priority = 1; chan->priority = 1;
ast_channel_unlock(chan); ast_channel_unlock(chan);
@@ -1689,7 +1693,11 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
chan->priority++; chan->priority++;
} }
/* swap it back */ /* swap it back */
ast_channel_lock(chan);
ast_copy_string(chan->exten, save_exten, sizeof(chan->exten));
chan->priority = save_prio;
chan->cdr = swapper; chan->cdr = swapper;
ast_channel_unlock(chan);
/* protect the lastapp/lastdata against the effects of the hangup/dialplan code */ /* protect the lastapp/lastdata against the effects of the hangup/dialplan code */
ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp)); ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp));
ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata)); ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata));