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

network/netdev: fix resetting of 'inherit' field

Browse Source 
We have two fields: inherit and ttl, and ttl is ignored if inherit is true.
Setting TTL=inherit and later TTL=n would not work because we didn't unset
inherit.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-09-22 08:17:42 +02:00
parent af14281d2c
commit 6fded8dced
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/geneve.c
+7 -1
View File
@@ -224,16 +224,22 @@ int config_parse_geneve_ttl(
assert(data);
Geneve *v = ASSERT_PTR(userdata);
int r;
if (streq(rvalue, "inherit")) {
v->inherit = true;
v->ttl = 0; /* unset the unused ttl field for clarity */
return 0;
}
return config_parse_uint8_bounded(
r = config_parse_uint8_bounded(
unit, filename, line, section, section_line, lvalue, rvalue,
0, UINT8_MAX, true,
&v->ttl);
if (r <= 0)
return r;
v->inherit = false;
return 0;
}
static int netdev_geneve_verify(NetDev *netdev, const char *filename) {
src/network/netdev/vxlan.c
+13 -20
View File
@@ -351,34 +351,27 @@ int config_parse_vxlan_ttl(
void *data,
void *userdata) {
VxLan *v = userdata;
unsigned f;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
if (streq(rvalue, "inherit"))
VxLan *v = ASSERT_PTR(userdata);
int r;
if (streq(rvalue, "inherit")) {
v->inherit = true;
else {
r = safe_atou(rvalue, &f);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse VXLAN TTL '%s', ignoring assignment: %m", rvalue);
return 0;
}
if (f > 255) {
log_syntax(unit, LOG_WARNING, filename, line, 0,
"Invalid VXLAN TTL '%s'. TTL must be <= 255. Ignoring assignment.", rvalue);
return 0;
}
v->ttl = f;
v->ttl = 0; /* unset the unused ttl field for clarity */
return 0;
}
r = config_parse_unsigned_bounded(
unit, filename, line, section, section_line, lvalue, rvalue,
0, UINT8_MAX, true,
&v->ttl);
if (r <= 0)
return r;
v->inherit = false;
return 0;
}