mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
Stasis: Fix StasisStart/End order and missing events
This corrects several bugs that currently exist in the stasis application code. * After a masquerade, the resulting channels have channel topics that do not match their uniqueids ** Masquerades now swap channel topics appropriately * StasisStart and StasisEnd messages are leaked to observer applications due to being published on channel topics ** StasisStart and StasisEnd publishing is now properly restricted to controlling apps via app topics * Race conditions exist where StasisStart and StasisEnd messages due to a masquerade may be received out of order due to being published on different topics ** These messages are now published directly on the app topic so this is now a non-issue * StasisEnds are sometimes missing when sent due to masquerades and bridge swaps into and out of Stasis() ** This was due to StasisEnd processing adjusting message-sent flags after Stasis() had already exited and Stasis() had been re-entered ** This was corrected by adjusting these flags prior to sending the message while the initial Stasis() application was still shutting down Review: https://reviewboard.asterisk.org/r/4213/ ASTERISK-24537 #close Reported by: Matt DiMeo ........ Merged revisions 429061 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 429062 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -302,10 +302,6 @@ static void sub_default_handler(void *data, struct stasis_subscription *sub,
|
||||
call_forwarded_handler(app, message);
|
||||
}
|
||||
|
||||
if (stasis_message_type(message) == app_end_message_type()) {
|
||||
app_end_message_handler(message);
|
||||
}
|
||||
|
||||
/* By default, send any message that has a JSON representation */
|
||||
json = stasis_message_to_json(message, stasis_app_get_sanitizer());
|
||||
if (!json) {
|
||||
@@ -1128,30 +1124,6 @@ int app_is_subscribed_channel_id(struct stasis_app *app, const char *channel_id)
|
||||
return forwards != NULL;
|
||||
}
|
||||
|
||||
int app_replace_channel_forwards(struct stasis_app *app, const char *old_id, struct ast_channel *new_chan)
|
||||
{
|
||||
RAII_VAR(struct app_forwards *, old_forwards, NULL, ao2_cleanup);
|
||||
struct app_forwards *new_forwards;
|
||||
|
||||
old_forwards = ao2_find(app->forwards, old_id, OBJ_SEARCH_KEY | OBJ_UNLINK);
|
||||
if (!old_forwards) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
new_forwards = forwards_create_channel(app, new_chan);
|
||||
if (!new_forwards) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
new_forwards->interested = old_forwards->interested;
|
||||
ao2_link_flags(app->forwards, new_forwards, 0);
|
||||
ao2_cleanup(new_forwards);
|
||||
|
||||
/* Clean up old forwards */
|
||||
forwards_unsubscribe(old_forwards);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void *channel_find(const struct stasis_app *app, const char *id)
|
||||
{
|
||||
return ast_channel_get_by_name(id);
|
||||
|
@@ -258,18 +258,6 @@ int app_set_replace_channel_app(struct ast_channel *chan, const char *replace_ap
|
||||
*/
|
||||
char *app_get_replace_channel_app(struct ast_channel *chan);
|
||||
|
||||
/*!
|
||||
* \brief Replace channel topic forwards for the old channel with forwards for the new channel
|
||||
*
|
||||
* \param app The app that owns the channel
|
||||
* \param old_id The unique ID of the channel to be replaced
|
||||
* \param new_chan The channel that is replacing the old one
|
||||
*
|
||||
* \retval zero on success
|
||||
* \return non-zero on failure
|
||||
*/
|
||||
int app_replace_channel_forwards(struct stasis_app *app, const char *old_id, struct ast_channel *new_chan);
|
||||
|
||||
/*!
|
||||
* \brief Send StasisEnd message to the listening app
|
||||
*
|
||||
@@ -281,16 +269,4 @@ int app_replace_channel_forwards(struct stasis_app *app, const char *old_id, str
|
||||
*/
|
||||
int app_send_end_msg(struct stasis_app *app, struct ast_channel *chan);
|
||||
|
||||
/*!
|
||||
* \brief Handle cleanup related to StasisEnd messages
|
||||
*
|
||||
* \param message The message for which to clean up
|
||||
*/
|
||||
void app_end_message_handler(struct stasis_message *message);
|
||||
|
||||
/*!
|
||||
* \brief Accessor for the StasisEnd message type
|
||||
*/
|
||||
struct stasis_message_type *app_end_message_type(void);
|
||||
|
||||
#endif /* _ASTERISK_RES_STASIS_APP_H */
|
||||
|
@@ -175,6 +175,7 @@ static int bridge_stasis_moving(struct ast_bridge_channel *bridge_channel, void
|
||||
return -1;
|
||||
}
|
||||
|
||||
stasis_app_channel_set_stasis_end_published(chan);
|
||||
app_send_end_msg(control_app(control), chan);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user