From afe48cf5328042733bb0d41dc1f8dc829bc42432 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Thu, 1 Jun 2017 14:33:16 +0200
Subject: [PATCH] SMKamailio - empty rls fix, Kamailio tutorial configuration
 updates

---
 data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json   | 7 +++++++
 .../kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg    | 2 +-
 data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg | 2 +-
 engine/eventcost.go                                        | 1 -
 sessionmanager/kamailiosm.go                               | 5 +++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
index fd0b40bef..8cea3520e 100644
--- a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
@@ -6,6 +6,13 @@
 // This file contains the default configuration hardcoded into CGRateS.
 // This is what you get when you load CGRateS with an empty configuration file.
 
+"general": {
+    "log_level": 7,
+},
+
+"stor_db": {								// database used to store offline tariff plans and CDRs
+	"db_password": "CGRateS.org",			// password to use when connecting to stordb
+},
 
 "rals": {
 	"enabled": true,
diff --git a/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg b/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg
index 4858bd479..63ef6a2be 100644
--- a/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg
+++ b/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg
@@ -66,7 +66,7 @@ route[CGR_AUTH_REPLY] {
 	$var(CgrMaxSessionTime) = $(var(MaxSessionTime){s.int});
 	$var(CgrSuppliers) = $(var(Suppliers){s.rm,"});
 	$var(CGRResourceAllowed) = $(var(CGRResourceAllowed){s.rm,"});
-	$var(CgrError) = $(var(Error){s.rm,"});
+	$var(CgrError) = $(var(CgrError){s.rm,"});
 	t_continue("$var(id_index)", "$var(id_label)", "CGRATES_AUTH_REPLY"); # Unpark the transaction 
 }
 
diff --git a/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg b/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg
index 5662cf77d..4e7549db8 100644
--- a/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg
+++ b/data/tutorials/kamevapi/kamailio/etc/kamailio/kamailio.cfg
@@ -27,7 +27,7 @@ dns_use_search_list=no
 
 ####### Modules Section ########
 
-mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/"
+mpath="/usr/lib64/kamailio/modules/"
 
 loadmodule "kex.so"
 loadmodule "corex.so"
diff --git a/engine/eventcost.go b/engine/eventcost.go
index 78b0b9f36..b3fc6c548 100644
--- a/engine/eventcost.go
+++ b/engine/eventcost.go
@@ -569,7 +569,6 @@ func (ec *EventCost) Trim(atUsage time.Duration) (srplusEC *EventCost, err error
 			srplsIncrement := lastIncrement.Clone()
 			srplsIncrement.CompressFactor = srplsIncrement.CompressFactor - laItCF
 			srplsIncrements = append([]*ChargingIncrement{srplsIncrement}, srplsIncrements...) // prepend the surplus out of compress
-			//lastIncrement.CompressFactor = laItCF
 		}
 	}
 
diff --git a/sessionmanager/kamailiosm.go b/sessionmanager/kamailiosm.go
index c743b9283..f7a1aa2c0 100644
--- a/sessionmanager/kamailiosm.go
+++ b/sessionmanager/kamailiosm.go
@@ -20,6 +20,7 @@ package sessionmanager
 import (
 	"errors"
 	"fmt"
+	"reflect"
 	"regexp"
 	"time"
 
@@ -32,6 +33,9 @@ import (
 
 func NewKamailioSessionManager(smKamCfg *config.SmKamConfig, rater, cdrsrv,
 	rlS rpcclient.RpcClientConnection, timezone string) (ksm *KamailioSessionManager, err error) {
+	if rlS != nil && reflect.ValueOf(rlS).IsNil() {
+		rlS = nil
+	}
 	ksm = &KamailioSessionManager{cfg: smKamCfg, rater: rater, cdrsrv: cdrsrv, rlS: rlS,
 		timezone: timezone, conns: make(map[string]*kamevapi.KamEvapi), sessions: NewSessions()}
 	return
@@ -70,6 +74,7 @@ func (self *KamailioSessionManager) allocateResources(kev KamEvent) (err error)
 	if self.rlS == nil {
 		return errors.New("no RLs connection")
 	}
+	fmt.Printf("In allocateResources, rls: %+v", self.rlS)
 	var ev map[string]interface{}
 	if ev, err = kev.AsMapStringIface(); err != nil {
 		return