X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fe2ap.go;h=5f4bb4463540028aeeb8d1db544d49e0aa8f1fef;hb=4e7c8c5ecb72a7b64b659156d26416a1dbddf394;hp=6f5edcb372fc7dd9e880ead271bccefdc462d554;hpb=1455c85dea3fba44cdcba8a92864be730691a6ec;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go index 6f5edcb..5f4bb44 100644 --- a/pkg/control/e2ap.go +++ b/pkg/control/e2ap.go @@ -22,98 +22,217 @@ package control /* #include -#cgo LDFLAGS: -lwrapper +#cgo LDFLAGS: -le2ap_wrapper -le2ap */ import "C" import ( - "errors" + "fmt" + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap_wrapper" + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/packer" "unsafe" ) +var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer() + type E2ap struct { } -func (c *E2ap) GetSubscriptionRequestSequenceNumber(payload []byte) (subId uint16, err error) { +/* RICsubscriptionDeleteFailure */ + +// Used by submgr +func (c *E2ap) GetSubscriptionDeleteFailureSequenceNumber(payload []byte) (subId uint16, err error) { cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_request_sequence_number(cptr, C.size_t(len(payload))) + cret := C.e2ap_get_ric_subscription_delete_failure_sequence_number(cptr, C.size_t(len(payload))) if cret < 0 { - return 0, errors.New("e2ap wrapper is unable to get Subscirption Request Sequence Number due to wrong or invalid payload") + return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Delete Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret) } subId = uint16(cret) return } -func (c *E2ap) SetSubscriptionRequestSequenceNumber(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) { +// Used by submgr +func (c *E2ap) SetSubscriptionDeleteFailureSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) { cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_request_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) + size := C.e2ap_set_ric_subscription_delete_failure_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) if size < 0 { - return make([]byte, 0), errors.New("e2ap wrapper is unable to set Subscription Request Sequence Number due to wrong or invalid payload") + return fmt.Errorf("e2ap wrapper is unable to set Subscription Delete Failure Sequence Number due to wrong or invalid payload. Erroxappde: %v", size) } - newPayload = C.GoBytes(cptr, C.int(size)) return } -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, errors.New("e2ap wrapper is unable to get Subscirption Response Sequence Number due to wrong or invalid payload") +// Used by submgr +func (c *E2ap) PackSubscriptionDeleteResponseFromSubDelReq(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) { + + subDelReq, err := c.UnpackSubscriptionDeleteRequest(payload) + if err != nil { + return make([]byte, 0), fmt.Errorf("PackSubDelRespFromSubDelReq: SubDelReq unpack failed: %s", err.Error()) } - subId = uint16(cret) - return + + subDelResp := &e2ap.E2APSubscriptionDeleteResponse{} + subDelResp.RequestId.Id = subDelReq.RequestId.Id + subDelResp.RequestId.Seq = uint32(newSubscriptionid) + subDelResp.FunctionId = subDelReq.FunctionId + + packedData, err := c.PackSubscriptionDeleteResponse(subDelResp) + if err != nil { + return make([]byte, 0), fmt.Errorf("PackSubDelRespFromSubDelReq: SubDelResp pack failed: %s", err.Error()) + } + return packedData.Buf, nil } -func (c *E2ap) SetSubscriptionResponseSequenceNumber(payload []byte, newSubscriptionid uint16) (newPayload []byte, 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 make([]byte, 0), errors.New("e2ap wrapper is unable to set Subscription Response Sequence Number due to wrong or invalid payload") +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionRequest(payload []byte) (*e2ap.E2APSubscriptionRequest, error) { + e2SubReq := packerif.NewPackerSubscriptionRequest() + packedData := &packer.PackedData{} + packedData.Buf = payload + err := e2SubReq.UnPack(packedData) + if err != nil { + return nil, err } - newPayload = C.GoBytes(cptr, C.int(size)) - return + err, subReq := e2SubReq.Get() + if err != nil { + return nil, err + } + return subReq, nil } -/* RICsubscriptionDeleteRequest */ +func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (*packer.PackedData, error) { + e2SubReq := packerif.NewPackerSubscriptionRequest() + err := e2SubReq.Set(req) + if err != nil { + return nil, err + } + err, packedData := e2SubReq.Pack(nil) + if err != nil { + return nil, err + } + return packedData, nil +} -func (c *E2ap) GetSubscriptionDeleteRequestSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_delete_request_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, errors.New("e2ap wrapper is unable to get Subscirption Delete Request Sequence Number due to wrong or invalid payload") +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +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 } - subId = uint16(cret) - return + err, subResp := e2SubResp.Get() + if err != nil { + return nil, err + } + return subResp, nil } -func (c *E2ap) SetSubscriptionDeleteRequestSequenceNumber(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_delete_request_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return make([]byte, 0), errors.New("e2ap wrapper is unable to set Subscription Delete Request Sequence Number due to wrong or invalid payload") +func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (*packer.PackedData, error) { + e2SubResp := packerif.NewPackerSubscriptionResponse() + err := e2SubResp.Set(req) + if err != nil { + return nil, err } - newPayload = C.GoBytes(cptr, C.int(size)) - return + err, packedData := e2SubResp.Pack(nil) + if err != nil { + return nil, err + } + return packedData, nil } -/* RICsubscriptionDeleteResponse */ +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +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) GetSubscriptionDeleteResponseSequenceNumber(payload []byte) (subId uint16, err error) { - cptr := unsafe.Pointer(&payload[0]) - cret := C.e2ap_get_ric_subscription_delete_response_sequence_number(cptr, C.size_t(len(payload))) - if cret < 0 { - return 0, errors.New("e2ap wrapper is unable to get Subscirption Delete Response Sequence Number due to wrong or invalid payload") +func (c *E2ap) PackSubscriptionFailure(req *e2ap.E2APSubscriptionFailure) (*packer.PackedData, error) { + e2SubFail := packerif.NewPackerSubscriptionFailure() + err := e2SubFail.Set(req) + if err != nil { + return nil, err } - subId = uint16(cret) - return + err, packedData := e2SubFail.Pack(nil) + if err != nil { + return nil, err + } + return packedData, nil } -func (c *E2ap) SetSubscriptionDeleteResponseSequenceNumber(payload []byte, newSubscriptionid uint16) (newPayload []byte, err error) { - cptr := unsafe.Pointer(&payload[0]) - size := C.e2ap_set_ric_subscription_delete_response_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid)) - if size < 0 { - return make([]byte, 0), errors.New("e2ap wrapper is unable to set Subscription Delete Response Sequence Number due to wrong or invalid payload") +//----------------------------------------------------------------------------- +// +//----------------------------------------------------------------------------- +func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscriptionDeleteRequest, error) { + e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() + packedData := &packer.PackedData{} + packedData.Buf = payload + err := e2SubDelReq.UnPack(packedData) + if err != nil { + return nil, err } - newPayload = C.GoBytes(cptr, C.int(size)) - return + err, subDelReq := e2SubDelReq.Get() + if err != nil { + return nil, err + } + return subDelReq, nil +} + +func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (*packer.PackedData, error) { + e2SubDelReq := packerif.NewPackerSubscriptionDeleteRequest() + err := e2SubDelReq.Set(req) + if err != nil { + return nil, err + } + err, packedData := e2SubDelReq.Pack(nil) + if err != nil { + return nil, err + } + 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) + if err != nil { + return nil, err + } + err, packedData := e2SubDelResp.Pack(nil) + if err != nil { + return nil, err + } + return packedData, nil }