diff options
| author | David M. Lee <dlee@digium.com> | 2013-03-08 16:25:58 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-03-08 16:25:58 +0000 |
| commit | c0e2ed1fe9f61f5b6d6c7de06c388e8d5a11563f (patch) | |
| tree | 8cfcfef7027619c498a7459e1f4dce11bcced7c9 | |
| parent | c6b06e40dc859125cf76bec4632bd76de42256bd (diff) | |
Ensure dummy channels get a stasis topic.
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
| -rw-r--r-- | main/channel.c | 2 | ||||
| -rw-r--r-- | main/channel_internal_api.c | 8 | ||||
| -rw-r--r-- | main/stasis.c | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index df0a67b3b..3289edaa4 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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); diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c index 8cc2e6c62..d646d8485 100644 --- a/main/channel_internal_api.c +++ b/main/channel_internal_api.c @@ -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()); } diff --git a/main/stasis.c b/main/stasis.c index f94736bf1..d1f11537e 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -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); |