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

Merged revisions 37361 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r37361 | kpfleming | 2006-07-10 16:01:35 -0500 (Mon, 10 Jul 2006) | 2 lines

do masquerade-behind-proxy checking with better control over locks

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-07-10 21:07:48 +00:00
parent 6888b0ecba
commit 7b968cec0d
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
channel.c
View File

@@ -2843,25 +2843,43 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clone)
{
int res = -1;
struct ast_channel *final_orig = original, *final_clone = clone;
/* each of these channels may be sitting behind a channel proxy (i.e. chan_agent)
and if so, we don't really want to masquerade it, but its proxy */
if (original->_bridge && (original->_bridge != ast_bridged_channel(original)))
original = original->_bridge;
if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone)))
clone = clone->_bridge;
if (original == clone) {
ast_log(LOG_WARNING, "Can't masquerade channel '%s' into itself!\n", original->name);
return -1;
}
ast_channel_lock(original);
while(ast_channel_trylock(clone)) {
while (ast_channel_trylock(clone)) {
ast_channel_unlock(original);
usleep(1);
ast_channel_lock(original);
}
/* each of these channels may be sitting behind a channel proxy (i.e. chan_agent)
and if so, we don't really want to masquerade it, but its proxy */
if (original->_bridge && (original->_bridge != ast_bridged_channel(original)))
final_orig = original->_bridge;
if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone)))
final_clone = clone->_bridge;
if ((final_orig != original) || (final_clone != clone)) {
ast_channel_lock(final_orig);
while (ast_channel_trylock(final_clone)) {
ast_channel_unlock(final_orig);
usleep(1);
ast_channel_lock(final_orig);
}
ast_channel_unlock(clone);
ast_channel_unlock(original);
original = final_orig;
clone = final_clone;
}
if (original == clone) {
ast_log(LOG_WARNING, "Can't masquerade channel '%s' into itself!\n", original->name);
ast_channel_unlock(clone);
ast_channel_unlock(original);
return -1;
}
ast_log(LOG_DEBUG, "Planning to masquerade channel %s into the structure of %s\n",
clone->name, original->name);
if (original->masq) {
@@ -2878,8 +2896,10 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo
ast_log(LOG_DEBUG, "Done planning to masquerade channel %s into the structure of %s\n", clone->name, original->name);
res = 0;
}
ast_channel_unlock(clone);
ast_channel_unlock(original);
return res;
}