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

Merged revisions 90548 via svnmerge from

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

........
r90548 | file | 2007-12-03 14:40:56 -0400 (Mon, 03 Dec 2007) | 2 lines

Preserve the indication currently playing on a channel when a masquerade operation happens. (issue #BE-88)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-12-03 18:44:16 +00:00
parent ec77de0d8b
commit 46d2c050c5
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cleancount
View File

@@ -1 +1 @@
32 33

1
include/asterisk/channel.h
View File

@@ -505,6 +505,7 @@ struct ast_channel {
int epfd; int epfd;
struct ast_epoll_data *epfd_data[AST_MAX_FDS]; struct ast_epoll_data *epfd_data[AST_MAX_FDS];
#endif #endif
int visible_indication; /*!< Indication currently playing on the channel */
}; };
/*! \brief ast_channel_tech Properties */ /*! \brief ast_channel_tech Properties */

11
main/channel.c
View File

@@ -1519,7 +1519,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
default: default:
break; break;
} }
chan->visible_indication = 0;
ast_channel_unlock(chan); ast_channel_unlock(chan);
return res; return res;
@@ -2557,6 +2557,7 @@ int ast_indicate_data(struct ast_channel *chan, int condition, const void *data,
ast_debug(1, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition); ast_debug(1, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition);
ast_playtones_start(chan,0,ts->data, 1); ast_playtones_start(chan,0,ts->data, 1);
res = 0; res = 0;
chan->visible_indication = condition;
} else if (condition == AST_CONTROL_PROGRESS) { } else if (condition == AST_CONTROL_PROGRESS) {
/* ast_playtones_stop(chan); */ /* ast_playtones_stop(chan); */
} else if (condition == AST_CONTROL_PROCEEDING) { } else if (condition == AST_CONTROL_PROCEEDING) {
@@ -2573,7 +2574,9 @@ int ast_indicate_data(struct ast_channel *chan, int condition, const void *data,
res = -1; res = -1;
} }
} }
} } else
chan->visible_indication = condition;
return res; return res;
} }
@@ -3725,6 +3728,10 @@ int ast_do_masquerade(struct ast_channel *original)
ast_log(LOG_WARNING, "Channel type '%s' does not have a fixup routine (for %s)! Bad things may happen.\n", ast_log(LOG_WARNING, "Channel type '%s' does not have a fixup routine (for %s)! Bad things may happen.\n",
original->tech->type, original->name); original->tech->type, original->name);
/* If an indication is currently playing maintain it on the channel that is taking the place of original */
if (original->visible_indication)
ast_indicate(original, original->visible_indication);
/* Now, at this point, the "clone" channel is totally F'd up. We mark it as /* Now, at this point, the "clone" channel is totally F'd up. We mark it as
a zombie so nothing tries to touch it. If it's already been marked as a a zombie so nothing tries to touch it. If it's already been marked as a
zombie, then free it now (since it already is considered invalid). */ zombie, then free it now (since it already is considered invalid). */