Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
map-controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Multi-AP
map-controller
Commits
3c915f5f
Commit
3c915f5f
authored
1 year ago
by
Maxim Menshikov
Browse files
Options
Downloads
Patches
Plain Diff
Parse QoS dscp_pcp as list of dscp_min[-dscp_max],pcp pairs
parent
ac03b7c2
Branches
Branches containing commit
No related tags found
1 merge request
!285
QoS: switch to [dscp_min,dscp_max]->pcp pairs instead of explicit 64-byte dscp-pcp map
Pipeline
#124656
passed
1 year ago
Stage: static_code_analysis
Stage: compile_test
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/config_qos.c
+28
-10
28 additions, 10 deletions
src/config_qos.c
with
28 additions
and
10 deletions
src/config_qos.c
+
28
−
10
View file @
3c915f5f
...
...
@@ -127,7 +127,7 @@ static int cntlr_config_get_qos_rule_dscp_pcp(struct controller_config *cc,
const
struct
uci_parse_option
opts
[]
=
{
[
QOS_RULE_DSCP_PCP_DSCP_PCP
]
=
{
.
name
=
"dscp_pcp"
,
.
type
=
UCI_TYPE_ST
RING
.
type
=
UCI_TYPE_
LI
ST
},
};
struct
uci_option
*
tb
[
NUM_QOS_RULE_DSCP_PCP_ATTRS
];
...
...
@@ -138,15 +138,33 @@ static int cntlr_config_get_qos_rule_dscp_pcp(struct controller_config *cc,
if
(
tb
[
QOS_RULE_DSCP_PCP_DSCP_PCP
])
{
const
char
*
str
=
tb
[
QOS_RULE_DSCP_PCP_DSCP_PCP
]
->
v
.
string
;
int
val
;
size_t
idx
=
0
;
while
(
str
!=
NULL
&&
sscanf
(
str
,
"%d"
,
&
val
)
==
1
)
{
dscp_pcp
->
dscp_pcp
[
idx
++
]
=
val
;
str
=
strstr
(
str
,
","
);
if
(
str
!=
NULL
)
str
++
;
struct
uci_element
*
x
;
uci_foreach_element
(
&
tb
[
QOS_RULE_DSCP_PCP_DSCP_PCP
]
->
v
.
list
,
x
)
{
int
dscp_min
=
0
;
int
dscp_max
=
0
;
int
pcp
=
0
;
if
(
sscanf
(
x
->
name
,
"%d-%d,%d"
,
&
dscp_min
,
&
dscp_max
,
&
pcp
)
==
3
)
{
if
(
pcp
<=
7
&&
pcp
>=
0
&&
dscp_min
>=
0
&&
dscp_max
>=
0
&&
dscp_min
<
dscp_max
&&
dscp_min
<
(
sizeof
(
dscp_pcp
->
dscp_pcp
)
/
sizeof
(
dscp_pcp
->
dscp_pcp
[
0
]))
&&
dscp_max
<
(
sizeof
(
dscp_pcp
->
dscp_pcp
)
/
sizeof
(
dscp_pcp
->
dscp_pcp
[
0
])))
{
uint8_t
dscp
;
for
(
dscp
=
dscp_min
;
dscp
<=
dscp_max
;
++
dscp
)
{
dscp_pcp
->
dscp_pcp
[
dscp
]
=
pcp
;
}
}
}
else
if
(
sscanf
(
x
->
name
,
"%d,%d"
,
&
dscp_min
,
&
pcp
)
==
2
)
{
if
(
pcp
<=
7
&&
pcp
>=
0
&&
dscp_min
>=
0
&&
dscp_min
<
(
sizeof
(
dscp_pcp
->
dscp_pcp
)
/
sizeof
(
dscp_pcp
->
dscp_pcp
[
0
])))
{
dscp_pcp
->
dscp_pcp
[
dscp_min
]
=
pcp
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment