From d3619368fea768301f017b09f4bf3a4984f7c54b Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Tue, 31 Mar 2015 21:39:05 +0200
Subject: [PATCH] Fix multiple connections handling in session manager

---
 config/config.go      | 10 ++++++++++
 config/config_test.go | 29 ++++++++++++++++++++++++++++-
 config/smconfig.go    |  6 ++++--
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/config/config.go b/config/config.go
index cdac6ece1..2cff5aaa3 100644
--- a/config/config.go
+++ b/config/config.go
@@ -93,6 +93,16 @@ func NewCGRConfigFromJsonString(cfgJsonStr string) (*CGRConfig, error) {
 	return cfg, nil
 }
 
+func NewCGRConfigFromJsonStringWithDefaults(cfgJsonStr string) (*CGRConfig, error) {
+	cfg, _ := NewDefaultCGRConfig()
+	if jsnCfg, err := NewCgrJsonCfgFromReader(strings.NewReader(cfgJsonStr)); err != nil {
+		return nil, err
+	} else if err := cfg.loadFromJsonCfg(jsnCfg); err != nil {
+		return nil, err
+	}
+	return cfg, nil
+}
+
 // Reads all .json files out of a folder/subfolders and loads them up in lexical order
 func NewCGRConfigFromFolder(cfgDir string) (*CGRConfig, error) {
 	cfg, err := NewDefaultCGRConfig()
diff --git a/config/config_test.go b/config/config_test.go
index 025c47849..d9f3ff7ee 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -23,11 +23,38 @@ import (
 	"testing"
 )
 
+var cfg *CGRConfig
+
 func TestConfigSharing(t *testing.T) {
-	cfg, _ := NewDefaultCGRConfig()
+	cfg, _ = NewDefaultCGRConfig()
 	SetCgrConfig(cfg)
 	cfgReturn := CgrConfig()
 	if !reflect.DeepEqual(cfgReturn, cfg) {
 		t.Errorf("Retrieved %v, Expected %v", cfgReturn, cfg)
 	}
 }
+
+func TestLoadCgrCfgWithDefaults(t *testing.T) {
+	JSN_CFG := `
+{
+"sm_freeswitch": {
+	"enabled": true,				// starts SessionManager service: <true|false>
+	"connections":[					// instantiate connections to multiple FreeSWITCH servers
+		{"server": "1.2.3.4:8021", "password": "ClueCon", "reconnects": 3},
+		{"server": "1.2.3.5:8021", "password": "ClueCon", "reconnects": 5}
+	],
+},
+
+}`
+	eCgrCfg, _ := NewDefaultCGRConfig()
+	eCgrCfg.SmFsConfig.Enabled = true
+	eCgrCfg.SmFsConfig.Connections = []*FsConnConfig{
+		&FsConnConfig{Server: "1.2.3.4:8021", Password: "ClueCon", Reconnects: 3},
+		&FsConnConfig{Server: "1.2.3.5:8021", Password: "ClueCon", Reconnects: 5},
+	}
+	if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(JSN_CFG); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(eCgrCfg.SmFsConfig, cgrCfg.SmFsConfig) {
+		t.Errorf("Expected: %+v, received: %+v", eCgrCfg.SmFsConfig, cgrCfg.SmFsConfig)
+	}
+}
diff --git a/config/smconfig.go b/config/smconfig.go
index 05d72d023..f92521c99 100644
--- a/config/smconfig.go
+++ b/config/smconfig.go
@@ -28,7 +28,8 @@ func NewDfltFsConnConfig() *FsConnConfig {
 	if dfltFsConnConfig == nil {
 		return new(FsConnConfig) // No defaults, most probably we are building the defaults now
 	}
-	return dfltFsConnConfig
+	dfltVal := *dfltFsConnConfig // Copy the value instead of it's pointer
+	return &dfltVal
 }
 
 // One connection to FreeSWITCH server
@@ -136,7 +137,8 @@ func NewDfltKamConnConfig() *KamConnConfig {
 	if dfltKamConnConfig == nil {
 		return new(KamConnConfig) // No defaults, most probably we are building the defaults now
 	}
-	return dfltKamConnConfig
+	dfltVal := *dfltKamConnConfig
+	return &dfltVal
 }
 
 // Represents one connection instance towards Kamailio