diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-07-01 13:16:09 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-07-01 13:16:09 +0000 |
| commit | 909ee4bfb9180a87e02504acb47f27b47cb5adea (patch) | |
| tree | 5405f0116ec4b490e55afa5251ac0f230f1f8e5d /channels/chan_gtalk.c | |
| parent | 68b3bce8b8f66be36f9d01a5796a65d52c83ef35 (diff) | |
Refactor extraneous channel events
This change removes JitterBufStats, ChannelReload, and ChannelUpdate
and refactors the following events to travel over Stasis-Core:
* LocalBridge
* DAHDIChannel
* AlarmClear
* SpanAlarmClear
* Alarm
* SpanAlarm
* DNDState
* MCID
* SIPQualifyPeerDone
* SessionTimeout
Review: https://reviewboard.asterisk.org/r/2627/
(closes issue ASTERISK-21476)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 49e7ce8ff..a0aa0b95d 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -86,6 +86,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/jabber.h" #include "asterisk/jingle.h" #include "asterisk/features.h" +#include "asterisk/stasis_channels.h" #define GOOGLE_CONFIG "gtalk.conf" @@ -546,8 +547,6 @@ static int gtalk_answer(struct ast_channel *ast) ast_debug(1, "Answer!\n"); ast_mutex_lock(&p->lock); gtalk_invite(p, p->them, p->us,p->sid, 0); - manager_event(EVENT_FLAG_SYSTEM, "ChannelUpdate", "Channel: %s\r\nChanneltype: %s\r\nGtalk-SID: %s\r\n", - ast_channel_name(ast), "GTALK", p->sid); ast_mutex_unlock(&p->lock); return res; } @@ -1216,9 +1215,7 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i, ast_hangup(tmp); tmp = NULL; } else { - manager_event(EVENT_FLAG_SYSTEM, "ChannelUpdate", - "Channel: %s\r\nChanneltype: %s\r\nGtalk-SID: %s\r\n", - i->owner ? ast_channel_name(i->owner) : "", "Gtalk", i->sid); + send_channel_update(i->owner, i->sid); } return tmp; } |