chore: Manages messages centrally

messages/heartbeat.go

@@ -41,7 +41,7 @@ func (msg HeartbeatResponse) GetMessageTypeString() string {
 	return "Heartbeat Response"
 }
 
-func DeserializeHeartbeatRequest(data []byte) (PFCPMessage, error) {
+func DeserializeHeartbeatRequest(data []byte) (HeartbeatRequest, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var recoveryTimeStamp ie.RecoveryTimeStamp
 	var sourceIPAddress ie.SourceIPAddress
@@ -62,7 +62,7 @@ func DeserializeHeartbeatRequest(data []byte) (PFCPMessage, error) {
 	}, err
 }
 
-func DeserializeHeartbeatResponse(data []byte) (PFCPMessage, error) {
+func DeserializeHeartbeatResponse(data []byte) (HeartbeatResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var recoveryTimeStamp ie.RecoveryTimeStamp
 	for _, elem := range ies {

messages/messages.go

@@ -1,8 +1,6 @@
 package messages
 
 import (
-	"fmt"
-
 	"github.com/dot-5g/pfcp/ie"
 )
 
@@ -32,50 +30,3 @@ type PFCPMessage interface {
 	GetMessageType() MessageType
 	GetMessageTypeString() string
 }
-
-type DeserializerFunc func([]byte) (PFCPMessage, error)
-
-var messageTypeDeserializers = map[MessageType]DeserializerFunc{
-	HeartbeatRequestMessageType:                 DeserializeHeartbeatRequest,
-	HeartbeatResponseMessageType:                DeserializeHeartbeatResponse,
-	PFCPAssociationSetupRequestMessageType:      DeserializePFCPAssociationSetupRequest,
-	PFCPAssociationSetupResponseMessageType:     DeserializePFCPAssociationSetupResponse,
-	PFCPAssociationUpdateRequestMessageType:     DeserializePFCPAssociationUpdateRequest,
-	PFCPAssociationUpdateResponseMessageType:    DeserializePFCPAssociationUpdateResponse,
-	PFCPAssociationReleaseRequestMessageType:    DeserializePFCPAssociationReleaseRequest,
-	PFCPAssociationReleaseResponseMessageType:   DeserializePFCPAssociationReleaseResponse,
-	PFCPNodeReportRequestMessageType:            DeserializePFCPNodeReportRequest,
-	PFCPNodeReportResponseMessageType:           DeserializePFCPNodeReportResponse,
-	PFCPSessionEstablishmentRequestMessageType:  DeserializePFCPSessionEstablishmentRequest,
-	PFCPSessionEstablishmentResponseMessageType: DeserializePFCPSessionEstablishmentResponse,
-	PFCPSessionDeletionRequestMessageType:       DeserializePFCPSessionDeletionRequest,
-	PFCPSessionDeletionResponseMessageType:      DeserializePFCPSessionDeletionResponse,
-	PFCPSessionReportRequestMessageType:         DeserializePFCPSessionReportRequest,
-	PFCPSessionReportResponseMessageType:        DeserializePFCPSessionReportResponse,
-}
-
-func DeserializePFCPMessage(payload []byte) (Header, PFCPMessage, error) {
-	header, err := DeserializeHeader(payload)
-	if err != nil {
-		return header, nil, err
-	}
-
-	payloadOffset := 8
-	if header.S {
-		payloadOffset = 16
-	}
-
-	if len(payload) < payloadOffset {
-		return header, nil, fmt.Errorf("insufficient data for payload message")
-	}
-	payloadMessage := payload[payloadOffset:]
-	if deserializer, exists := messageTypeDeserializers[header.MessageType]; exists {
-		msg, err := deserializer(payloadMessage)
-		if err != nil {
-			return header, nil, fmt.Errorf("error deserializing payload message: %v", err)
-		}
-		return header, msg, nil
-	}
-
-	return header, nil, fmt.Errorf("unsupported message type: %d", header.MessageType)
-}

messages/pfcp_association_release.go

@@ -35,7 +35,7 @@ func (msg PFCPAssociationReleaseResponse) GetMessageTypeString() string {
 	return "PFCP Association Release Response"
 }
 
-func DeserializePFCPAssociationReleaseRequest(data []byte) (PFCPMessage, error) {
+func DeserializePFCPAssociationReleaseRequest(data []byte) (PFCPAssociationReleaseRequest, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	for _, elem := range ies {
@@ -50,7 +50,7 @@ func DeserializePFCPAssociationReleaseRequest(data []byte) (PFCPMessage, error)
 	}, err
 }
 
-func DeserializePFCPAssociationReleaseResponse(data []byte) (PFCPMessage, error) {
+func DeserializePFCPAssociationReleaseResponse(data []byte) (PFCPAssociationReleaseResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var cause ie.Cause

messages/pfcp_association_setup.go

@@ -46,7 +46,7 @@ func (msg PFCPAssociationSetupResponse) GetMessageTypeString() string {
 	return "PFCP Association Setup Response"
 }
 
-func DeserializePFCPAssociationSetupRequest(data []byte) (PFCPMessage, error) {
+func DeserializePFCPAssociationSetupRequest(data []byte) (PFCPAssociationSetupRequest, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var recoveryTimeStamp ie.RecoveryTimeStamp
@@ -73,7 +73,7 @@ func DeserializePFCPAssociationSetupRequest(data []byte) (PFCPMessage, error) {
 	}, err
 }
 
-func DeserializePFCPAssociationSetupResponse(data []byte) (PFCPMessage, error) {
+func DeserializePFCPAssociationSetupResponse(data []byte) (PFCPAssociationSetupResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var cause ie.Cause

messages/pfcp_association_update.go

@@ -35,7 +35,7 @@ func (msg PFCPAssociationUpdateResponse) GetMessageTypeString() string {
 	return "PFCP Association Update Response"
 }
 
-func DeserializePFCPAssociationUpdateRequest(data []byte) (PFCPMessage, error) {
+func DeserializePFCPAssociationUpdateRequest(data []byte) (PFCPAssociationUpdateRequest, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	for _, elem := range ies {
@@ -50,7 +50,7 @@ func DeserializePFCPAssociationUpdateRequest(data []byte) (PFCPMessage, error) {
 	}, err
 }
 
-func DeserializePFCPAssociationUpdateResponse(data []byte) (PFCPMessage, error) {
+func DeserializePFCPAssociationUpdateResponse(data []byte) (PFCPAssociationUpdateResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var cause ie.Cause

messages/pfcp_node_report.go

@@ -38,7 +38,7 @@ func (msg PFCPNodeReportResponse) GetMessageTypeString() string {
 	return "PFCP Node Report Response"
 }
 
-func DeserializePFCPNodeReportRequest(data []byte) (PFCPMessage, error) {
+func DeserializePFCPNodeReportRequest(data []byte) (PFCPNodeReportRequest, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var nodeReportType ie.NodeReportType
@@ -59,7 +59,7 @@ func DeserializePFCPNodeReportRequest(data []byte) (PFCPMessage, error) {
 	}, err
 }
 
-func DeserializePFCPNodeReportResponse(data []byte) (PFCPMessage, error) {
+func DeserializePFCPNodeReportResponse(data []byte) (PFCPNodeReportResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var cause ie.Cause

messages/pfcp_session_deletion.go

@@ -32,12 +32,16 @@ func (msg PFCPSessionDeletionResponse) GetMessageTypeString() string {
 	return "PFCP Session Deletion Response"
 }
 
-func DeserializePFCPSessionDeletionRequest(data []byte) (PFCPMessage, error) {
+func DeserializePFCPSessionDeletionRequest(data []byte) (PFCPSessionDeletionRequest, error) {
 	return PFCPSessionDeletionRequest{}, nil
 }
 
-func DeserializePFCPSessionDeletionResponse(data []byte) (PFCPMessage, error) {
+func DeserializePFCPSessionDeletionResponse(data []byte) (PFCPSessionDeletionResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
+	if err != nil {
+		return PFCPSessionDeletionResponse{}, err
+	}
+
 	var cause ie.Cause
 	for _, elem := range ies {
 		if causeIE, ok := elem.(ie.Cause); ok {
@@ -48,5 +52,5 @@ func DeserializePFCPSessionDeletionResponse(data []byte) (PFCPMessage, error) {
 
 	return PFCPSessionDeletionResponse{
 		Cause: cause,
-	}, err
+	}, nil
 }

messages/pfcp_session_establishment.go

@@ -38,7 +38,7 @@ func (msg PFCPSessionEstablishmentResponse) GetMessageTypeString() string {
 	return "PFCP Session Establishment Response"
 }
 
-func DeserializePFCPSessionEstablishmentRequest(data []byte) (PFCPMessage, error) {
+func DeserializePFCPSessionEstablishmentRequest(data []byte) (PFCPSessionEstablishmentRequest, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var controlPlaneFSEID ie.FSEID
@@ -73,7 +73,7 @@ func DeserializePFCPSessionEstablishmentRequest(data []byte) (PFCPMessage, error
 	}, err
 }
 
-func DeserializePFCPSessionEstablishmentResponse(data []byte) (PFCPMessage, error) {
+func DeserializePFCPSessionEstablishmentResponse(data []byte) (PFCPSessionEstablishmentResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var nodeID ie.NodeID
 	var cause ie.Cause

messages/pfcp_session_report.go

@@ -34,7 +34,7 @@ func (msg PFCPSessionReportResponse) GetMessageTypeString() string {
 	return "PFCP Session Report Response"
 }
 
-func DeserializePFCPSessionReportRequest(data []byte) (PFCPMessage, error) {
+func DeserializePFCPSessionReportRequest(data []byte) (PFCPSessionReportRequest, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var reportType ie.ReportType
 
@@ -51,7 +51,7 @@ func DeserializePFCPSessionReportRequest(data []byte) (PFCPMessage, error) {
 	}, err
 }
 
-func DeserializePFCPSessionReportResponse(data []byte) (PFCPMessage, error) {
+func DeserializePFCPSessionReportResponse(data []byte) (PFCPSessionReportResponse, error) {
 	ies, err := ie.ParseInformationElements(data)
 	var cause ie.Cause