uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated diamagent

Browse Source
This commit is contained in:
Trial97
2020-03-24 13:02:55 +02:00
committed by Dan Christian Bogos
parent 9b419f3a7c
commit 6123d9ead9
4 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
agents/diam_it_test.go
View File

@@ -684,7 +684,6 @@ func testDiamItCCRUpdate(t *testing.T) {
},
}),
}})
m.NewAVP(avp.UserName, avp.Mbit, 0, datatype.UTF8String("User1"))
// ============================================
// prevent nil pointer dereference
// ============================================

13
agents/diamagent.go
View File

@@ -36,6 +36,11 @@ import (
"github.com/fiorix/go-diameter/diam/sm"
)
const (
all = "ALL"
raa = "RAA"
)
func NewDiameterAgent(cgrCfg *config.CGRConfig, filterS *engine.FilterS,
connMgr *engine.ConnManager) (*DiameterAgent, error) {
da := &DiameterAgent{cgrCfg: cgrCfg, filterS: filterS, connMgr: connMgr, raa: make(map[string]chan *diam.Message)}
@@ -112,11 +117,11 @@ func (da *DiameterAgent) handlers() diam.Handler {
dSM := sm.New(settings)
if da.cgrCfg.DiameterAgentCfg().SyncedConnReqs {
dSM.HandleFunc("ALL", da.handleMessage)
dSM.HandleFunc("RA", da.handleRAA)
dSM.HandleFunc(all, da.handleMessage)
dSM.HandleFunc(raa, da.handleRAA)
} else {
dSM.HandleFunc("ALL", da.handleMessageAsync)
dSM.HandleFunc("RAA", func(c diam.Conn, m *diam.Message) { go da.handleRAA(c, m) })
dSM.HandleFunc(all, da.handleMessageAsync)
dSM.HandleFunc(raa, func(c diam.Conn, m *diam.Message) { go da.handleRAA(c, m) })
}
go func() {

8
config/config_defaults.go
View File

@@ -455,10 +455,6 @@ const CGRATES_CFG_JSON = `
"value": "~*req.Origin-Host", "mandatory": true},
{"tag": "AuthApplicationId", "path": "*diamreq.Auth-Application-Id", "type": "*variable",
"value": "~*vars.*appid", "mandatory": true},
{"tag": "UserName", "path": "*diamreq.User-Name", "type": "*variable",
"value": "~*req.User-Name", "mandatory": true},
{"tag": "OriginStateID", "path": "*diamreq.Origin-State-Id", "type": "*constant",
"value": "1"},
],
"*rar": [
{"tag": "SessionId", "path": "*diamreq.Session-Id", "type": "*variable",
@@ -473,10 +469,6 @@ const CGRATES_CFG_JSON = `
"value": "~*req.Origin-Host", "mandatory": true},
{"tag": "AuthApplicationId", "path": "*diamreq.Auth-Application-Id", "type": "*variable",
"value": "~*vars.*appid", "mandatory": true},
{"tag": "UserName", "path": "*diamreq.User-Name", "type": "*variable",
"value": "~*req.User-Name", "mandatory": true},
{"tag": "OriginStateID", "path": "*diamreq.Origin-State-Id", "type": "*constant",
"value": "1"},
{"tag": "ReAuthRequestType", "path": "*diamreq.Re-Auth-Request-Type", "type": "*constant",
"value": "0"},
]

22
config/config_json_test.go
View File

@@ -859,17 +859,6 @@ func TestDiameterAgentJsonCfg(t *testing.T) {
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*vars.*appid"),
Mandatory: utils.BoolPointer(true)},
{
Tag: utils.StringPointer("UserName"),
Path: utils.StringPointer(fmt.Sprintf("%s.User-Name", utils.MetaDiamreq)),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.User-Name"),
Mandatory: utils.BoolPointer(true)},
{
Tag: utils.StringPointer("OriginStateID"),
Path: utils.StringPointer(fmt.Sprintf("%s.Origin-State-Id", utils.MetaDiamreq)),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("1")},
},
utils.MetaRAR: {
{
@@ -908,17 +897,6 @@ func TestDiameterAgentJsonCfg(t *testing.T) {
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*vars.*appid"),
Mandatory: utils.BoolPointer(true)},
{
Tag: utils.StringPointer("UserName"),
Path: utils.StringPointer(fmt.Sprintf("%s.User-Name", utils.MetaDiamreq)),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer("~*req.User-Name"),
Mandatory: utils.BoolPointer(true)},
{
Tag: utils.StringPointer("OriginStateID"),
Path: utils.StringPointer(fmt.Sprintf("%s.Origin-State-Id", utils.MetaDiamreq)),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("1")},
{
Tag: utils.StringPointer("ReAuthRequestType"),
Path: utils.StringPointer(fmt.Sprintf("%s.Re-Auth-Request-Type", utils.MetaDiamreq)),