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

Clean the code

Browse Source
This commit is contained in:
TeoV
2018-04-24 08:57:22 -04:00
committed by Dan Christian Bogos
parent bbc2f5d90a
commit 66909f9eeb
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
agents/kamagent.go
View File

@@ -108,8 +108,7 @@ func (ka *KamailioAgent) onCgrAuth(evData []byte, connID string) {
utils.KamailioAgent, kev[utils.OriginID]))
return
}
ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
authArgs.CGREvent.Event[utils.OriginHost] = ipv4Addr
authArgs.CGREvent.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
var authReply sessions.V1AuthorizeReply
err = ka.sessionS.Call(utils.SessionSv1AuthorizeEvent, authArgs, &authReply)
if kar, err := kev.AsKamAuthReply(authArgs, &authReply, err); err != nil {
@@ -144,8 +143,7 @@ func (ka *KamailioAgent) onCallStart(evData []byte, connID string) {
return
}
initSessionArgs.CGREvent.Event[EvapiConnID] = connID // Attach the connection ID so we can properly disconnect later
ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
initSessionArgs.CGREvent.Event[utils.OriginHost] = ipv4Addr
initSessionArgs.CGREvent.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
var initReply sessions.V1InitSessionReply
if err := ka.sessionS.Call(utils.SessionSv1InitiateSession,
initSessionArgs, &initReply); err != nil {
@@ -181,8 +179,7 @@ func (ka *KamailioAgent) onCallEnd(evData []byte, connID string) {
return
}
var reply string
ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
tsArgs.CGREvent.Event[utils.OriginHost] = ipv4Addr
tsArgs.CGREvent.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
if err := ka.sessionS.Call(utils.SessionSv1TerminateSession,
tsArgs, &reply); err != nil {
utils.Logger.Err(
@@ -195,8 +192,7 @@ func (ka *KamailioAgent) onCallEnd(evData []byte, connID string) {
if err != nil {
return
}
ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
cgrEv.Event[utils.OriginHost] = ipv4Addr
cgrEv.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
if err := ka.sessionS.Call(utils.SessionSv1ProcessCDR, *cgrEv, &reply); err != nil {
utils.Logger.Err(fmt.Sprintf("%s> failed processing CGREvent: %s, error: %s",
utils.KamailioAgent, utils.ToJSON(cgrEv), err.Error()))

1
sessions/sevent.go
View File

@@ -310,7 +310,6 @@ func (self SMGenericEvent) GetOriginatorIP(fieldName string) string {
}
func (self SMGenericEvent) GetCdrSource() string {
fmt.Printf("Event %+v\n", self)
return utils.SMG + "_" + self.GetName()
}