From 0dfd63534929ab927b370d64aeacfee5464a517d Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Wed, 19 Dec 2018 06:38:08 -0500
Subject: [PATCH] Update config for debian stretch interfaces

---
 agents/kamagent.go                            | 20 +++++--------------
 .../cgrates/etc/cgrates/cgrates.json          |  1 +
 .../kamevapi/cgrates/etc/cgrates/cgrates.json |  1 +
 .../kamailio/etc/kamailio/kamailio.cfg        |  4 ++--
 sessions/sessions.go                          |  2 +-
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/agents/kamagent.go b/agents/kamagent.go
index 0071e5631..d556dc1bc 100644
--- a/agents/kamagent.go
+++ b/agents/kamagent.go
@@ -258,22 +258,12 @@ func (ka *KamailioAgent) V1DisconnectSession(args utils.AttrDisconnectSession, r
 
 func (ka *KamailioAgent) V1GetActiveSessionIDs(ignParam string, sessionIDs *[]*sessions.SessionID) (err error) {
 	for _, evapi := range ka.conns {
-		errChan := make(chan error)
-		go func() {
-			kamEv, _ := json.Marshal(map[string]string{utils.Event: CGR_DLG_LIST})
-			errChan <- evapi.Send(string(kamEv))
-		}()
-		select {
-		case err = <-errChan:
-			if err != nil {
-				utils.Logger.Err(fmt.Sprintf("<%s> failed sending event, error %s",
-					utils.KamailioAgent, err.Error()))
-				return
-			}
-		case <-time.After(5 * time.Second):
-			return errors.New("timeout sending dialog list")
+		kamEv, _ := json.Marshal(map[string]string{utils.Event: CGR_DLG_LIST})
+		if err = evapi.Send(string(kamEv)); err != nil {
+			utils.Logger.Err(fmt.Sprintf("<%s> failed sending event, error %s",
+				utils.KamailioAgent, err.Error()))
+			return
 		}
-
 	}
 	select {
 	case *sessionIDs = <-ka.activeSessionIDs:
diff --git a/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json
index 8c2d388eb..ade1049c5 100644
--- a/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json
@@ -6,6 +6,7 @@
 "general": {
     "log_level": 7,
 	"node_id":"CGRAsterisk",
+	"reply_timeout": "5s",
 },
 
 
diff --git a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
index 9a3701cb7..6c367e244 100644
--- a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
@@ -6,6 +6,7 @@
 "general": {
     "log_level": 7,
 	"node_id":"CGRKamailio",
+	"reply_timeout": "5s",
 },
 
 
diff --git a/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg b/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg
index 8ef8c3f0b..85672bced 100644
--- a/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg
+++ b/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg
@@ -15,10 +15,10 @@
 debug=2
 log_stderror=no
 
-listen=udp:eth0:5060
+listen=udp:enp0s3:5060
 listen=udp:127.0.0.1:5080
 listen=udp:127.0.0.1:5060
-listen=udp:eth0:5080
+listen=udp:enp0s3:5080
 
 memdbg=5
 memlog=5
diff --git a/sessions/sessions.go b/sessions/sessions.go
index 8f0396243..a626f61cc 100644
--- a/sessions/sessions.go
+++ b/sessions/sessions.go
@@ -2409,7 +2409,7 @@ func (smg *SMGeneric) syncSessions() {
 						fmt.Sprintf("<%s> error quering session ids : %+v", utils.SessionS, err))
 					continue
 				}
-			case <-time.After(5 * time.Second):
+			case <-time.After(smg.cgrCfg.GeneralCfg().ReplyTimeout):
 				utils.Logger.Warning(
 					fmt.Sprintf("<%s> timeout quering session ids ", utils.SessionS))
 				continue