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

In agents use AsCGREvent function for freeswitch and kamailio

Browse Source
This commit is contained in:
TeoV
2018-05-08 08:31:40 -04:00
committed by Dan Christian Bogos
parent 787174d897
commit 39d276b6d4
2 changed files with 15 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
agents/fsevent.go
View File

@@ -392,19 +392,13 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{}
// V1AuthorizeArgs returns the arguments used in SMGv1.Authorize
func (fsev FSEvent) V1AuthorizeArgs() (args *sessions.V1AuthorizeArgs) {
timezone := config.CgrConfig().DefaultTimezone
sTime, err := fsev.GetSetupTime(utils.META_DEFAULT, timezone)
cgrEv, err := fsev.AsCGREvent(config.CgrConfig().DefaultTimezone)
if err != nil {
return
}
args = &sessions.V1AuthorizeArgs{ // defaults
GetMaxUsage: true,
CGREvent: utils.CGREvent{
Tenant: fsev.GetTenant(utils.META_DEFAULT),
ID: utils.UUIDSha1Prefix(),
Time: &sTime,
Event: fsev.AsMapStringInterface(timezone),
},
CGREvent: *cgrEv,
}
subsystems, has := fsev[VarCGRSubsystems]
if !has {
@@ -439,19 +433,13 @@ func (fsev FSEvent) V1AuthorizeArgs() (args *sessions.V1AuthorizeArgs) {
// V1InitSessionArgs returns the arguments used in SessionSv1.InitSession
func (fsev FSEvent) V1InitSessionArgs() (args *sessions.V1InitSessionArgs) {
timezone := config.CgrConfig().DefaultTimezone
sTime, err := fsev.GetSetupTime(utils.META_DEFAULT, timezone)
cgrEv, err := fsev.AsCGREvent(config.CgrConfig().DefaultTimezone)
if err != nil {
return
}
args = &sessions.V1InitSessionArgs{ // defaults
InitSession: true,
CGREvent: utils.CGREvent{
Tenant: fsev.GetTenant(utils.META_DEFAULT),
ID: utils.UUIDSha1Prefix(),
Time: &sTime,
Event: fsev.AsMapStringInterface(timezone),
},
CGREvent: *cgrEv,
}
subsystems, has := fsev[VarCGRSubsystems]
if !has {
@@ -477,19 +465,13 @@ func (fsev FSEvent) V1InitSessionArgs() (args *sessions.V1InitSessionArgs) {
// V1TerminateSessionArgs returns the arguments used in SMGv1.TerminateSession
func (fsev FSEvent) V1TerminateSessionArgs() (args *sessions.V1TerminateSessionArgs) {
timezone := config.CgrConfig().DefaultTimezone
sTime, err := fsev.GetSetupTime(utils.META_DEFAULT, timezone)
cgrEv, err := fsev.AsCGREvent(config.CgrConfig().DefaultTimezone)
if err != nil {
return
}
args = &sessions.V1TerminateSessionArgs{ // defaults
TerminateSession: true,
CGREvent: utils.CGREvent{
Tenant: fsev.GetTenant(utils.META_DEFAULT),
ID: utils.UUIDSha1Prefix(),
Time: &sTime,
Event: fsev.AsMapStringInterface(timezone),
},
CGREvent: *cgrEv,
}
subsystems, has := fsev[VarCGRSubsystems]
if !has {

96
agents/kamevent.go
View File

@@ -197,39 +197,13 @@ func (kev KamEvent) String() string {
}
func (kev KamEvent) V1AuthorizeArgs() (args *sessions.V1AuthorizeArgs) {
timezone := config.CgrConfig().DefaultTimezone
var sTime time.Time
switch kev[EVENT] {
case CGR_AUTH_REQUEST:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.SetupTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
case CGR_CALL_START:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.AnswerTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
case CGR_CALL_END:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.AnswerTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
default: // no/unsupported event
cgrEv, err := kev.AsCGREvent(config.CgrConfig().DefaultTimezone)
if err != nil {
return
}
args = &sessions.V1AuthorizeArgs{
GetMaxUsage: true,
CGREvent: utils.CGREvent{
Tenant: utils.FirstNonEmpty(kev[utils.Tenant],
config.CgrConfig().DefaultTenant),
ID: utils.UUIDSha1Prefix(),
Time: &sTime,
Event: kev.AsMapStringInterface(),
},
CGREvent: *cgrEv,
}
subsystems, has := kev[KamCGRSubsystems]
if !has {
@@ -297,39 +271,13 @@ func (kev KamEvent) AsKamAuthReply(authArgs *sessions.V1AuthorizeArgs,
// V1InitSessionArgs returns the arguments used in SessionSv1.InitSession
func (kev KamEvent) V1InitSessionArgs() (args *sessions.V1InitSessionArgs) {
timezone := config.CgrConfig().DefaultTimezone
var sTime time.Time
switch kev[EVENT] {
case CGR_AUTH_REQUEST:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.SetupTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
case CGR_CALL_START:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.AnswerTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
case CGR_CALL_END:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.AnswerTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
default: // no/unsupported event
cgrEv, err := kev.AsCGREvent(config.CgrConfig().DefaultTimezone)
if err != nil {
return
}
args = &sessions.V1InitSessionArgs{ // defaults
InitSession: true,
CGREvent: utils.CGREvent{
Tenant: utils.FirstNonEmpty(kev[utils.Tenant],
config.CgrConfig().DefaultTenant),
ID: utils.UUIDSha1Prefix(),
Time: &sTime,
Event: kev.AsMapStringInterface(),
},
CGREvent: *cgrEv,
}
subsystems, has := kev[KamCGRSubsystems]
if !has {
@@ -355,39 +303,13 @@ func (kev KamEvent) V1InitSessionArgs() (args *sessions.V1InitSessionArgs) {
// V1TerminateSessionArgs returns the arguments used in SMGv1.TerminateSession
func (kev KamEvent) V1TerminateSessionArgs() (args *sessions.V1TerminateSessionArgs) {
timezone := config.CgrConfig().DefaultTimezone
var sTime time.Time
switch kev[EVENT] {
case CGR_AUTH_REQUEST:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.SetupTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
case CGR_CALL_START:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.AnswerTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
case CGR_CALL_END:
sTimePrv, err := utils.ParseTimeDetectLayout(kev[utils.AnswerTime], timezone)
if err != nil {
return
}
sTime = sTimePrv
default: // no/unsupported event
cgrEv, err := kev.AsCGREvent(config.CgrConfig().DefaultTimezone)
if err != nil {
return
}
args = &sessions.V1TerminateSessionArgs{ // defaults
TerminateSession: true,
CGREvent: utils.CGREvent{
Tenant: utils.FirstNonEmpty(kev[utils.Tenant],
config.CgrConfig().DefaultTenant),
ID: utils.UUIDSha1Prefix(),
Time: &sTime,
Event: kev.AsMapStringInterface(),
},
CGREvent: *cgrEv,
}
subsystems, has := kev[KamCGRSubsystems]
if !has {