SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: add whitespace after family= and priority= in serialized routing policy rule

Browse Source 
This also makes priority= serialized only when its value is non-zero.
This commit is contained in:
Yu Watanabe
2020-09-04 08:44:19 +09:00
parent 3c94b20dd3
commit 1680b11df4
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-routing-policy-rule.c
+12 -7
View File
@@ -1202,10 +1202,12 @@ int routing_policy_serialize_rules(Set *rules, FILE *f) {
}
family_str = af_to_name(rule->family);
if (family_str)
fprintf(f, "%sfamily=%s",
space ? " " : "",
family_str);
if (family_str) {
fprintf(f, "%sfamily=%s",
space ? " " : "",
family_str);
space = true;
}
if (rule->tos != 0) {
fprintf(f, "%stos=%hhu",
@@ -1214,9 +1216,12 @@ int routing_policy_serialize_rules(Set *rules, FILE *f) {
space = true;
}
fprintf(f, "%spriority=%"PRIu32,
space ? " " : "",
rule->priority);
if (rule->priority != 0) {
fprintf(f, "%spriority=%"PRIu32,
space ? " " : "",
rule->priority);
space = true;
}
if (rule->fwmark != 0) {
fprintf(f, "%sfwmark=%"PRIu32"/%"PRIu32,
src/network/test-routing-policy-rule.c
+7 -7
View File
@@ -62,31 +62,31 @@ int main(int argc, char **argv) {
test_setup_logging(LOG_DEBUG);
test_rule_serialization("basic parsing",
"RULE=from=1.2.3.4/32 to=2.3.4.5/32 family=AF_INET tos=5 priority=0 fwmark=1/2 table=10", NULL);
"RULE=from=1.2.3.4/32 to=2.3.4.5/32 family=AF_INET tos=5 priority=10 fwmark=1/2 table=10", NULL);
test_rule_serialization("ignored values",
"RULE=something=to=ignore from=1.2.3.4/32 from=1.2.3.4/32"
" \t to=2.3.4.5/24 to=2.3.4.5/32 tos=5 fwmark=2 fwmark=1 table=10 table=20",
"RULE=from=1.2.3.4/32"
" to=2.3.4.5/32 family=AF_INET tos=5 priority=0 fwmark=1/0 table=20");
" to=2.3.4.5/32 family=AF_INET tos=5 fwmark=1/0 table=20");
test_rule_serialization("ipv6",
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 table=6", NULL);
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 table=6", NULL);
assert_se(asprintf(&p, "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 table=%d", RT_TABLE_MAIN) >= 0);
assert_se(asprintf(&p, "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 table=%d", RT_TABLE_MAIN) >= 0);
test_rule_serialization("default table",
"RULE=from=1::2/64 to=2::3/64", p);
test_rule_serialization("incoming interface",
"RULE=from=1::2/64 to=2::3/64 table=1 iif=lo",
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 iif=lo table=1");
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 iif=lo table=1");
test_rule_serialization("outgoing interface",
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 oif=eth0 table=1", NULL);
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 oif=eth0 table=1", NULL);
test_rule_serialization("freeing interface names",
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 iif=e0 iif=e1 oif=e0 oif=e1 table=1",
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 iif=e1 oif=e1 table=1");
"RULE=from=1::2/64 to=2::3/64 family=AF_INET6 iif=e1 oif=e1 table=1");
return 0;
}