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

Use fiorix library for diameter

Browse Source
This commit is contained in:
TeoV
2019-07-17 10:13:32 +03:00
committed by Dan Christian Bogos
parent 91b6629097
commit b92280e38e
8 changed files with 25 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
agents/agentreq_test.go
View File

@@ -30,10 +30,10 @@ import (
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/go-diameter/diam"
"github.com/cgrates/go-diameter/diam/avp"
"github.com/cgrates/go-diameter/diam/datatype"
"github.com/cgrates/radigo"
"github.com/fiorix/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype"
)
func TestAgReqAsNavigableMap(t *testing.T) {

8
agents/diam_it_test.go
View File

@@ -30,10 +30,10 @@ import (
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/go-diameter/diam"
"github.com/cgrates/go-diameter/diam/avp"
"github.com/cgrates/go-diameter/diam/datatype"
"github.com/cgrates/go-diameter/diam/dict"
"github.com/fiorix/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/dict"
)
var (

6
agents/diamagent.go
View File

@@ -29,10 +29,10 @@ import (
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/sessions"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/go-diameter/diam"
"github.com/cgrates/go-diameter/diam/datatype"
"github.com/cgrates/go-diameter/diam/sm"
"github.com/cgrates/rpcclient"
"github.com/fiorix/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/sm"
)
func NewDiameterAgent(cgrCfg *config.CGRConfig, filterS *engine.FilterS,

8
agents/diamclient.go
View File

@@ -26,10 +26,10 @@ import (
"time"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/go-diameter/diam"
"github.com/cgrates/go-diameter/diam/avp"
"github.com/cgrates/go-diameter/diam/datatype"
"github.com/cgrates/go-diameter/diam/sm"
"github.com/fiorix/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/sm"
)
var dictOnce sync.Once

26
agents/libdiam.go
View File

@@ -31,10 +31,10 @@ import (
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/go-diameter/diam"
"github.com/cgrates/go-diameter/diam/avp"
"github.com/cgrates/go-diameter/diam/datatype"
"github.com/cgrates/go-diameter/diam/dict"
"github.com/fiorix/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/dict"
)
func loadDictionaries(dictsDir, componentId string) error {
@@ -462,7 +462,7 @@ func updateDiamMsgFromNavMap(m *diam.Message, navMp *config.NavigableMap, tmz st
// diamAnswer builds up the answer to be sent back to the client
func diamAnswer(m *diam.Message, resCode uint32, errFlag bool,
rply *config.NavigableMap, tmz string) (a *diam.Message, err error) {
a = newDiamAnswer(m, resCode)
a = m.Answer(resCode)
if errFlag {
a.Header.CommandFlags = diam.ErrorFlag
}
@@ -508,22 +508,6 @@ func disectDiamListen(addrs string) (ipAddrs []net.IP) {
return
}
// newDiamAnswer temporary until fiorix will fix the issue
func newDiamAnswer(m *diam.Message, resCode uint32) *diam.Message {
nm := diam.NewMessage(
m.Header.CommandCode,
m.Header.CommandFlags&^diam.RequestFlag, // Reset the Request bit.
m.Header.ApplicationID,
m.Header.HopByHopID,
m.Header.EndToEndID,
m.Dictionary(),
)
if resCode != 0 {
nm.NewAVP(avp.ResultCode, avp.Mbit, 0, datatype.Unsigned32(resCode))
}
return nm
}
// diamMessageData is cached when data is needed (ie. )
type diamMsgData struct {
c diam.Conn

6
agents/libdiam_test.go
View File

@@ -26,9 +26,9 @@ import (
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/go-diameter/diam"
"github.com/cgrates/go-diameter/diam/avp"
"github.com/cgrates/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype"
)
func TestDPFieldAsInterface(t *testing.T) {

4
glide.lock generated
View File

@@ -61,8 +61,8 @@ imports:
version: f996da7890eaec95ba13240253744446e17e6598
- name: github.com/cgrates/fsock
version: 317895b42f1af0a0d3a845701b4612473a438fcb
- name: github.com/cgrates/go-diameter
version: 74cc2c72ff0c6ff7af51868c6e541b6d1b7c5514
- name: github.com/fiorix/go-diameter
version: f4823472d0e034d116b1aad90c065a347798c4d8
subpackages:
- diam
- diam/avp

2
glide.yaml
View File

@@ -5,7 +5,7 @@ import:
- package: github.com/cgrates/kamevapi
- package: github.com/cgrates/osipsdagram
- package: github.com/cgrates/rpcclient
- package: github.com/cgrates/go-diameter
- package: github.com/fiorix/go-diameter
subpackages:
- diam
- diam/avp