Code Review
/
ric-plt
/
submgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Transaction needs only subs id.
[ric-plt/submgr.git]
/
pkg
/
control
/
control.go
diff --git
a/pkg/control/control.go
b/pkg/control/control.go
index
094e020
..
2d7d535
100755
(executable)
--- a/
pkg/control/control.go
+++ b/
pkg/control/control.go
@@
-188,7
+188,7
@@
func (c *Control) handleXAPPSubscriptionRequest(params *xapptweaks.RMRParams) {
return
}
return
}
- trans := c.tracker.NewXappTransaction(NewRmrEndpoint(params.Src), params.Xid,
&RequestId{subReqMsg.RequestId}
, params.Meid)
+ trans := c.tracker.NewXappTransaction(NewRmrEndpoint(params.Src), params.Xid,
subReqMsg.RequestId.Seq
, params.Meid)
if trans == nil {
xapp.Logger.Error("XAPP-SubReq: %s", idstring(fmt.Errorf("transaction not created"), params))
return
if trans == nil {
xapp.Logger.Error("XAPP-SubReq: %s", idstring(fmt.Errorf("transaction not created"), params))
return
@@
-219,6
+219,7
@@
func (c *Control) handleXAPPSubscriptionRequest(params *xapptweaks.RMRParams) {
case *e2ap.E2APSubscriptionResponse:
trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionResponse(themsg)
if err == nil {
case *e2ap.E2APSubscriptionResponse:
trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionResponse(themsg)
if err == nil {
+ trans.Release()
c.rmrSendToXapp("", subs, trans)
return
}
c.rmrSendToXapp("", subs, trans)
return
}
@@
-247,7
+248,7
@@
func (c *Control) handleXAPPSubscriptionDeleteRequest(params *xapptweaks.RMRPara
return
}
return
}
- trans := c.tracker.NewXappTransaction(NewRmrEndpoint(params.Src), params.Xid,
&RequestId{subDelReqMsg.RequestId}
, params.Meid)
+ trans := c.tracker.NewXappTransaction(NewRmrEndpoint(params.Src), params.Xid,
subDelReqMsg.RequestId.Seq
, params.Meid)
if trans == nil {
xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(fmt.Errorf("transaction not created"), params))
return
if trans == nil {
xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(fmt.Errorf("transaction not created"), params))
return
@@
-260,7
+261,7
@@
func (c *Control) handleXAPPSubscriptionDeleteRequest(params *xapptweaks.RMRPara
return
}
return
}
- subs, err := c.registry.GetSubscriptionFirstMatch([]uint32{
subDelReqMsg.RequestId.Seq
})
+ subs, err := c.registry.GetSubscriptionFirstMatch([]uint32{
trans.GetSubId()
})
if err != nil {
xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(err, trans))
return
if err != nil {
xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(err, trans))
return
@@
-276,7
+277,7
@@
func (c *Control) handleXAPPSubscriptionDeleteRequest(params *xapptweaks.RMRPara
// Whatever is received send ok delete response
subDelRespMsg := &e2ap.E2APSubscriptionDeleteResponse{}
// Whatever is received send ok delete response
subDelRespMsg := &e2ap.E2APSubscriptionDeleteResponse{}
- subDelRespMsg.RequestId = subs.
SubReqMsg
.RequestId
+ subDelRespMsg.RequestId = subs.
GetReqId()
.RequestId
subDelRespMsg.FunctionId = subs.SubReqMsg.FunctionId
trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteResponse(subDelRespMsg)
if err == nil {
subDelRespMsg.FunctionId = subs.SubReqMsg.FunctionId
trans.Mtype, trans.Payload, err = c.e2ap.PackSubscriptionDeleteResponse(subDelRespMsg)
if err == nil {
@@
-341,10
+342,7
@@
func (c *Control) handleSubscriptionDelete(subs *Subscription, parentTrans *Tran
subs.mutex.Unlock()
}
subs.mutex.Unlock()
}
- subDelRespMsg := &e2ap.E2APSubscriptionDeleteResponse{}
- subDelRespMsg.RequestId = subs.SubReqMsg.RequestId
- subDelRespMsg.FunctionId = subs.SubReqMsg.FunctionId
- parentTrans.SendEvent(subDelRespMsg, 0)
+ parentTrans.SendEvent(nil, 0)
}
//-------------------------------------------------------------------
}
//-------------------------------------------------------------------