c.rmrSend("SubReq to E2T", subs, trans, packedData.Buf, len(packedData.Buf))
- c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.Seq), subReqTime, FirstTry, c.handleSubscriptionRequestTimer)
+ c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.GetSubId()), subReqTime, FirstTry, c.handleSubscriptionRequestTimer)
xapp.Logger.Debug("SubReq: Debugging trans table = %v", c.tracker.transactionXappTable)
return
}
func (c *Control) handleSubscriptionResponse(params *RMRParams) {
xapp.Logger.Info("SubResp from E2T: %s", params.String())
- payloadSeqNum, err := c.e2ap.GetSubscriptionResponseSequenceNumber(params.Payload)
+ //
+ //
+ //
+ SubRespMsg, err := c.e2ap.UnpackSubscriptionResponse(params.Payload)
if err != nil {
- xapp.Logger.Error("SubResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload)
+ xapp.Logger.Error("SubDelReq: %s Dropping this msg. %s", err.Error(), params.String())
return
}
- xapp.Logger.Info("SubResp: Received payloadSeqNum: %v", payloadSeqNum)
- subs := c.registry.GetSubscription(payloadSeqNum)
+ //
+ //
+ //
+ subs := c.registry.GetSubscription(uint16(SubRespMsg.RequestId.Seq))
+ if subs == nil && params.SubId > 0 {
+ subs = c.registry.GetSubscription(uint16(params.SubId))
+ }
+
if subs == nil {
- xapp.Logger.Error("SubResp: Unknown payloadSeqNum. Dropping this msg. PayloadSeqNum: %v, SubId: %v", payloadSeqNum, params.SubId)
+ xapp.Logger.Error("SubResp: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", SubRespMsg.RequestId.Seq, params.SubId, params.String())
return
}
+ xapp.Logger.Info("SubResp: subscription found payloadSeqNum: %d, SubId: %d", SubRespMsg.RequestId.Seq, subs.GetSubId())
+ //
+ //
+ //
trans := subs.GetTransaction()
+ if trans == nil {
+ xapp.Logger.Error("SubResp: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId())
+ return
+ }
- c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum))
+ trans.SubRespMsg = SubRespMsg
+
+ //
+ //
+ //
+ c.timerMap.StopTimer("RIC_SUB_REQ", int(subs.GetSubId()))
responseReceived := trans.CheckResponseReceived()
if responseReceived == true {
return
}
+ packedData, err := c.e2ap.PackSubscriptionResponse(trans.SubRespMsg)
+ if err != nil {
+ xapp.Logger.Error("SubResp: %s for trans %s", err.Error(), trans)
+ trans.Release()
+ return
+ }
+
+ //Optimize and store packed message to be sent.
+ trans.Payload = packedData.Buf
+ trans.PayloadLen = len(packedData.Buf)
+
subs.Confirmed()
trans.Release()
- c.rmrReplyToSender("SubResp to xapp", subs, trans, params.Mtype, params.Payload, params.PayloadLen)
- xapp.Logger.Info("SubResp: SubId: %v, from address: %s. Deleting trans record", payloadSeqNum, trans.RmrEndpoint)
+ c.rmrReplyToSender("SubResp to xapp", subs, trans, 12011, trans.Payload, trans.PayloadLen)
return
}
}
func (c *Control) handleSubscriptionDeleteRequest(params *RMRParams) {
- var subs *Subscription
-
xapp.Logger.Info("SubDelReq from xapp: %s", params.String())
+ //
+ //
+ //
trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src),
params.Mtype,
params.Xid,
return
}
- subs = c.registry.GetSubscription(uint16(trans.SubDelReqMsg.RequestId.Seq))
+ //
+ //
+ //
+ subs := c.registry.GetSubscription(uint16(trans.SubDelReqMsg.RequestId.Seq))
if subs == nil && params.SubId > 0 {
subs = c.registry.GetSubscription(uint16(params.SubId))
}
type E2ap struct {
}
-/* RICsubscriptionResponse */
-
-// Used by submgr, xapp test stub
-func (c *E2ap) GetSubscriptionResponseSequenceNumber(payload []byte) (subId uint16, err error) {
- cptr := unsafe.Pointer(&payload[0])
- cret := C.e2ap_get_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload)))
- if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
- }
- subId = uint16(cret)
- return
-}
-
-// Used by e2t test stub
-func (c *E2ap) SetSubscriptionResponseSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) {
- cptr := unsafe.Pointer(&payload[0])
- size := C.e2ap_set_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
- if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
- }
- return
-}
-
/* RICsubscriptionDeleteResponse */
// Used by submgr, e2t test stub
return packedData, nil
}
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptionResponse, error) {
+ e2SubResp := packerif.NewPackerSubscriptionResponse()
+ packedData := &packer.PackedData{}
+ packedData.Buf = payload
+ err := e2SubResp.UnPack(packedData)
+ if err != nil {
+ return nil, err
+ }
+ err, subResp := e2SubResp.Get()
+ if err != nil {
+ return nil, err
+ }
+ return subResp, nil
+}
+
+func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (*packer.PackedData, error) {
+ e2SubResp := packerif.NewPackerSubscriptionResponse()
+ err := e2SubResp.Set(req)
+ if err != nil {
+ return nil, err
+ }
+ err, packedData := e2SubResp.Pack(nil)
+ if err != nil {
+ return nil, err
+ }
+ return packedData, nil
+}
+
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
if err != nil {
return nil, err
}
- err, subReq := e2SubDelReq.Get()
+ err, subDelReq := e2SubDelReq.Get()
if err != nil {
return nil, err
}
- return subReq, nil
+ return subDelReq, nil
}
func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (*packer.PackedData, error) {
return packedData, nil
}
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) {
+ e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
+ packedData := &packer.PackedData{}
+ packedData.Buf = payload
+ err := e2SubDelResp.UnPack(packedData)
+ if err != nil {
+ return nil, err
+ }
+ err, subDelResp := e2SubDelResp.Get()
+ if err != nil {
+ return nil, err
+ }
+ return subDelResp, nil
+}
+
func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (*packer.PackedData, error) {
e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
err := e2SubDelResp.Set(req)