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

Ensure dummy channels get a stasis topic.

Browse Source 
Fixes test failure introduced in r382685.

(issue ASTERISK-20887)
(issue ASTERISK-20959)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-03-08 16:25:58 +00:00
parent c6b06e40dc
commit c0e2ed1fe9
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/channel.c
View File

@@ -1283,6 +1283,8 @@ struct ast_channel *ast_dummy_channel_alloc(void)
ast_channel_epfd_set(tmp, -1);
#endif
ast_channel_internal_setup_topics(tmp);
headp = ast_channel_varshead(tmp);
AST_LIST_HEAD_INIT_NOLOCK(headp);

8
main/channel_internal_api.c
View File

@@ -1391,8 +1391,14 @@ struct stasis_topic *ast_channel_topic(struct ast_channel *chan)
void ast_channel_internal_setup_topics(struct ast_channel *chan)
{
const char *topic_name = chan->uniqueid;
ast_assert(chan->topic == NULL);
ast_assert(chan->forwarder == NULL);
chan->topic = stasis_topic_create(chan->uniqueid);
if (ast_strlen_zero(topic_name)) {
topic_name = "<dummy-channel>";
}
chan->topic = stasis_topic_create(topic_name);
chan->forwarder = stasis_forward_all(chan->topic, ast_channel_topic_all());
}

4
main/stasis.c
View File

@@ -337,6 +337,10 @@ void stasis_forward_message(struct stasis_topic *topic, struct stasis_topic *pub
struct stasis_subscription **subscribers = NULL;
size_t num_subscribers, i;
ast_assert(topic != NULL);
ast_assert(publisher_topic != NULL);
ast_assert(message != NULL);
/* Copy the subscribers, so we don't have to hold the mutex for long */
{
SCOPED_AO2LOCK(lock, topic);