8000 fix: UPF missing URR error by lyz508 · Pull Request #127 · free5gc/smf · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: UPF missing URR error #127

New issue
8000

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

Merged
merged 2 commits into from
Sep 30, 2024
Merged

fix: UPF missing URR error #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d3d180
fix: revert UPF selection way to choose correct UPF
lyz508 Sep 30, 2024
736f3d1
fix: Missing URR creation will cause TI error
lyz508 Sep 30, 2024
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
2 changes: 1 addition & 1 deletion internal/context/datapath.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ func (p *DataPath) AddChargingRules(smContext *SMContext, chgLevel ChargingLevel
// nolint
nodeId, _ := node.GetUPFID()
logger.PduSessLog.Tracef("DownLinkTunnel add URR for node %s %+v",
nodeId, node.UpLinkTunnel.PDR)
nodeId, node.DownLinkTunnel.PDR)
}
}
}
Expand Down
10 changes: 3 additions & 7 deletions internal/context/user_plane_information.go
View file
Open in desktop
FB04
Original file line number Diff line number Diff line change
Expand Up @@ -741,14 +741,10 @@ func (upi *UserPlaneInformation) selectMatchUPF(selection *UPFSelectionParams) [

if currentSnssai.Equal(targetSnssai) {
for _, dnnInfo := range snssaiInfo.DnnList {
if dnnInfo.Dnn != selection.Dnn {
continue
if dnnInfo.Dnn == selection.Dnn && dnnInfo.ContainsDNAI(selection.Dnai) {
upList = append(upList, upNode)
break
}
if selection.Dnai != "" && !dnnInfo.ContainsDNAI(selection.Dnai) {
continue
}
upList = append(upList, upNode)
break
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions internal/pfcp/message/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,9 @@ func BuildPfcpSessionEstablishmentRequest(
urrMap[urr.URRID] = urr
}
for _, filteredURR := range urrMap {
if filteredURR.State == context.RULE_INITIAL {
msg.CreateURR = append(msg.CreateURR, urrToCreateURR(filteredURR))
msg.CreateURR = append(msg.CreateURR, urrToCreateURR(filteredURR))
if filteredURR.State == context.RULE_CREATE {
smContext.Log.Warn("Duplicate URR creation")
}
filteredURR.State = context.RULE_CREATE
}
Expand Down Expand Up @@ -564,6 +565,9 @@ func BuildPfcpSessionModificationRequest(

for _, urr := range urrList {
switch urr.State {
case context.RULE_CREATE:
smContext.Log.Warn("Duplicate URR creation")
fallthrough
case context.RULE_INITIAL:
msg.CreateURR = append(msg.CreateURR, urrToCreateURR(urr))
case context.RULE_UPDATE:
Expand Down
Loading
0