func (c *Control) handleSubscriptionFailure(params *RMRParams) {
xapp.Logger.Info("SubFail from E2T: %s", params.String())
- payloadSeqNum, err := c.e2ap.GetSubscriptionFailureSequenceNumber(params.Payload)
+ //
+ //
+ //
+ SubFailMsg, err := c.e2ap.UnpackSubscriptionFailure(params.Payload)
if err != nil {
- xapp.Logger.Error("SubFail: 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("SubFail: %s Dropping this msg. %s", err.Error(), params.String())
return
}
- xapp.Logger.Info("SubFail: Received payloadSeqNum: %v", payloadSeqNum)
- subs := c.registry.GetSubscription(payloadSeqNum)
+ //
+ //
+ //
+ subs := c.registry.GetSubscription(uint16(SubFailMsg.RequestId.Seq))
+ if subs == nil && params.SubId > 0 {
+ subs = c.registry.GetSubscription(uint16(params.SubId))
+ }
+
if subs == nil {
- xapp.Logger.Error("SubFail: Unknown payloadSeqNum. Dropping this msg. PayloadSeqNum: %v, SubId: %v", payloadSeqNum, params.SubId)
+ xapp.Logger.Error("SubFail: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", SubFailMsg.RequestId.Seq, params.SubId, params.String())
return
}
+ xapp.Logger.Info("SubFail: subscription found payloadSeqNum: %d, SubId: %d", SubFailMsg.RequestId.Seq, subs.GetSubId())
+ //
+ //
+ //
trans := subs.GetTransaction()
if trans == nil {
- xapp.Logger.Error("SubFail: Unknown trans. Dropping this msg. PayloadSeqNum: %v, SubId: %v", payloadSeqNum, params.SubId)
+ xapp.Logger.Error("SubFail: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId())
return
}
+ trans.SubFailMsg = SubFailMsg
- c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum))
+ //
+ //
+ //
+ c.timerMap.StopTimer("RIC_SUB_REQ", int(subs.GetSubId()))
responseReceived := trans.CheckResponseReceived()
if err != nil {
- xapp.Logger.Info("SubFail: Dropping this msg. Err: %v SubId: %v", err, payloadSeqNum)
return
}
// Subscription timer already received
return
}
- xapp.Logger.Info("SubFail: SubId: %v, from address: %s. Forwarding response to xApp", payloadSeqNum, trans.RmrEndpoint)
- c.rmrReplyToSender("SubFail to xapp", subs, trans, params.Mtype, params.Payload, params.PayloadLen)
-
- time.Sleep(3 * time.Second)
+ packedData, err := c.e2ap.PackSubscriptionFailure(trans.SubFailMsg)
+ if err != nil {
+ //TODO error handling improvement
+ xapp.Logger.Error("SubFail: %s for trans %s (continue still)", err.Error(), trans)
+ } else {
+ //Optimize and store packed message to be sent.
+ trans.Payload = packedData.Buf
+ trans.PayloadLen = len(packedData.Buf)
+ c.rmrReplyToSender("SubFail to xapp", subs, trans, 12012, trans.Payload, trans.PayloadLen)
+ time.Sleep(3 * time.Second)
+ }
- xapp.Logger.Info("SubFail: Deleting trans record. SubId: %v, Xid: %s", params.SubId, params.Xid)
trans.Release()
- if !c.registry.DelSubscription(payloadSeqNum) {
- xapp.Logger.Error("SubFail: Failed to release sequency number. SubId: %v, Xid: %s", params.SubId, params.Xid)
+ if !c.registry.DelSubscription(subs.GetSubId()) {
+ xapp.Logger.Error("SubFail: Failed to release sequency number. %s", subs)
}
return
}
return
}
-/* RICsubscriptionRequestFailure */
-
-// Used by submgr
-func (c *E2ap) GetSubscriptionFailureSequenceNumber(payload []byte) (subId uint16, err error) {
- cptr := unsafe.Pointer(&payload[0])
- cret := C.e2ap_get_ric_subscription_failure_sequence_number(cptr, C.size_t(len(payload)))
- if cret < 0 {
- return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
- }
- subId = uint16(cret)
- return
-}
-
-// Used by e2t test stub
-func (c *E2ap) SetSubscriptionFailureSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) {
- cptr := unsafe.Pointer(&payload[0])
- size := C.e2ap_set_ric_subscription_failure_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
- if size < 0 {
- return fmt.Errorf("e2ap wrapper is unable to set Subscription Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
- }
- return
-}
-
/* RICsubscriptionDeleteFailure */
// Used by submgr
return packedData, nil
}
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+func (c *E2ap) UnpackSubscriptionFailure(payload []byte) (*e2ap.E2APSubscriptionFailure, error) {
+ e2SubFail := packerif.NewPackerSubscriptionFailure()
+ packedData := &packer.PackedData{}
+ packedData.Buf = payload
+ err := e2SubFail.UnPack(packedData)
+ if err != nil {
+ return nil, err
+ }
+ err, subFail := e2SubFail.Get()
+ if err != nil {
+ return nil, err
+ }
+ return subFail, nil
+}
+
+func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (*packer.PackedData, error) {
+ e2SubFail := packerif.NewPackerSubscriptionFailure()
+ err := e2SubFail.Set(req)
+ if err != nil {
+ return nil, err
+ }
+ err, packedData := e2SubFail.Pack(nil)
+ if err != nil {
+ return nil, err
+ }
+ return packedData, nil
+}
+
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------