Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: PDU session cannot be established if DNN contains a period(.) #14

Merged
merged 1 commit into from
Nov 10, 2021
Merged

fix: PDU session cannot be established if DNN contains a period(.) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions backend/WebUI/api_webui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"net/http"
"strings"

"github.com/gin-gonic/gin"
"go.mongodb.org/mongo-driver/bson"
Expand Down Expand Up @@ -57,6 +58,14 @@ func toBsonA(data interface{}) (ret bson.A) {
return
}

func EscapeDnn(dnn string) string {
return strings.ReplaceAll(dnn, ".", "_")
}

func UnescapeDnn(dnnKey string) string {
return strings.ReplaceAll(dnnKey, "_", ".")
}

func setCorsHeader(c *gin.Context) {
c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
Expand Down Expand Up @@ -319,6 +328,16 @@ func GetSubscriberByID(c *gin.Context) {
var flowRules []FlowRule
json.Unmarshal(sliceToByte(flowRuleDataInterface), &flowRules)

for key, SnssaiData := range smPolicyData.SmPolicySnssaiData {
tmpSmPolicyDnnData := make(map[string]models.SmPolicyDnnData)
for escapedDnn, dnn := range SnssaiData.SmPolicyDnnData {
dnnKey := UnescapeDnn(escapedDnn)
tmpSmPolicyDnnData[dnnKey] = dnn
}
SnssaiData.SmPolicyDnnData = tmpSmPolicyDnnData
smPolicyData.SmPolicySnssaiData[key] = SnssaiData
}

subsData = SubsData{
PlmnID: servingPlmnId,
UeId: ueId,
Expand Down Expand Up @@ -364,6 +383,16 @@ func PostSubscriberByID(c *gin.Context) {
smDatasBsonA = append(smDatasBsonA, smDataBsonM)
}

for key, SnssaiData := range subsData.SmPolicyData.SmPolicySnssaiData {
tmpSmPolicyDnnData := make(map[string]models.SmPolicyDnnData)
for dnnKey, dnn := range SnssaiData.SmPolicyDnnData {
escapedDnn := EscapeDnn(dnnKey)
tmpSmPolicyDnnData[escapedDnn] = dnn
}
SnssaiData.SmPolicyDnnData = tmpSmPolicyDnnData
subsData.SmPolicyData.SmPolicySnssaiData[key] = SnssaiData
}

smfSelSubsBsonM := toBsonM(subsData.SmfSelectionSubscriptionData)
smfSelSubsBsonM["ueId"] = ueId
smfSelSubsBsonM["servingPlmnId"] = servingPlmnId
Expand Down Expand Up @@ -423,6 +452,16 @@ func PutSubscriberByID(c *gin.Context) {
MongoDBLibrary.RestfulAPIPutOne(smDataColl, filterSmData, smDataBsonM)
}

for key, SnssaiData := range subsData.SmPolicyData.SmPolicySnssaiData {
tmpSmPolicyDnnData := make(map[string]models.SmPolicyDnnData)
for dnnKey, dnn := range SnssaiData.SmPolicyDnnData {
escapedDnn := EscapeDnn(dnnKey)
tmpSmPolicyDnnData[escapedDnn] = dnn
}
SnssaiData.SmPolicyDnnData = tmpSmPolicyDnnData
subsData.SmPolicyData.SmPolicySnssaiData[key] = SnssaiData
}

smfSelSubsBsonM := toBsonM(subsData.SmfSelectionSubscriptionData)
smfSelSubsBsonM["ueId"] = ueId
smfSelSubsBsonM["servingPlmnId"] = servingPlmnId
Expand Down Expand Up @@ -483,6 +522,16 @@ func PatchSubscriberByID(c *gin.Context) {
MongoDBLibrary.RestfulAPIMergePatch(smDataColl, filterSmData, smDataBsonM)
}

for key, SnssaiData := range subsData.SmPolicyData.SmPolicySnssaiData {
tmpSmPolicyDnnData := make(map[string]models.SmPolicyDnnData)
for dnnKey, dnn := range SnssaiData.SmPolicyDnnData {
escapedDnn := EscapeDnn(dnnKey)
tmpSmPolicyDnnData[escapedDnn] = dnn
}
SnssaiData.SmPolicyDnnData = tmpSmPolicyDnnData
subsData.SmPolicyData.SmPolicySnssaiData[key] = SnssaiData
}

smfSelSubsBsonM := toBsonM(subsData.SmfSelectionSubscriptionData)
smfSelSubsBsonM["ueId"] = ueId
smfSelSubsBsonM["servingPlmnId"] = servingPlmnId
Expand Down
Loading