fix: MBQE, MAQE's URR

free5gc · Dec 7, 2023 · 691d252 · 691d252
1 parent a9f0c3a
commit 691d252
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 55 deletions.
diff --git a/internal/context/datapath.go b/internal/context/datapath.go
@@ -772,39 +772,29 @@ func (p *DataPath) AddChargingRules(smContext *SMContext, chgLevel ChargingLevel
 				UpfId:         node.UPF.UUID(),
 			}
 
-			if smContext.UrrIdMap[N3N6_MBEQ_URR] == 0 {
-				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
-					smContext.UrrIdMap[N3N6_MBEQ_URR] = uint32(id)
-				}
-			}
-
-			if smContext.UrrIdMap[N3N6_MAEQ_URR] == 0 {
-				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
-					smContext.UrrIdMap[N3N6_MAEQ_URR] = uint32(id)
-				}
-			}
-
-			if smContext.UrrIdMap[N9N6_MBEQ_URR] == 0 {
-				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
-					smContext.UrrIdMap[N9N6_MBEQ_URR] = uint32(id)
+			if node.Prev() == nil {
+				if smContext.UrrIdMap[N3N6_MBQE_URR] == 0 {
+					if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
+						smContext.UrrIdMap[N3N6_MBQE_URR] = uint32(id)
+					}
 				}
-			}
 
-			if smContext.UrrIdMap[N9N6_MAEQ_URR] == 0 {
-				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
-					smContext.UrrIdMap[N9N6_MAEQ_URR] = uint32(id)
+				if smContext.UrrIdMap[N3N6_MAQE_URR] == 0 {
+					if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
+						smContext.UrrIdMap[N3N6_MAQE_URR] = uint32(id)
+					}
 				}
-			}
-
-			if smContext.UrrIdMap[N3N9_MBEQ_URR] == 0 {
-				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
-					smContext.UrrIdMap[N3N9_MBEQ_URR] = uint32(id)
+			} else {
+				if smContext.UrrIdMap[N9N6_MBQE_URR] == 0 {
+					if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
+						smContext.UrrIdMap[N9N6_MBQE_URR] = uint32(id)
+					}
 				}
-			}
 
-			if smContext.UrrIdMap[N3N9_MAEQ_URR] == 0 {
-				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
-					smContext.UrrIdMap[N3N9_MAEQ_URR] = uint32(id)
+				if smContext.UrrIdMap[N9N6_MAQE_URR] == 0 {
+					if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
+						smContext.UrrIdMap[N9N6_MAQE_URR] = uint32(id)
+					}
 				}
 			}
 
@@ -865,6 +855,18 @@ func (p *DataPath) AddChargingRules(smContext *SMContext, chgLevel ChargingLevel
 					}
 				}
 			}
+		} else {
+			if smContext.UrrIdMap[N3N9_MBQE_URR] == 0 {
+				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
+					smContext.UrrIdMap[N3N9_MBQE_URR] = uint32(id)
+				}
+			}
+
+			if smContext.UrrIdMap[N3N9_MAQE_URR] == 0 {
+				if id, err := node.UPF.urrIDGenerator.Allocate(); err == nil {
+					smContext.UrrIdMap[N3N9_MAQE_URR] = uint32(id)
+				}
+			}
 		}
 	}
 }

diff --git a/internal/context/sm_context.go b/internal/context/sm_context.go
@@ -46,12 +46,12 @@ const (
 type UrrType int
 
 const (
-	N3N6_MBEQ_URR UrrType = iota
-	N3N6_MAEQ_URR
-	N3N9_MBEQ_URR
-	N3N9_MAEQ_URR
-	N9N6_MBEQ_URR
-	N9N6_MAEQ_URR
+	N3N6_MBQE_URR UrrType = iota
+	N3N6_MAQE_URR
+	N3N9_MBQE_URR
+	N3N9_MAQE_URR
+	N9N6_MBQE_URR
+	N9N6_MAQE_URR
 	NOT_FOUND_URR
 )
 
@@ -374,27 +374,6 @@ func GetSMContextBySEID(SEID uint64) *SMContext {
 	return nil
 }
 
-// func (smContext *SMContext) GenerateUrrId() {
-// 	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
-// 		smContext.UrrIdMap[N3N6_MBEQ_URR] = uint32(id)
-// 	}
-// 	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
-// 		smContext.UrrIdMap[N3N6_MAEQ_URR] = uint32(id)
-// 	}
-// 	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
-// 		smContext.UrrIdMap[N9N6_MBEQ_URR] = uint32(id)
-// 	}
-// 	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
-// 		smContext.UrrIdMap[N9N6_MAEQ_URR] = uint32(id)
-// 	}
-// 	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
-// 		smContext.UrrIdMap[N3N9_MBEQ_URR] = uint32(id)
-// 	}
-// 	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
-// 		smContext.UrrIdMap[N3N9_MAEQ_URR] = uint32(id)
-// 	}
-// }
-
 func (smContext *SMContext) BuildCreatedData() *models.SmContextCreatedData {
 	return &models.SmContextCreatedData{
 		SNssai: smContext.SNssai,