From aa574d5880f099ebd50e780e4545644ca17ece53 Mon Sep 17 00:00:00 2001 From: DanB Date: Fri, 9 Sep 2016 20:19:39 +0200 Subject: [PATCH] SM-Asterisk - receiving Asterisk events for a call --- .../asterisk_events/asterisk/etc/asterisk/modules.conf | 1 + glide.lock | 2 +- sessionmanager/smasterisk.go | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/tutorials/asterisk_events/asterisk/etc/asterisk/modules.conf b/data/tutorials/asterisk_events/asterisk/etc/asterisk/modules.conf index 97179175a..280614a06 100755 --- a/data/tutorials/asterisk_events/asterisk/etc/asterisk/modules.conf +++ b/data/tutorials/asterisk_events/asterisk/etc/asterisk/modules.conf @@ -112,6 +112,7 @@ load = res_sorcery_realtime.so load = res_timing_timerfd.so ;ARI +load => app_stasis.so load => res_http_websocket.so load => res_stasis.so load => res_stasis_answer.so diff --git a/glide.lock b/glide.lock index c4c8d85c1..e8335b684 100644 --- a/glide.lock +++ b/glide.lock @@ -8,7 +8,7 @@ imports: - name: github.com/cenk/rpc2 version: 7ab76d2e88c77ca1a715756036d8264b2886acd2 - name: github.com/cgrates/aringo - version: af32eb4cfc6bfa2b73812221c099455dac3b603c + version: 01a6eb0c59fdce5158fb8ac5ed62e70b12ca0fd7 - name: github.com/cgrates/fsock version: a8ffdbdfc8440016df008ba91e6f05f806d7a69f - name: github.com/cgrates/kamevapi diff --git a/sessionmanager/smasterisk.go b/sessionmanager/smasterisk.go index 20e2b9920..f00b82b00 100644 --- a/sessionmanager/smasterisk.go +++ b/sessionmanager/smasterisk.go @@ -18,7 +18,6 @@ along with this program. If not, see package sessionmanager import ( - "encoding/json" "fmt" "github.com/cgrates/aringo" @@ -39,13 +38,13 @@ type SMAsterisk struct { astConnIdx int smg rpcclient.RpcClientConnection astConn *aringo.ARInGO - astEvChan chan *json.RawMessage + astEvChan chan map[string]interface{} astErrChan chan error } func (sma *SMAsterisk) connectAsterisk() error { connCfg := sma.cgrCfg.SMAsteriskCfg().AsteriskConns[sma.astConnIdx] - sma.astEvChan = make(chan *json.RawMessage) + sma.astEvChan = make(chan map[string]interface{}) sma.astErrChan = make(chan error) _, err := aringo.NewARInGO(fmt.Sprintf("ws://%s/ari/events?api_key=%s:%s&app=%s", connCfg.Address, connCfg.User, connCfg.Password, CGRAuthAPP), "http://cgrates.org", sma.astEvChan, sma.astErrChan, connCfg.ConnectAttempts, connCfg.Reconnects)