From 00b64ccc6334e79b4c96abf695b98977658f9daf Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 26 Jun 2018 18:24:32 +0200 Subject: [PATCH] SMGenericV1.InitSession returning -1 for postpaid instead of nanoseconds, to keep OpenSIPS 2.3 happy --- sessions/sessions.go | 9 +++++++++ sessions/smgbirpc_it_test.go | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sessions/sessions.go b/sessions/sessions.go index 8ab4e4946..50625d808 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -1108,6 +1108,10 @@ func (smg *SMGeneric) BiRPCV1InitiateSession(clnt rpcclient.RpcClientConnection, if err != rpcclient.ErrSessionNotFound { err = utils.NewErrServerError(err) } + return + } + if minMaxUsage == time.Duration(-1) { + *maxUsage = -1.0 } else { *maxUsage = minMaxUsage.Seconds() } @@ -1122,6 +1126,7 @@ func (smg *SMGeneric) BiRPCV2InitiateSession(clnt rpcclient.RpcClientConnection, if err != rpcclient.ErrSessionNotFound { err = utils.NewErrServerError(err) } + return } else { *maxUsage = minMaxUsage } @@ -1136,6 +1141,10 @@ func (smg *SMGeneric) BiRPCV1UpdateSession(clnt rpcclient.RpcClientConnection, if err != rpcclient.ErrSessionNotFound { err = utils.NewErrServerError(err) } + return + } + if minMaxUsage == time.Duration(-1) { + *maxUsage = -1.0 } else { *maxUsage = minMaxUsage.Seconds() } diff --git a/sessions/smgbirpc_it_test.go b/sessions/smgbirpc_it_test.go index 7439971f4..8433e1441 100644 --- a/sessions/smgbirpc_it_test.go +++ b/sessions/smgbirpc_it_test.go @@ -150,7 +150,7 @@ func TestSMGBiRPCSessionAutomaticDisconnects(t *testing.T) { smgEv, &maxUsage); err != nil { t.Error(err) } - if maxUsage != -1e-09 { + if maxUsage != -1 { t.Error("Bad max usage: ", maxUsage) } // Make sure we are receiving a disconnect event @@ -231,7 +231,7 @@ func TestSMGBiRPCSessionOriginatorTerminate(t *testing.T) { smgEv, &maxUsage); err != nil { t.Error(err) } - if maxUsage != -1e-09 { + if maxUsage != -1 { t.Error("Bad max usage: ", maxUsage) } time.Sleep(time.Duration(10 * time.Millisecond)) // Give time for debits to occur