From 55d6fed982fda87b05fd4dc6bb7a78026fa047f2 Mon Sep 17 00:00:00 2001 From: Anssi Mannila Date: Tue, 2 Aug 2022 12:41:48 +0300 Subject: [PATCH] Coverity issues fiexd Change-Id: I014e1512b43cb299c9dfb8dfe8965c184e795af3 Signed-off-by: Anssi Mannila --- container-tag.yaml | 2 +- pkg/control/control.go | 29 ++++++++++++++--------------- pkg/control/debug_rest_if.go | 10 ++++++++-- pkg/control/registry.go | 6 +++--- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/container-tag.yaml b/container-tag.yaml index fe2e33a..cd92817 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -2,4 +2,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: "0.9.3" +tag: "0.9.4" diff --git a/pkg/control/control.go b/pkg/control/control.go index 49b7968..706dc3b 100755 --- a/pkg/control/control.go +++ b/pkg/control/control.go @@ -180,7 +180,12 @@ func NewControl() *Control { } } - go xapp.Subscription.Listen(c.RESTSubscriptionHandler, c.RESTQueryHandler, c.RESTSubscriptionDeleteHandler) + go func() { + err := xapp.Subscription.Listen(c.RESTSubscriptionHandler, c.RESTQueryHandler, c.RESTSubscriptionDeleteHandler) + if err != nil { + xapp.Logger.Error("xapp.Subscription.Listen failure: %s", err.Error()) + } + }() return c } @@ -681,10 +686,8 @@ func (c *Control) handleSubscriptionRequest(trans *TransactionXapp, subReqMsg *e } xapp.Logger.Error("XAPP-SubReq E2 subscription failed: %s", idstring(err, trans, subs)) - err2 := c.registry.RemoveFromSubscription(subs, trans, waitRouteCleanup_ms, c) - if err2 != nil { - xapp.Logger.Error("RemoveFromSubscription failed: %s", err2.Error()) - } + c.registry.RemoveFromSubscription(subs, trans, waitRouteCleanup_ms, c) + return nil, &errorInfo, err } @@ -862,10 +865,7 @@ func (c *Control) SubscriptionDeleteHandler(restSubId *string, endPoint *string, xapp.Logger.Debug("XAPP-SubDelReq: Handling event %s ", idstring(nil, trans, subs)) - err = c.registry.RemoveFromSubscription(subs, trans, waitRouteCleanup_ms, c) - if err != nil { - xapp.Logger.Error("XAPP-SubDelReq %s:", idstring(fmt.Errorf("RemoveFromSubscription faliled"), trans, subs)) - } + c.registry.RemoveFromSubscription(subs, trans, waitRouteCleanup_ms, c) return xAppEventInstanceID, nil } @@ -994,12 +994,14 @@ func (c *Control) handleXAPPSubscriptionRequest(params *xapp.RMRParams) { //------------------------------------------------------------------ func (c *Control) wakeSubscriptionRequest(subs *Subscription, trans *TransactionXapp) { - e2SubscriptionDirectives, _ := c.GetE2SubscriptionDirectives(nil) + e2SubscriptionDirectives, err := c.GetE2SubscriptionDirectives(nil) + if err != nil { + xapp.Logger.Error("c.GetE2SubscriptionDirectives failure: %s", err.Error()) + } subs.OngoingReqCount++ go c.handleSubscriptionCreate(subs, trans, e2SubscriptionDirectives, waitRouteCleanup_ms) event, _ := trans.WaitEvent(0) //blocked wait as timeout is handled in subs side subs.OngoingReqCount-- - var err error if event != nil { switch themsg := event.(type) { case *e2ap.E2APSubscriptionResponse: @@ -1155,10 +1157,7 @@ func (c *Control) handleSubscriptionCreate(subs *Subscription, parentTrans *Tran // Now RemoveFromSubscription in here to avoid race conditions (mostly concerns delete) if valid == false { - err = c.registry.RemoveFromSubscription(subs, parentTrans, waitRouteCleanupTime, c) - if err != nil { - xapp.Logger.Error("RemoveFromSubscription() failed:%s", err.Error()) - } + c.registry.RemoveFromSubscription(subs, parentTrans, waitRouteCleanupTime, c) } parentTrans.SendEvent(subRfMsg, 0) diff --git a/pkg/control/debug_rest_if.go b/pkg/control/debug_rest_if.go index 0d249d9..f5ae4c5 100644 --- a/pkg/control/debug_rest_if.go +++ b/pkg/control/debug_rest_if.go @@ -39,7 +39,10 @@ func (c *Control) TestRestHandler(w http.ResponseWriter, r *http.Request) { var splits = strings.Split(s, "=") if subId, err := strconv.ParseInt(splits[1], 10, 64); err == nil { xapp.Logger.Debug("RemoveSubscriptionFromSdl() called. subId = %v", subId) - c.RemoveSubscriptionFromSdl(uint32(subId)) + err := c.RemoveSubscriptionFromSdl(uint32(subId)) + if err != nil { + xapp.Logger.Error("c.RemoveSubscriptionFromSdl failure: %s", err.Error()) + } return } } @@ -84,7 +87,10 @@ func (c *Control) GetAllE2Nodes(w http.ResponseWriter, r *http.Request) { // Get all E2Nodes in subscription manager xapp.Logger.Debug("GetAllE2Nodes() called") - w.Write(c.e2IfState.GetE2NodesJson()) + _, err := w.Write(c.e2IfState.GetE2NodesJson()) + if err != nil { + xapp.Logger.Error("w.Write failure: %s", err.Error()) + } } func (c *Control) GetAllE2NodeRestSubscriptions(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/control/registry.go b/pkg/control/registry.go index 88a4cc5..5e9d63e 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -511,7 +511,7 @@ func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (ui return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Invalid action type in RICactions-ToBeSetup-List") } -func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *TransactionXapp, waitRouteClean time.Duration, c *Control) error { +func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *TransactionXapp, waitRouteClean time.Duration, c *Control) { xapp.Logger.Debug("RemoveFromSubscription %s", idstring(nil, trans, subs, trans)) r.mutex.Lock() @@ -524,7 +524,7 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction subId := subs.ReqId.InstanceId if delStatus == false { - return nil + return } if waitRouteClean > 0 { @@ -575,7 +575,7 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction } c.UpdateCounter(cUnmergedSubscriptions) } - return nil + return } func (r *Registry) RouteDelete(subs *Subscription, trans *TransactionXapp, c *Control) { -- 2.16.6