pass gin.Context instead of channel

free5gc · Aug 10, 2023 · 57dc6fa · 57dc6fa
1 parent a077a7a
commit 57dc6fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/internal/sbi/pdusession/api_sm_contexts_collection.go b/internal/sbi/pdusession/api_sm_contexts_collection.go
@@ -51,8 +51,7 @@ func HTTPPostSmContexts(c *gin.Context) {
 	}
 
 	req := httpwrapper.NewRequest(c.Request, request)
-	isDone := c.Done()
-	HTTPResponse := producer.HandlePDUSessionSMContextCreate(isDone,
+	HTTPResponse := producer.HandlePDUSessionSMContextCreate(c,
 		req.Body.(models.PostSmContextsRequest))
 	// Http Response to AMF
 	for key, val := range HTTPResponse.Header {

diff --git a/internal/sbi/producer/datapath.go b/internal/sbi/producer/datapath.go
@@ -13,6 +13,7 @@ import (
 	"github.com/free5gc/smf/internal/logger"
 	"github.com/free5gc/smf/internal/pfcp/handler"
 	pfcp_message "github.com/free5gc/smf/internal/pfcp/message"
+	"github.com/gin-gonic/gin"
 )
 
 type PFCPState struct {
@@ -199,13 +200,14 @@ func waitAllPfcpRsp(
 	}
 }
 
-func EstHandler(isDone <-chan struct{},
+func EstHandler(c *gin.Context,
 	smContext *smf_context.SMContext, success bool,
 ) {
 	// Waiting for Create SMContext Request completed
-	if isDone != nil {
-		<-isDone
+	if c != nil {
+		<-c.Done()
 	}
+
 	if success {
 		sendPDUSessionEstablishmentAccept(smContext)
 	} else {

diff --git a/internal/sbi/producer/pdu_session.go b/internal/sbi/producer/pdu_session.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/antihax/optional"
+	"github.com/gin-gonic/gin"
 
 	"github.com/free5gc/nas"
 	"github.com/free5gc/nas/nasMessage"
@@ -24,7 +25,7 @@ import (
 	"github.com/free5gc/util/httpwrapper"
 )
 
-func HandlePDUSessionSMContextCreate(isDone <-chan struct{},
+func HandlePDUSessionSMContextCreate(c *gin.Context,
 	request models.PostSmContextsRequest,
 ) *httpwrapper.Response {
 	// GSM State
@@ -212,7 +213,7 @@ func HandlePDUSessionSMContextCreate(isDone <-chan struct{},
 		smContext.SendUpPathChgNotification("EARLY", SendUpPathChgEventExposureNotification)
 
 		handler := func(smContext *smf_context.SMContext, success bool) {
-			EstHandler(isDone, smContext, success)
+			EstHandler(c, smContext, success)
 		}
 
 		ActivateUPFSession(smContext, handler)