fix: can not select data path when upi has dnaiList

free5gc · Jul 18, 2024 · acf1e31 · acf1e31
1 parent ae96ce5
commit acf1e31
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/internal/context/user_plane_information.go b/internal/context/user_plane_information.go
@@ -741,10 +741,14 @@ func (upi *UserPlaneInformation) selectMatchUPF(selection *UPFSelectionParams) [
 
 			if currentSnssai.Equal(targetSnssai) {
 				for _, dnnInfo := range snssaiInfo.DnnList {
-					if dnnInfo.Dnn == selection.Dnn && dnnInfo.ContainsDNAI(selection.Dnai) {
-						upList = append(upList, upNode)
-						break
+					if dnnInfo.Dnn != selection.Dnn {
+						continue
 					}
+					if selection.Dnai != "" && !dnnInfo.ContainsDNAI(selection.Dnai) {
+						continue
+					}
+					upList = append(upList, upNode)
+					break
 				}
 			}
 		}