Merge pull request #220 from wiwi878/fix/1029-n1-message-notify-ran-node-id

fix: validate missing anN2ApId in N1 message notify

Author: Alonza0314

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/free5gc/aper v1.1.1
 	github.com/free5gc/nas v1.2.3
 	github.com/free5gc/ngap v1.1.3
-	github.com/free5gc/openapi v1.2.4
+	github.com/free5gc/openapi v1.2.5-0.20260527003827-02dc71b4d94f
 	github.com/free5gc/sctp v1.1.2
 	github.com/free5gc/util v1.3.2
 	github.com/gin-gonic/gin v1.10.0

go.sum

@@ -27,8 +27,8 @@ github.com/free5gc/nas v1.2.3 h1:vMA9NGORw0zr26vQWWSTy8X9HrA+wGxFvwc2g9KqUTw=
 github.com/free5gc/nas v1.2.3/go.mod h1:A8ODi6MW0fRJiLEH4GcUPbg3dd9xm3zi+fkBWqTjQ40=
 github.com/free5gc/ngap v1.1.3 h1:uT+IE5PkWOYjPdxCyOAwLDOXUiADcOQCs05CudyC36s=
 github.com/free5gc/ngap v1.1.3/go.mod h1:yGMO2GYV5DbbmudwD7Oo6dXQgz2ON29GhqtXDeXdyvA=
-github.com/free5gc/openapi v1.2.4 h1:uhyaTggUhd9xgMFcs5y2rCqFOfXuv6Zsr+cLUU/x6gs=
-github.com/free5gc/openapi v1.2.4/go.mod h1:V9CKQUqWp6kXL3SDtaIs4ZWeLipk5TSRXCnt+ntNceg=
+github.com/free5gc/openapi v1.2.5-0.20260527003827-02dc71b4d94f h1:AYnRO0Gj/kTmGw5tCI33R3XReV9T0sEEp7jFvnL/qok=
+github.com/free5gc/openapi v1.2.5-0.20260527003827-02dc71b4d94f/go.mod h1:V9CKQUqWp6kXL3SDtaIs4ZWeLipk5TSRXCnt+ntNceg=
 github.com/free5gc/sctp v1.1.2 h1:nNEr4uywIFmVBZauaNVJRkIDXr4nrpMmM0TPIck5QPA=
 github.com/free5gc/sctp v1.1.2/go.mod h1:wOvct9P1T6DGk1fxkleF7zeTHsU8ZKxKzewu2ciZh/4=
 github.com/free5gc/util v1.3.2 h1:3BjZq050WbaLJY0w1Bn51YZlCirs2ARoCUxD3LDSdbo=

internal/gmm/handler.go

@@ -1215,10 +1215,11 @@ func handleRequestedNssai(ue *context.AmfUe, anType models.AccessType) error {
 				// Condition (A) Step 7: initial AMF find Target AMF via NRF ->
 				// Send Namf_Communication_N1MessageNotify to Target AMF
 				ueContext := consumer.GetConsumer().BuildUeContextModel(ue)
+				anN2ApId := int32(ue.RanUe[anType].RanUeNgapId)
 				registerContext := models.RegistrationContextContainer{
 					UeContext:        &ueContext,
 					AnType:           anType,
-					AnN2ApId:         int32(ue.RanUe[anType].RanUeNgapId),
+					AnN2ApId:         &anN2ApId,
 					RanNodeId:        ue.RanUe[anType].Ran.RanId,
 					InitialAmfName:   amfSelf.Name,
 					UserLocation:     &ue.Location,

internal/sbi/processor/callback.go

@@ -283,7 +283,7 @@ func (p *Processor) N1MessageNotifyProcedure(n1MessageNotify models.N1MessageNot
 	if registrationCtxtContainer == nil || registrationCtxtContainer.UeContext == nil ||
 		registrationCtxtContainer.RanNodeId == nil || registrationCtxtContainer.UserLocation == nil ||
 		registrationCtxtContainer.AnType == "" || registrationCtxtContainer.InitialAmfName == "" ||
-		registrationCtxtContainer.AnN2ApId > 0 {
+		registrationCtxtContainer.AnN2ApId == nil {
 		problemDetails := &models.ProblemDetails{
 			Status: http.StatusBadRequest,
 			Cause:  "MANDATORY_IE_MISSING",
@@ -322,15 +322,16 @@ func (p *Processor) N1MessageNotifyProcedure(n1MessageNotify models.N1MessageNot
 		return problemDetails
 	}
 
-	ranUe := ran.RanUeFindByRanUeNgapID(int64(registrationCtxtContainer.AnN2ApId))
+	anN2ApId := *registrationCtxtContainer.AnN2ApId
+	ranUe := ran.RanUeFindByRanUeNgapID(int64(anN2ApId))
 	if ranUe == nil {
 		logger.CallbackLog.Warnf("RanUe Context[AnN2ApId:%d] not found in RAN[RanId: %+v]",
-			registrationCtxtContainer.AnN2ApId, *registrationCtxtContainer.RanNodeId)
+			anN2ApId, *registrationCtxtContainer.RanNodeId)
 
 		problemDetails := &models.ProblemDetails{
 			Status: http.StatusNotFound,
 			Cause:  "CONTEXT_NOT_FOUND",
-			Detail: fmt.Sprintf("RanUe Context[AnN2ApId:%d] not found", registrationCtxtContainer.AnN2ApId),
+			Detail: fmt.Sprintf("RanUe Context[AnN2ApId:%d] not found", anN2ApId),
 		}
 		return problemDetails
 	}
@@ -355,9 +356,9 @@ func (p *Processor) N1MessageNotifyProcedure(n1MessageNotify models.N1MessageNot
 
 		amfUe.CopyDataFromUeContextModel(ueContext)
 
-		currentRanUe := ran.RanUeFindByRanUeNgapID(int64(registrationCtxtContainer.AnN2ApId))
+		currentRanUe := ran.RanUeFindByRanUeNgapID(int64(anN2ApId))
 		if currentRanUe == nil {
-			logger.CallbackLog.Warnf("RanUe not found for AnN2ApId: %d", registrationCtxtContainer.AnN2ApId)
+			logger.CallbackLog.Warnf("RanUe not found for AnN2ApId: %d", anN2ApId)
 			return
 		}