fix: delete UPF.UPIPInfo field

fixes #137
free5gc · Dec 13, 2024 · b1b5eba · b1b5eba
1 parent 62925c4
commit b1b5eba
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/internal/context/upf.go b/internal/context/upf.go
@@ -68,7 +68,6 @@ type UPF struct {
 	uuid              uuid.UUID
 	NodeID            pfcpType.NodeID
 	Addr              string
-	UPIPInfo          pfcpType.UserPlaneIPResourceInformation
 	RecoveryTimeStamp time.Time
 
 	AssociationContext context.Context
@@ -353,19 +352,6 @@ func RemoveUPFNodeByNodeID(nodeID pfcpType.NodeID) bool {
 	return false
 }
 
-func SelectUPFByDnn(dnn string) *UPF {
-	var upf *UPF
-	upfPool.Range(func(key, value interface{}) bool {
-		upf = value.(*UPF)
-		if upf.UPIPInfo.Assoni && upf.UPIPInfo.NetworkInstance.NetworkInstance == dnn {
-			return false
-		}
-		upf = nil
-		return true
-	})
-	return upf
-}
-
 func (upf *UPF) GetUPFIP() string {
 	upfIP := upf.NodeID.ResolveNodeIdToIp().String()
 	return upfIP

diff --git a/internal/pfcp/handler/handler.go b/internal/pfcp/handler/handler.go
@@ -39,8 +39,6 @@ func HandlePfcpAssociationSetupRequest(msg *pfcpUdp.Message) {
 		return
 	}
 
-	upf.UPIPInfo = *req.UserPlaneIPResourceInformation
-
 	// Response with PFCP Association Setup Response
 	cause := pfcpType.Cause{
 		CauseValue: pfcpType.CauseRequestAccepted,

diff --git a/internal/sbi/processor/association.go b/internal/sbi/processor/association.go
@@ -104,13 +104,7 @@ func setupPfcpAssociation(upf *smf_context.UPF, upfStr string) error {
 	}
 
 	logger.MainLog.Infof("Received PFCP Association Setup Accepted Response from UPF%s", upfStr)
-
-	if rsp.UserPlaneIPResourceInformation != nil {
-		upf.UPIPInfo = *rsp.UserPlaneIPResourceInformation
-
-		logger.MainLog.Infof("UPF(%s)[%s] setup association",
-			upf.NodeID.ResolveNodeIdToIp().String(), upf.UPIPInfo.NetworkInstance.NetworkInstance)
-	}
+	logger.MainLog.Infof("UPF(%s) setup association", upf.NodeID.ResolveNodeIdToIp().String())
 
 	return nil
 }