Fix merge conflict issue. Removed duplicated code

free5gc · Apr 6, 2024 · e775b57 · e775b57
1 parent 8a0d7bf
commit e775b57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/internal/context/context.go b/internal/context/context.go
@@ -264,7 +264,6 @@ func InitSmfContext(config *factory.Config) {
 	smfContext.Ues = InitSmfUeData()
 
 	TeidGenerator = idgenerator.NewGenerator(1, math.MaxUint32)
-
 }
 
 func InitSMFUERouting(routingConfig *factory.RoutingConfig) {

diff --git a/internal/context/ngap_handler.go b/internal/context/ngap_handler.go
@@ -44,6 +44,7 @@ func HandlePDUSessionResourceSetupResponseTransfer(b []byte, ctx *SMContext) (er
 	resourceSetupResponseTransfer := ngapType.PDUSessionResourceSetupResponseTransfer{}
 
 	err = aper.UnmarshalWithParams(b, &resourceSetupResponseTransfer, "valueExt")
+
 	if err != nil {
 		return err
 	}
@@ -108,6 +109,7 @@ func HandlePDUSessionResourceSetupUnsuccessfulTransfer(b []byte, ctx *SMContext)
 	resourceSetupUnsuccessfulTransfer := ngapType.PDUSessionResourceSetupUnsuccessfulTransfer{}
 
 	err = aper.UnmarshalWithParams(b, &resourceSetupUnsuccessfulTransfer, "valueExt")
+
 	if err != nil {
 		return err
 	}
@@ -194,6 +196,7 @@ func HandlePathSwitchRequestSetupFailedTransfer(b []byte, ctx *SMContext) (err e
 	pathSwitchRequestSetupFailedTransfer := ngapType.PathSwitchRequestSetupFailedTransfer{}
 
 	err = aper.UnmarshalWithParams(b, &pathSwitchRequestSetupFailedTransfer, "valueExt")
+
 	if err != nil {
 		return err
 	}
@@ -226,6 +229,7 @@ func HandleHandoverRequestAcknowledgeTransfer(b []byte, ctx *SMContext) (err err
 	handoverRequestAcknowledgeTransfer := ngapType.HandoverRequestAcknowledgeTransfer{}
 
 	err = aper.UnmarshalWithParams(b, &handoverRequestAcknowledgeTransfer, "valueExt")
+
 	if err != nil {
 		return err
 	}

diff --git a/internal/sbi/producer/pdu_session.go b/internal/sbi/producer/pdu_session.go
@@ -186,10 +186,6 @@ func HandlePDUSessionSMContextCreate(isDone <-chan struct{},
 			&Nsmf_PDUSession.InsufficientResourceSliceDnn)
 	}
 
-	if err = smContext.ApplyPccRules(smPolicyDecision); err != nil {
-		smContext.Log.Errorf("apply sm policy decision error: %+v", err)
-	}
-
 	// UECM registration
 	problemDetails, err = consumer.UeCmRegistration(smContext)
 	if problemDetails != nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -264,7 +264,6 @@ func InitSmfContext(config *factory.Config) { @@
     	smfContext.Ues = InitSmfUeData()
     	TeidGenerator = idgenerator.NewGenerator(1, math.MaxUint32)
     }
     func InitSMFUERouting(routingConfig *factory.RoutingConfig) {
@@ Expand Down @@