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

tree-wide: normalize comment style

Browse Source
This commit is contained in:
Yu Watanabe
2025-12-15 08:50:13 +09:00
parent 8e20b9a79d
commit 93378148d4
431 changed files with 1894 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/fuzz-netdev-parser.c
+1 -1
View File
@@ -21,7 +21,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
assert_se(fwrite(data, size, 1, f) == 1);
fflush(f);
assert_se(manager_new(&manager, /* test_mode = */ true) >= 0);
assert_se(manager_new(&manager, /* test_mode= */ true) >= 0);
(void) netdev_load_one(manager, netdev_config, &netdev);
return 0;
}
src/network/fuzz-network-parser.c
+1 -1
View File
@@ -20,7 +20,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
assert_se(fwrite(data, size, 1, f) == 1);
fflush(f);
assert_se(manager_new(&manager, /* test_mode = */ true) >= 0);
assert_se(manager_new(&manager, /* test_mode= */ true) >= 0);
(void) network_load_one(manager, &manager->networks, network_config);
return 0;
}
src/network/netdev/l2tp-tunnel.c
+2 -2
View File
@@ -297,7 +297,7 @@ static int l2tp_get_local_address(NetDev *netdev, union in_addr_union *ret) {
if (r < 0)
return r;
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return -EBUSY;
}
@@ -351,7 +351,7 @@ static int l2tp_get_local_address(NetDev *netdev, union in_addr_union *ret) {
return link_get_l2tp_local_address(link, t, ret);
HASHMAP_FOREACH(link, netdev->manager->links_by_index) {
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
continue;
if (link_get_l2tp_local_address(link, t, ret) >= 0)
src/network/netdev/macsec.c
+1 -1
View File
@@ -743,7 +743,7 @@ int config_parse_macsec_key(
dest = a ? &a->sa : &b->sa;
r = unhexmem_full(rvalue, SIZE_MAX, /* secure = */ true, &p, &l);
r = unhexmem_full(rvalue, SIZE_MAX, /* secure= */ true, &p, &l);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse key. Ignoring assignment: %m");
return 0;
src/network/netdev/netdev-gperf.gperf
+1 -1
View File
@@ -103,7 +103,7 @@ Tunnel.ERSPANHardwareId, config_parse_erspan_hwid,
Tunnel.SerializeTunneledPackets, config_parse_tristate, 0, offsetof(Tunnel, gre_erspan_sequence)
Tunnel.ISATAP, config_parse_tristate, 0, offsetof(Tunnel, isatap)
Tunnel.External, config_parse_bool, 0, offsetof(Tunnel, external)
FooOverUDP.Protocol, config_parse_ip_protocol, /* relax = */ true, offsetof(FouTunnel, fou_protocol)
FooOverUDP.Protocol, config_parse_ip_protocol, /* relax= */ true, offsetof(FouTunnel, fou_protocol)
FooOverUDP.Encapsulation, config_parse_fou_encap_type, 0, offsetof(FouTunnel, fou_encap_type)
FooOverUDP.Port, config_parse_ip_port, 0, offsetof(FouTunnel, port)
FooOverUDP.PeerPort, config_parse_ip_port, 0, offsetof(FouTunnel, peer_port)
src/network/netdev/netdev-util.c
+1 -1
View File
@@ -45,7 +45,7 @@ int link_get_local_address(
assert_not_reached();
}
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return -EBUSY;
SET_FOREACH(a, link->addresses) {
src/network/netdev/netdev.c
+4 -4
View File
@@ -827,7 +827,7 @@ static bool link_is_ready_to_create_stacked_netdev_one(Link *link, bool allow_un
}
static bool link_is_ready_to_create_stacked_netdev(Link *link) {
return check_ready_for_all_sr_iov_ports(link, /* allow_unmanaged = */ false,
return check_ready_for_all_sr_iov_ports(link, /* allow_unmanaged= */ false,
link_is_ready_to_create_stacked_netdev_one);
}
@@ -1031,7 +1031,7 @@ int netdev_load_one(Manager *manager, const char *filename, NetDev **ret) {
dropin_dirname = strjoina(file_basename, ".d");
r = config_parse_many(
STRV_MAKE_CONST(filename), NETWORK_DIRS, dropin_dirname, /* root = */ NULL,
STRV_MAKE_CONST(filename), NETWORK_DIRS, dropin_dirname, /* root= */ NULL,
NETDEV_COMMON_SECTIONS NETDEV_OTHER_SECTIONS,
config_item_perf_lookup, network_netdev_gperf_lookup,
CONFIG_PARSE_WARN,
@@ -1065,7 +1065,7 @@ int netdev_load_one(Manager *manager, const char *filename, NetDev **ret) {
NETDEV_VTABLE(netdev)->init(netdev);
r = config_parse_many(
STRV_MAKE_CONST(filename), NETWORK_DIRS, dropin_dirname, /* root = */ NULL,
STRV_MAKE_CONST(filename), NETWORK_DIRS, dropin_dirname, /* root= */ NULL,
NETDEV_VTABLE(netdev)->sections,
config_item_perf_lookup, network_netdev_gperf_lookup,
CONFIG_PARSE_WARN,
@@ -1086,7 +1086,7 @@ int netdev_load_one(Manager *manager, const char *filename, NetDev **ret) {
if (!netdev->filename)
return log_oom();
log_syntax(/* unit = */ NULL, LOG_DEBUG, filename, /* config_line = */ 0, /* error = */ 0, "Successfully loaded.");
log_syntax(/* unit= */ NULL, LOG_DEBUG, filename, /* config_line= */ 0, /* error= */ 0, "Successfully loaded.");
*ret = TAKE_PTR(netdev);
return 0;
src/network/netdev/vxlan.c
+1 -1
View File
@@ -316,7 +316,7 @@ int config_parse_port_range(
VxLan *v = ASSERT_PTR(userdata);
int r;
r = parse_ip_port_range(rvalue, &v->port_range.low, &v->port_range.high, /* allow_zero = */ false);
r = parse_ip_port_range(rvalue, &v->port_range.low, &v->port_range.high, /* allow_zero= */ false);
if (r < 0)
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse VXLAN port range '%s'. Port should be greater than 0 and less than 65535.", rvalue);
src/network/netdev/wireguard.c
+5 -5
View File
@@ -511,7 +511,7 @@ static int wireguard_decode_key_and_warn(
cred_name = startswith(rvalue, "@");
if (cred_name) {
r = read_credential(cred_name, (void**) &cred, /* ret_size = */ NULL);
r = read_credential(cred_name, (void**) &cred, /* ret_size= */ NULL);
if (r == -ENOMEM)
return log_oom();
if (r < 0) {
@@ -524,7 +524,7 @@ static int wireguard_decode_key_and_warn(
} else if (!streq(lvalue, "PublicKey"))
(void) warn_file_is_world_accessible(filename, NULL, unit, line);
r = unbase64mem_full(cred ?: rvalue, SIZE_MAX, /* secure = */ true, &key, &len);
r = unbase64mem_full(cred ?: rvalue, SIZE_MAX, /* secure= */ true, &key, &len);
if (r == -ENOMEM)
return log_oom();
if (r < 0) {
@@ -776,7 +776,7 @@ int config_parse_wireguard_endpoint(
cred_name = startswith(rvalue, "@");
if (cred_name) {
r = read_credential(cred_name, (void**) &cred, /* ret_size = */ NULL);
r = read_credential(cred_name, (void**) &cred, /* ret_size= */ NULL);
if (r == -ENOMEM)
return log_oom();
if (r < 0) {
@@ -1169,7 +1169,7 @@ static int wireguard_read_default_key_cred(NetDev *netdev, const char *filename)
_cleanup_(erase_and_freep) char *cred = NULL;
r = read_credential(strjoina("network.wireguard.private.", config_name), (void**) &cred, /* ret_size = */ NULL);
r = read_credential(strjoina("network.wireguard.private.", config_name), (void**) &cred, /* ret_size= */ NULL);
if (r < 0)
return log_netdev_error_errno(netdev, r,
"%s: No private key specified and default key isn't available, "
@@ -1179,7 +1179,7 @@ static int wireguard_read_default_key_cred(NetDev *netdev, const char *filename)
_cleanup_(erase_and_freep) void *key = NULL;
size_t len;
r = unbase64mem_full(cred, SIZE_MAX, /* secure = */ true, &key, &len);
r = unbase64mem_full(cred, SIZE_MAX, /* secure= */ true, &key, &len);
if (r < 0)
return log_netdev_error_errno(netdev, r,
"%s: No private key specified and default key cannot be parsed, "
src/network/networkctl-config-file.c
+12 -12
View File
@@ -106,7 +106,7 @@ static int get_config_files_by_name(
if (!dropin_dirname)
return -ENOMEM;
r = conf_files_list_dropins(ret_dropins, dropin_dirname, /* root = */ NULL, NETWORK_DIRS);
r = conf_files_list_dropins(ret_dropins, dropin_dirname, /* root= */ NULL, NETWORK_DIRS);
if (r < 0)
return r;
}
@@ -381,7 +381,7 @@ static int add_config_to_edit(
if (!comment_paths)
return log_oom();
r = strv_extend_strv(&comment_paths, dropins, /* filter_duplicates = */ false);
r = strv_extend_strv(&comment_paths, dropins, /* filter_duplicates= */ false);
if (r < 0)
return log_oom();
@@ -416,7 +416,7 @@ static int udevd_reload(sd_bus *bus) {
if (r < 0)
return bus_log_parse_error(r);
r = bus_wait_for_jobs_one(w, job_path, /* flags = */ 0, NULL);
r = bus_wait_for_jobs_one(w, job_path, /* flags= */ 0, NULL);
if (r == -ENOEXEC) {
log_debug("systemd-udevd is not running, skipping reload.");
return 0;
@@ -505,7 +505,7 @@ int verb_edit(int argc, char *argv[], void *userdata) {
"Config type 'all' cannot be used with 'edit'.");
r = get_config_files_by_link_config(ifname, type,
/* ignore_missing = */ false,
/* ignore_missing= */ false,
&rtnl,
&path, &dropins);
if (r < 0)
@@ -530,7 +530,7 @@ int verb_edit(int argc, char *argv[], void *userdata) {
else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Network config of unknown type: %s", *name);
r = get_config_files_by_name(*name, /* allow_masked = */ false, &path, &dropins);
r = get_config_files_by_name(*name, /* allow_masked= */ false, &path, &dropins);
if (r == -ERFKILL)
return log_error_errno(r, "Network config '%s' is masked.", *name);
if (r == -ENOENT) {
@@ -588,7 +588,7 @@ static int cat_files_by_link_one(
if (!*first)
putchar('\n');
r = cat_files(path, dropins, /* flags = */ CAT_FORMAT_HAS_SECTIONS);
r = cat_files(path, dropins, /* flags= */ CAT_FORMAT_HAS_SECTIONS);
if (r < 0)
return r;
@@ -612,7 +612,7 @@ static int cat_files_by_link_config(const char *link_config, sd_netlink **rtnl,
if (type == _CONFIG_MAX) {
for (LinkConfigType i = 0; i < _CONFIG_MAX; i++) {
r = cat_files_by_link_one(ifname, i, rtnl, /* ignore_missing = */ true, first);
r = cat_files_by_link_one(ifname, i, rtnl, /* ignore_missing= */ true, first);
if (r < 0)
return r;
}
@@ -620,7 +620,7 @@ static int cat_files_by_link_config(const char *link_config, sd_netlink **rtnl,
return 0;
}
return cat_files_by_link_one(ifname, type, rtnl, /* ignore_missing = */ false, first);
return cat_files_by_link_one(ifname, type, rtnl, /* ignore_missing= */ false, first);
}
int verb_cat(int argc, char *argv[], void *userdata) {
@@ -651,7 +651,7 @@ int verb_cat(int argc, char *argv[], void *userdata) {
_cleanup_strv_free_ char **dropins = NULL;
_cleanup_free_ char *path = NULL;
r = get_config_files_by_name(*name, /* allow_masked = */ false, &path, &dropins);
r = get_config_files_by_name(*name, /* allow_masked= */ false, &path, &dropins);
if (r == -ENOENT) {
RET_GATHER(ret, log_error_errno(r, "Cannot find network config file '%s'.", *name));
continue;
@@ -666,7 +666,7 @@ int verb_cat(int argc, char *argv[], void *userdata) {
if (!first)
putchar('\n');
r = cat_files(path, dropins, /* flags = */ CAT_FORMAT_HAS_SECTIONS);
r = cat_files(path, dropins, /* flags= */ CAT_FORMAT_HAS_SECTIONS);
if (r < 0)
return r;
@@ -699,7 +699,7 @@ int verb_mask(int argc, char *argv[], void *userdata) {
else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Network config of unknown type: %s", *name);
r = get_config_files_by_name(*name, /* allow_masked = */ true, &config_path, /* ret_dropins = */ NULL);
r = get_config_files_by_name(*name, /* allow_masked= */ true, &config_path, /* ret_dropins= */ NULL);
if (r == -ENOENT)
log_warning("No existing network config '%s' found, proceeding anyway.", *name);
else if (r < 0)
@@ -758,7 +758,7 @@ int verb_unmask(int argc, char *argv[], void *userdata) {
else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Network config of unknown type: %s", *name);
r = get_config_files_by_name(*name, /* allow_masked = */ true, &path, /* ret_dropins = */ NULL);
r = get_config_files_by_name(*name, /* allow_masked= */ true, &path, /* ret_dropins= */ NULL);
if (r == -ENOENT) {
log_debug_errno(r, "Network configuration '%s' doesn't exist, skipping.", *name);
continue;
src/network/networkctl-description.c
+3 -3
View File
@@ -19,11 +19,11 @@ static int dump_manager_description(sd_varlink *vl) {
assert(vl);
r = varlink_call_and_log(vl, "io.systemd.Network.Describe", /* parameters = */ NULL, &v);
r = varlink_call_and_log(vl, "io.systemd.Network.Describe", /* parameters= */ NULL, &v);
if (r < 0)
return r;
r = sd_json_variant_dump(v, arg_json_format_flags, /* f = */ NULL, /* prefix = */ NULL);
r = sd_json_variant_dump(v, arg_json_format_flags, /* f= */ NULL, /* prefix= */ NULL);
if (r < 0)
return log_error_errno(r, "Failed to dump json object: %m");
return 0;
@@ -38,7 +38,7 @@ static int dump_link_description(sd_varlink *vl, char * const *patterns) {
assert(vl);
assert(patterns);
r = varlink_call_and_log(vl, "io.systemd.Network.Describe", /* parameters = */ NULL, &v);
r = varlink_call_and_log(vl, "io.systemd.Network.Describe", /* parameters= */ NULL, &v);
if (r < 0)
return r;
src/network/networkctl-util.c
+1 -1
View File
@@ -94,7 +94,7 @@ int acquire_bus(sd_bus **ret) {
(void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
if (networkd_is_running()) {
r = varlink_connect_networkd(/* ret_varlink = */ NULL);
r = varlink_connect_networkd(/* ret_varlink= */ NULL);
if (r < 0)
return r;
} else
src/network/networkd-address-generation.c
+2 -2
View File
@@ -344,7 +344,7 @@ static int generate_addresses(
if (in6_addr_is_set(&j->address) && !in6_addr_equal(&j->address, &masked))
continue;
if (generate_stable_private_address(link, app_id, &j->secret_key, &masked, /* previous = */ NULL, &addr) < 0)
if (generate_stable_private_address(link, app_id, &j->secret_key, &masked, /* previous= */ NULL, &addr) < 0)
continue;
break;
@@ -367,7 +367,7 @@ static int generate_addresses(
r = generate_eui64_address(link, &masked, &addr);
} else {
type = ADDRESS_GENERATION_PREFIXSTABLE;
r = generate_stable_private_address(link, app_id, &SD_ID128_NULL, &masked, /* previous = */ NULL, &addr);
r = generate_stable_private_address(link, app_id, &SD_ID128_NULL, &masked, /* previous= */ NULL, &addr);
}
if (r < 0)
return r;
src/network/networkd-address-label.c
+1 -1
View File
@@ -215,7 +215,7 @@ static int link_address_label_process_request(Request *req, Link *link, void *us
assert(link);
assert(link->manager);
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return 0;
if (!link->manager->static_address_labels_configured)
src/network/networkd-address.c
+11 -11
View File
@@ -812,13 +812,13 @@ static int address_update(Address *address) {
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 0;
r = address_set_masquerade(address, /* add = */ true);
r = address_set_masquerade(address, /* add= */ true);
if (r < 0)
return log_link_warning_errno(link, r, "Could not enable IP masquerading: %m");
address_add_netlabel(address);
address_modify_nft_set(address, /* add = */ true);
address_modify_nft_set(address, /* add= */ true);
if (address_is_ready(address) && address->callback) {
r = address->callback(address);
@@ -826,7 +826,7 @@ static int address_update(Address *address) {
return r;
}
link_update_operstate(link, /* also_update_master = */ true);
link_update_operstate(link, /* also_update_master= */ true);
link_check_ready(link);
return 0;
}
@@ -876,11 +876,11 @@ static int address_drop(Address *in, bool removed_by_us) {
Link *link = ASSERT_PTR(address->link);
int r;
r = address_set_masquerade(address, /* add = */ false);
r = address_set_masquerade(address, /* add= */ false);
if (r < 0)
log_link_warning_errno(link, r, "Failed to disable IP masquerading, ignoring: %m");
address_modify_nft_set(address, /* add = */ false);
address_modify_nft_set(address, /* add= */ false);
address_del_netlabel(address);
@@ -901,7 +901,7 @@ static int address_drop(Address *in, bool removed_by_us) {
}
}
link_update_operstate(link, /* also_update_master = */ true);
link_update_operstate(link, /* also_update_master= */ true);
link_check_ready(link);
return 0;
}
@@ -1226,7 +1226,7 @@ static int address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Remov
r, "Could not drop address");
/* If the address cannot be removed, then assume the address is already removed. */
address_forget(link, address, /* removed_by_us = */ true, "Forgetting");
address_forget(link, address, /* removed_by_us= */ true, "Forgetting");
}
return 1;
@@ -1933,7 +1933,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
if (type == RTM_DELADDR) {
if (address)
address_forget(link, address,
/* removed_by_us = */ FLAGS_SET(address->state, NETWORK_CONFIG_STATE_REMOVING),
/* removed_by_us= */ FLAGS_SET(address->state, NETWORK_CONFIG_STATE_REMOVING),
"Forgetting removed");
else
log_address_debug(tmp, "Kernel removed unknown", link);
@@ -2074,8 +2074,8 @@ static int config_parse_broadcast(
r = config_parse_in_addr_non_null(
unit, filename, line, section, section_line,
lvalue, /* ltype = */ AF_INET, rvalue,
&address->broadcast, /* userdata = */ NULL);
lvalue, /* ltype= */ AF_INET, rvalue,
&address->broadcast, /* userdata= */ NULL);
if (r <= 0)
return r;
@@ -2111,7 +2111,7 @@ static int config_parse_address(
return 1;
}
r = config_parse_in_addr_prefix(unit, filename, line, section, section_line, lvalue, /* ltype = */ true, rvalue, &prefix, /* userdata = */ NULL);
r = config_parse_in_addr_prefix(unit, filename, line, section, section_line, lvalue, /* ltype= */ true, rvalue, &prefix, /* userdata= */ NULL);
if (r <= 0)
return r;
src/network/networkd-bridge-vlan.c
+3 -3
View File
@@ -55,7 +55,7 @@ static int add_range(sd_netlink_message *m, uint16_t begin, uint16_t end, bool u
assert(end < BRIDGE_VLAN_BITMAP_MAX);
if (begin == end)
return add_single(m, begin, untagged, /* is_pvid = */ false, str);
return add_single(m, begin, untagged, /* is_pvid= */ false, str);
if (DEBUG_LOGGING)
(void) strextendf_with_separator(str, ",", "%u-%u%s", begin, end, untagged ? "(untagged)" : "");
@@ -131,7 +131,7 @@ static int bridge_vlan_append_set_info(Link *link, sd_netlink_message *m) {
begin = UINT16_MAX;
}
r = add_single(m, pvid, pvid_is_untagged, /* is_pvid = */ true, &str);
r = add_single(m, pvid, pvid_is_untagged, /* is_pvid= */ true, &str);
if (r < 0)
return r;
@@ -207,7 +207,7 @@ static int bridge_vlan_append_del_info(Link *link, sd_netlink_message *m) {
if (begin != UINT16_MAX) {
assert(begin < k);
r = add_range(m, begin, k - 1, /* untagged = */ false, &str);
r = add_range(m, begin, k - 1, /* untagged= */ false, &str);
if (r < 0)
return r;
src/network/networkd-dhcp-prefix-delegation.c
+13 -13
View File
@@ -266,7 +266,7 @@ static int dhcp_pd_check_ready(Link *link) {
log_link_debug(link, "DHCP-PD addresses and routes set.");
r = dhcp_pd_remove(link, /* only_marked = */ true);
r = dhcp_pd_remove(link, /* only_marked= */ true);
if (r < 0)
return r;
@@ -611,7 +611,7 @@ static int dhcp_pd_finalize(Link *link) {
if (link->dhcp_pd_messages == 0) {
link->dhcp_pd_configured = false;
r = dhcp_pd_remove(link, /* only_marked = */ true);
r = dhcp_pd_remove(link, /* only_marked= */ true);
if (r < 0)
return r;
}
@@ -673,15 +673,15 @@ static void dhcp_pd_prefix_lost(Link *uplink, NetworkConfigSource source) {
assert(uplink->manager);
HASHMAP_FOREACH(link, uplink->manager->links_by_index) {
if (!dhcp_pd_is_uplink(link, uplink, /* accept_auto = */ true))
if (!dhcp_pd_is_uplink(link, uplink, /* accept_auto= */ true))
continue;
r = dhcp_pd_remove(link, /* only_marked = */ false);
r = dhcp_pd_remove(link, /* only_marked= */ false);
if (r < 0)
link_enter_failed(link);
}
(void) dhcp_pd_remove_unreachable_route(uplink->manager, source, /* only_marked = */ false);
(void) dhcp_pd_remove_unreachable_route(uplink->manager, source, /* only_marked= */ false);
set_clear(uplink->dhcp_pd_prefixes);
}
@@ -977,7 +977,7 @@ static int dhcp4_pd_assign_subnet_prefix(Link *link, Link *uplink) {
return r;
}
r = dhcp_pd_assign_subnet_prefix(link, &pd_prefix, pd_prefixlen, lifetime_usec, lifetime_usec, /* is_uplink = */ false);
r = dhcp_pd_assign_subnet_prefix(link, &pd_prefix, pd_prefixlen, lifetime_usec, lifetime_usec, /* is_uplink= */ false);
if (r < 0)
return r;
@@ -1054,7 +1054,7 @@ int dhcp4_pd_prefix_acquired(Link *uplink) {
r = dhcp4_request_unreachable_route(uplink, &pd_prefix, pd_prefixlen, lifetime_usec, &server_address);
if (r < 0)
return r;
(void) dhcp_pd_remove_unreachable_route(uplink->manager, NETWORK_CONFIG_SOURCE_DHCP4, /* only_marked = */ true);
(void) dhcp_pd_remove_unreachable_route(uplink->manager, NETWORK_CONFIG_SOURCE_DHCP4, /* only_marked= */ true);
/* Create or update 6rd SIT tunnel device. */
r = dhcp4_pd_create_6rd_tunnel(uplink, dhcp4_pd_6rd_tunnel_create_handler);
@@ -1063,7 +1063,7 @@ int dhcp4_pd_prefix_acquired(Link *uplink) {
/* Then, assign subnet prefixes to downstream interfaces. */
HASHMAP_FOREACH(link, uplink->manager->links_by_index) {
if (!dhcp_pd_is_uplink(link, uplink, /* accept_auto = */ true))
if (!dhcp_pd_is_uplink(link, uplink, /* accept_auto= */ true))
continue;
r = dhcp4_pd_assign_subnet_prefix(link, uplink);
@@ -1117,7 +1117,7 @@ static int dhcp6_pd_assign_subnet_prefixes(Link *link, Link *uplink) {
r = dhcp_pd_assign_subnet_prefix(link, &pd_prefix, pd_prefix_len,
lifetime_preferred_usec, lifetime_valid_usec,
/* is_uplink = */ link == uplink);
/* is_uplink= */ link == uplink);
if (r < 0)
return r;
}
@@ -1170,11 +1170,11 @@ int dhcp6_pd_prefix_acquired(Link *uplink) {
return r;
}
(void) dhcp_pd_remove_unreachable_route(uplink->manager, NETWORK_CONFIG_SOURCE_DHCP6, /* only_marked = */ true);
(void) dhcp_pd_remove_unreachable_route(uplink->manager, NETWORK_CONFIG_SOURCE_DHCP6, /* only_marked= */ true);
/* Then, assign subnet prefixes. */
HASHMAP_FOREACH(link, uplink->manager->links_by_index) {
if (!dhcp_pd_is_uplink(link, uplink, /* accept_auto = */ true))
if (!dhcp_pd_is_uplink(link, uplink, /* accept_auto= */ true))
continue;
r = dhcp6_pd_assign_subnet_prefixes(link, uplink);
@@ -1312,7 +1312,7 @@ int link_drop_dhcp_pd_config(Link *link, Network *network) {
return 0; /* .network file is unchanged. It is not necessary to reconfigure the client. */
if (!link_dhcp_pd_is_enabled(link)) /* Disabled now, drop all configs. */
return dhcp_pd_remove(link, /* only_marked = */ false);
return dhcp_pd_remove(link, /* only_marked= */ false);
/* If previously explicitly disabled, then there is nothing we need to drop.
* If this is called on start up, we do not know the previous settings, assume nothing changed. */
@@ -1328,7 +1328,7 @@ int link_drop_dhcp_pd_config(Link *link, Network *network) {
link->network->dhcp_pd_route_metric != network->dhcp_pd_route_metric ||
link->network->dhcp_pd_uplink_index != network->dhcp_pd_uplink_index ||
!streq_ptr(link->network->dhcp_pd_uplink_name, network->dhcp_pd_uplink_name))
return dhcp_pd_remove(link, /* only_marked = */ false);
return dhcp_pd_remove(link, /* only_marked= */ false);
return 0;
}
src/network/networkd-dhcp-server.c
+1 -1
View File
@@ -761,7 +761,7 @@ static bool dhcp_server_is_ready_to_configure(Link *link) {
assert(link->network);
assert(link->network->dhcp_server_address);
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return false;
if (!link_has_carrier(link))
src/network/networkd-dhcp4.c
+6 -6
View File
@@ -328,7 +328,7 @@ int dhcp4_check_ready(Link *link) {
log_link_debug(link, "DHCPv4 address and routes set.");
/* New address and routes are configured now. Let's release old lease. */
r = dhcp4_remove_address_and_routes(link, /* only_marked = */ true);
r = dhcp4_remove_address_and_routes(link, /* only_marked= */ true);
if (r < 0)
return r;
@@ -800,7 +800,7 @@ static int dhcp4_request_routes(Link *link) {
assert(link);
assert(link->dhcp_lease);
r = dhcp4_request_prefix_route(link, /* rt = */ NULL);
r = dhcp4_request_prefix_route(link, /* rt= */ NULL);
if (r < 0)
return log_link_error_errno(link, r, "DHCP error: Could not request prefix route: %m");
@@ -881,7 +881,7 @@ int dhcp4_lease_lost(Link *link) {
sd_dhcp_lease_has_6rd(link->dhcp_lease))
dhcp4_pd_prefix_lost(link);
RET_GATHER(r, dhcp4_remove_address_and_routes(link, /* only_marked = */ false));
RET_GATHER(r, dhcp4_remove_address_and_routes(link, /* only_marked= */ false));
RET_GATHER(r, dhcp_reset_mtu(link));
RET_GATHER(r, dhcp_reset_hostname(link));
@@ -1755,7 +1755,7 @@ int dhcp4_update_ipv6_connectivity(Link *link) {
if (link_has_ipv6_connectivity(link))
return 0;
return dhcp4_start_full(link, /* set_ipv6_connectivity = */ false);
return dhcp4_start_full(link, /* set_ipv6_connectivity= */ false);
}
int dhcp4_start_full(Link *link, bool set_ipv6_connectivity) {
@@ -1826,7 +1826,7 @@ static int dhcp4_process_request(Request *req, Link *link, void *userdata) {
assert(link);
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return 0;
r = dhcp4_configure_duid(link);
@@ -1882,7 +1882,7 @@ int link_drop_dhcp4_config(Link *link, Network *network) {
* client was enabled on the previous invocation of networkd, but when it is restarted, a new
* .network file may match to the interface, and DHCPv4 client may be disabled. In that case,
* the DHCPv4 client is not running, hence sd_dhcp_client_stop() in the above does nothing. */
RET_GATHER(ret, dhcp4_remove_address_and_routes(link, /* only_marked = */ false));
RET_GATHER(ret, dhcp4_remove_address_and_routes(link, /* only_marked= */ false));
}
if (link->dhcp_client && link->network->dhcp_use_bootp &&
src/network/networkd-dhcp6.c
+6 -6
View File
@@ -46,7 +46,7 @@ static DHCP6ClientStartMode link_get_dhcp6_client_start_mode(Link *link) {
return link->network->dhcp6_client_start_mode;
/* When this interface itself is an uplink interface, then start dhcp6 client in solicit mode. */
if (dhcp_pd_is_uplink(link, link, /* accept_auto = */ false))
if (dhcp_pd_is_uplink(link, link, /* accept_auto= */ false))
return DHCP6_CLIENT_START_MODE_SOLICIT;
/* Otherwise, start dhcp6 client when RA is received. */
@@ -125,7 +125,7 @@ int dhcp6_check_ready(Link *link) {
link->dhcp6_configured = true;
log_link_debug(link, "DHCPv6 addresses and routes set.");
r = dhcp6_remove(link, /* only_marked = */ true);
r = dhcp6_remove(link, /* only_marked= */ true);
if (r < 0)
return r;
@@ -335,7 +335,7 @@ static int dhcp6_lease_ip_acquired(sd_dhcp6_client *client, Link *link) {
if (link->dhcp6_messages == 0) {
link->dhcp6_configured = true;
r = dhcp6_remove(link, /* only_marked = */ true);
r = dhcp6_remove(link, /* only_marked= */ true);
if (r < 0)
return r;
} else
@@ -381,7 +381,7 @@ static int dhcp6_lease_lost(Link *link) {
link->dhcp6_lease = sd_dhcp6_lease_unref(link->dhcp6_lease);
r = dhcp6_remove(link, /* only_marked = */ false);
r = dhcp6_remove(link, /* only_marked= */ false);
if (r < 0)
return r;
@@ -808,7 +808,7 @@ static int dhcp6_process_request(Request *req, Link *link, void *userdata) {
assert(link);
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return 0;
r = dhcp_configure_duid(link, link_get_dhcp6_duid(link));
@@ -865,7 +865,7 @@ int link_drop_dhcp6_config(Link *link, Network *network) {
ret = sd_dhcp6_client_stop(link->dhcp6_client);
/* Also explicitly drop DHCPv6 addresses and routes. See also link_drop_dhcp4_config(). */
RET_GATHER(ret, dhcp6_remove(link, /* only_marked = */ false));
RET_GATHER(ret, dhcp6_remove(link, /* only_marked= */ false));
}
/* Even if the client is currently enabled and also enabled in the new .network file, detailed
src/network/networkd-ipv4acd.c
+3 -3
View File
@@ -162,7 +162,7 @@ static void on_acd(sd_ipv4acd *acd, int event, void *userdata) {
switch (event) {
case SD_IPV4ACD_EVENT_STOP:
if (address->source == NETWORK_CONFIG_SOURCE_STATIC) {
r = static_ipv4acd_address_remove(link, address, /* on_conflict = */ false);
r = static_ipv4acd_address_remove(link, address, /* on_conflict= */ false);
if (r < 0)
link_enter_failed(link);
}
@@ -179,7 +179,7 @@ static void on_acd(sd_ipv4acd *acd, int event, void *userdata) {
log_link_warning(link, "Dropping address %s, as an address conflict was detected.", IN4_ADDR_TO_STRING(&address->in_addr.in));
if (address->source == NETWORK_CONFIG_SOURCE_STATIC)
r = static_ipv4acd_address_remove(link, address, /* on_conflict = */ true);
r = static_ipv4acd_address_remove(link, address, /* on_conflict= */ true);
else
r = dhcp4_address_on_conflict(link);
if (r < 0)
@@ -215,7 +215,7 @@ static int ipv4acd_start_one(Link *link, sd_ipv4acd *acd) {
if (!link_has_carrier(link))
return 0;
return sd_ipv4acd_start(acd, /* reset_conflicts = */ true);
return sd_ipv4acd_start(acd, /* reset_conflicts= */ true);
}
int ipv4acd_configure(Link *link, const Address *address) {
src/network/networkd-json.c
+9 -9
View File
@@ -242,7 +242,7 @@ int nexthops_append_json(Manager *manager, int ifindex, sd_json_variant **v) {
log_nexthop_debug(nexthop, "Serializing", manager);
}
r = nexthop_append_json(nexthop, /* serializing = */ ifindex < 0, &array);
r = nexthop_append_json(nexthop, /* serializing= */ ifindex < 0, &array);
if (r < 0)
return r;
}
@@ -299,7 +299,7 @@ static int route_append_json(Route *route, bool serializing, sd_json_variant **a
if (r < 0)
return r;
r = manager_get_route_table_to_string(route->manager, route->table, /* append_num = */ false, &table);
r = manager_get_route_table_to_string(route->manager, route->table, /* append_num= */ false, &table);
if (r < 0)
return r;
@@ -352,7 +352,7 @@ int routes_append_json(Manager *manager, int ifindex, sd_json_variant **v) {
log_route_debug(route, "Serializing", manager);
}
r = route_append_json(route, /* serializing = */ ifindex < 0, &array);
r = route_append_json(route, /* serializing= */ ifindex < 0, &array);
if (r < 0)
return r;
}
@@ -368,7 +368,7 @@ static int routing_policy_rule_append_json(RoutingPolicyRule *rule, sd_json_vari
assert(rule->manager);
assert(array);
r = manager_get_route_table_to_string(rule->manager, rule->table, /* append_num = */ false, &table);
r = manager_get_route_table_to_string(rule->manager, rule->table, /* append_num= */ false, &table);
if (r < 0 && r != -EINVAL)
return r;
@@ -1549,11 +1549,11 @@ int link_build_json(Link *link, sd_json_variant **ret) {
if (r < 0)
return r;
r = domains_append_json(link, /* is_route = */ false, &v);
r = domains_append_json(link, /* is_route= */ false, &v);
if (r < 0)
return r;
r = domains_append_json(link, /* is_route = */ true, &v);
r = domains_append_json(link, /* is_route= */ true, &v);
if (r < 0)
return r;
@@ -1573,7 +1573,7 @@ int link_build_json(Link *link, sd_json_variant **ret) {
if (r < 0)
return r;
r = addresses_append_json(link, /* serializing = */ false, &v);
r = addresses_append_json(link, /* serializing= */ false, &v);
if (r < 0)
return r;
@@ -1648,11 +1648,11 @@ int manager_build_json(Manager *manager, sd_json_variant **ret) {
if (r < 0)
return r;
r = nexthops_append_json(manager, /* ifindex = */ 0, &v);
r = nexthops_append_json(manager, /* ifindex= */ 0, &v);
if (r < 0)
return r;
r = routes_append_json(manager, /* ifindex = */ 0, &v);
r = routes_append_json(manager, /* ifindex= */ 0, &v);
if (r < 0)
return r;
src/network/networkd-link-bus.c
+12 -12
View File
@@ -117,7 +117,7 @@ int bus_link_method_set_ntp_servers(sd_bus_message *message, void *userdata, sd_
strv_free_and_replace(l->ntp, ntp);
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
@@ -160,7 +160,7 @@ static int bus_link_method_set_dns_servers_internal(sd_bus_message *message, voi
free_and_replace(l->dns, dns);
l->n_dns = n;
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
@@ -257,7 +257,7 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_
l->search_domains = TAKE_PTR(search_domains);
l->route_domains = TAKE_PTR(route_domains);
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
@@ -292,7 +292,7 @@ int bus_link_method_set_default_route(sd_bus_message *message, void *userdata, s
if (l->dns_default_route != b) {
l->dns_default_route = b;
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
}
@@ -338,7 +338,7 @@ int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_er
if (l->llmnr != mode) {
l->llmnr = mode;
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
}
@@ -384,7 +384,7 @@ int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_err
if (l->mdns != mode) {
l->mdns = mode;
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
}
@@ -430,7 +430,7 @@ int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd
if (l->dns_over_tls_mode != mode) {
l->dns_over_tls_mode = mode;
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
}
@@ -476,7 +476,7 @@ int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_e
if (l->dnssec_mode != mode) {
l->dnssec_mode = mode;
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
}
@@ -533,7 +533,7 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v
set_free_and_replace(l->dnssec_negative_trust_anchors, ns);
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
@@ -562,7 +562,7 @@ int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_e
link_ntp_settings_clear(l);
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
@@ -592,7 +592,7 @@ int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_e
link_dns_settings_clear(l);
r = link_save_and_clean_full(l, /* also_save_manager = */ true);
r = link_save_and_clean_full(l, /* also_save_manager= */ true);
if (r < 0)
return r;
@@ -672,7 +672,7 @@ int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_
if (r == 0)
return 1; /* Polkit will call us back */
r = link_reconfigure_full(l, LINK_RECONFIGURE_UNCONDITIONALLY | LINK_RECONFIGURE_CLEANLY, message, /* counter = */ NULL);
r = link_reconfigure_full(l, LINK_RECONFIGURE_UNCONDITIONALLY | LINK_RECONFIGURE_CLEANLY, message, /* counter= */ NULL);
if (r != 0)
return r; /* Will reply later when r > 0. */
src/network/networkd-link.c
+14 -14
View File
@@ -412,7 +412,7 @@ int link_stop_engines(Link *link, bool may_keep_dynamic) {
if (r < 0)
RET_GATHER(ret, log_link_warning_errno(link, r, "Could not stop DHCPv6 client: %m"));
r = dhcp_pd_remove(link, /* only_marked = */ false);
r = dhcp_pd_remove(link, /* only_marked= */ false);
if (r < 0)
RET_GATHER(ret, log_link_warning_errno(link, r, "Could not remove DHCPv6 PD addresses and routes: %m"));
@@ -466,7 +466,7 @@ void link_enter_failed(Link *link) {
return;
stop:
(void) link_stop_engines(link, /* may_keep_dynamic = */ false);
(void) link_stop_engines(link, /* may_keep_dynamic= */ false);
}
void link_check_ready(Link *link) {
@@ -577,7 +577,7 @@ void link_check_ready(Link *link) {
link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_NDISC));
/* If the uplink for PD is self, then request the corresponding DHCP protocol is also ready. */
if (dhcp_pd_is_uplink(link, link, /* accept_auto = */ false)) {
if (dhcp_pd_is_uplink(link, link, /* accept_auto= */ false)) {
if (link_dhcp4_enabled(link) && link->network->dhcp_use_6rd &&
sd_dhcp_lease_has_6rd(link->dhcp_lease)) {
if (!link->dhcp4_configured)
@@ -832,9 +832,9 @@ int link_handle_bound_to_list(Link *link) {
}
if (!required_up && link_is_up)
return link_request_to_bring_up_or_down(link, /* up = */ false);
return link_request_to_bring_up_or_down(link, /* up= */ false);
if (required_up && !link_is_up)
return link_request_to_bring_up_or_down(link, /* up = */ true);
return link_request_to_bring_up_or_down(link, /* up= */ true);
return 0;
}
@@ -1213,7 +1213,7 @@ static int link_configure(Link *link) {
if (r < 0)
return r;
r = link_request_to_set_mac(link, /* allow_retry = */ true);
r = link_request_to_set_mac(link, /* allow_retry= */ true);
if (r < 0)
return r;
@@ -1364,7 +1364,7 @@ static void link_enter_unmanaged(Link *link) {
log_link_full(link, link->state == LINK_STATE_INITIALIZED ? LOG_DEBUG : LOG_INFO,
"Unmanaging interface.");
(void) link_stop_engines(link, /* may_keep_dynamic = */ false);
(void) link_stop_engines(link, /* may_keep_dynamic= */ false);
(void) link_drop_requests(link);
(void) link_drop_static_config(link);
@@ -1479,7 +1479,7 @@ int link_reconfigure_impl(Link *link, LinkReconfigurationFlag flags) {
} else {
/* Otherwise, stop DHCP client and friends unconditionally, and drop all dynamic
* configurations like DHCP address and routes. */
r = link_stop_engines(link, /* may_keep_dynamic = */ false);
r = link_stop_engines(link, /* may_keep_dynamic= */ false);
if (r < 0)
return r;
@@ -1637,7 +1637,7 @@ static int link_initialized_and_synced(Link *link) {
return r;
}
return link_reconfigure_impl(link, /* flags = */ 0);
return link_reconfigure_impl(link, /* flags= */ 0);
}
static int link_initialized_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
@@ -1685,7 +1685,7 @@ static int link_initialized(Link *link, sd_device *device) {
log_link_warning_errno(link, r, "Failed to manage SR-IOV PF and VF ports, ignoring: %m");
if (link->state != LINK_STATE_PENDING)
return link_reconfigure(link, /* flags = */ 0);
return link_reconfigure(link, /* flags= */ 0);
log_link_debug(link, "udev initialized link");
@@ -1861,7 +1861,7 @@ static int link_carrier_lost_impl(Link *link) {
if (!link->network)
return ret;
RET_GATHER(ret, link_stop_engines(link, /* may_keep_dynamic = */ false));
RET_GATHER(ret, link_stop_engines(link, /* may_keep_dynamic= */ false));
RET_GATHER(ret, link_drop_static_config(link));
return ret;
@@ -1948,7 +1948,7 @@ static int link_admin_state_up(Link *link) {
if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_DOWN) {
log_link_info(link, "Activation policy is \"always-down\", forcing link down.");
return link_request_to_bring_up_or_down(link, /* up = */ false);
return link_request_to_bring_up_or_down(link, /* up= */ false);
}
/* We set the ipv6 mtu after the device mtu, but the kernel resets
@@ -1971,7 +1971,7 @@ static int link_admin_state_down(Link *link) {
if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_UP) {
log_link_info(link, "Activation policy is \"always-up\", forcing link up.");
return link_request_to_bring_up_or_down(link, /* up = */ true);
return link_request_to_bring_up_or_down(link, /* up= */ true);
}
return 0;
@@ -2936,7 +2936,7 @@ int manager_rtnl_process_link(sd_netlink *rtnl, sd_netlink_message *message, Man
if (manager->enumerating)
return 0;
r = link_reconfigure_impl(link, /* flags = */ 0);
r = link_reconfigure_impl(link, /* flags= */ 0);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to reconfigure interface: %m");
link_enter_failed(link);
src/network/networkd-manager-varlink.c
+3 -3
View File
@@ -29,7 +29,7 @@ static int vl_method_describe(sd_varlink *link, sd_json_variant *parameters, sd_
assert(parameters);
assert(link);
r = sd_varlink_dispatch(link, parameters, /* dispatch_table = */ NULL, /* userdata = */ NULL);
r = sd_varlink_dispatch(link, parameters, /* dispatch_table= */ NULL, /* userdata= */ NULL);
if (r != 0)
return r;
@@ -46,7 +46,7 @@ static int vl_method_get_states(sd_varlink *link, sd_json_variant *parameters, s
assert(link);
r = sd_varlink_dispatch(link, parameters, /* dispatch_table = */ NULL, /* userdata = */ NULL);
r = sd_varlink_dispatch(link, parameters, /* dispatch_table= */ NULL, /* userdata= */ NULL);
if (r != 0)
return r;
@@ -67,7 +67,7 @@ static int vl_method_get_namespace_id(sd_varlink *link, sd_json_variant *paramet
assert(link);
r = sd_varlink_dispatch(link, parameters, /* dispatch_table = */ NULL, /* userdata = */ NULL);
r = sd_varlink_dispatch(link, parameters, /* dispatch_table= */ NULL, /* userdata= */ NULL);
if (r != 0)
return r;
src/network/networkd-manager.c
+5 -5
View File
@@ -216,7 +216,7 @@ static int manager_listen_fds(Manager *m, int *ret_rtnl_fd, int *ret_varlink_fd,
assert(ret_varlink_fd);
assert(ret_resolve_hook_fd);
n = sd_listen_fds_with_names(/* unset_environment = */ true, &names);
n = sd_listen_fds_with_names(/* unset_environment= */ true, &names);
if (n < 0)
return n;
@@ -504,7 +504,7 @@ static int manager_stop(Manager *manager, ManagerState state) {
Link *link;
HASHMAP_FOREACH(link, manager->links_by_index)
(void) link_stop_engines(link, /* may_keep_dynamic = */ true);
(void) link_stop_engines(link, /* may_keep_dynamic= */ true);
return 0;
}
@@ -520,7 +520,7 @@ static int signal_restart_callback(sd_event_source *s, const struct signalfd_sig
static int signal_reload_callback(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
Manager *m = ASSERT_PTR(userdata);
(void) manager_reload(m, /* message = */ NULL);
(void) manager_reload(m, /* message= */ NULL);
return 0;
}
@@ -1258,8 +1258,8 @@ int manager_reload(Manager *m, sd_bus_message *message) {
}
HASHMAP_FOREACH(link, m->links_by_index)
(void) link_reconfigure_full(link, /* flags = */ 0, message,
/* counter = */ message ? &m->reloading : NULL);
(void) link_reconfigure_full(link, /* flags= */ 0, message,
/* counter= */ message ? &m->reloading : NULL);
log_debug("Reloaded.");
r = 0;
src/network/networkd-ndisc.c
+12 -12
View File
@@ -501,7 +501,7 @@ static int ndisc_request_route(Route *route, Link *link) {
if (r < 0)
return r;
r = ndisc_set_route_nexthop(route, link, /* request = */ true);
r = ndisc_set_route_nexthop(route, link, /* request= */ true);
if (r < 0)
return r;
@@ -623,7 +623,7 @@ static int ndisc_remove_route(Route *route, Link *link) {
assert(link);
assert(link->manager);
r = ndisc_set_route_nexthop(route, link, /* request = */ false);
r = ndisc_set_route_nexthop(route, link, /* request= */ false);
if (r < 0)
return r;
@@ -979,7 +979,7 @@ static int ndisc_redirect_handler(Link *link, sd_ndisc_redirect *rd) {
if (r < 0)
return r;
r = ndisc_drop_outdated(link, /* router = */ NULL, now_usec);
r = ndisc_drop_outdated(link, /* router= */ NULL, now_usec);
if (r < 0)
return r;
@@ -2522,7 +2522,7 @@ static int ndisc_expire_handler(sd_event_source *s, uint64_t usec, void *userdat
assert_se(sd_event_now(link->manager->event, CLOCK_BOOTTIME, &now_usec) >= 0);
(void) ndisc_drop_outdated(link, /* router = */ NULL, now_usec);
(void) ndisc_drop_outdated(link, /* router= */ NULL, now_usec);
(void) ndisc_setup_expire(link);
return 0;
}
@@ -2629,7 +2629,7 @@ static int ndisc_start_dhcp6_client(Link *link, sd_ndisc_router *rt) {
case IPV6_ACCEPT_RA_START_DHCP6_CLIENT_ALWAYS:
/* When IPv6AcceptRA.DHCPv6Client=always, start dhcp6 client in solicit mode
* even if the router flags have neither M nor O flags. */
r = dhcp6_start_on_ra(link, /* information_request = */ false);
r = dhcp6_start_on_ra(link, /* information_request= */ false);
break;
default:
@@ -2677,7 +2677,7 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
if (r < 0)
return r;
r = ndisc_drop_outdated(link, /* router = */ NULL, timestamp_usec);
r = ndisc_drop_outdated(link, /* router= */ NULL, timestamp_usec);
if (r < 0)
return r;
@@ -2705,7 +2705,7 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
if (r < 0)
return r;
r = ndisc_router_process_options(link, rt, /* zero_lifetime = */ true);
r = ndisc_router_process_options(link, rt, /* zero_lifetime= */ true);
if (r < 0)
return r;
@@ -2713,7 +2713,7 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
if (r < 0)
return r;
r = ndisc_router_process_options(link, rt, /* zero_lifetime = */ false);
r = ndisc_router_process_options(link, rt, /* zero_lifetime= */ false);
if (r < 0)
return r;
@@ -2999,7 +2999,7 @@ static int ndisc_process_request(Request *req, Link *link, void *userdata) {
assert(link);
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return 0;
r = ndisc_configure(link);
@@ -3074,7 +3074,7 @@ int link_drop_ndisc_config(Link *link, Network *network) {
/* Redirect messages will be ignored. Drop configurations based on the previously received redirect
* messages. */
if (!network->ndisc_use_redirect)
(void) ndisc_drop_redirect(link, /* router = */ NULL);
(void) ndisc_drop_redirect(link, /* router= */ NULL);
/* If one of the route setting is changed, drop all routes. */
if (link->network->ndisc_use_gateway != network->ndisc_use_gateway ||
@@ -3143,8 +3143,8 @@ void ndisc_flush(Link *link) {
assert(link);
/* Remove all addresses, routes, RDNSS, DNSSL, DNR, and Captive Portal entries, without exception. */
(void) ndisc_drop_outdated(link, /* router = */ NULL, /* timestamp_usec = */ USEC_INFINITY);
(void) ndisc_drop_redirect(link, /* router = */ NULL);
(void) ndisc_drop_outdated(link, /* router= */ NULL, /* timestamp_usec= */ USEC_INFINITY);
(void) ndisc_drop_redirect(link, /* router= */ NULL);
link->ndisc_routers_by_sender = hashmap_free(link->ndisc_routers_by_sender);
link->ndisc_rdnss = set_free(link->ndisc_rdnss);
src/network/networkd-neighbor.c
+1 -1
View File
@@ -497,7 +497,7 @@ int link_drop_unmanaged_neighbors(Link *link) {
if (!neighbor_exists(neighbor))
continue;
if (!link_should_mark_config(link, /* only_static = */ false, neighbor->source, RTPROT_STATIC))
if (!link_should_mark_config(link, /* only_static= */ false, neighbor->source, RTPROT_STATIC))
continue;
neighbor_mark(neighbor);
src/network/networkd-network.c
+2 -2
View File
@@ -515,7 +515,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
};
r = config_parse_many(
STRV_MAKE_CONST(filename), NETWORK_DIRS, dropin_dirname, /* root = */ NULL,
STRV_MAKE_CONST(filename), NETWORK_DIRS, dropin_dirname, /* root= */ NULL,
"Match\0"
"Link\0"
"SR-IOV\0"
@@ -600,7 +600,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
return log_warning_errno(r, "%s: Failed to store configuration into hashmap: %m", filename);
TAKE_PTR(network);
log_syntax(/* unit = */ NULL, LOG_DEBUG, filename, /* config_line = */ 0, /* error = */ 0, "Successfully loaded.");
log_syntax(/* unit= */ NULL, LOG_DEBUG, filename, /* config_line= */ 0, /* error= */ 0, "Successfully loaded.");
return 0;
}
src/network/networkd-nexthop.h
+2 -2
View File
@@ -59,10 +59,10 @@ int network_drop_invalid_nexthops(Network *network);
int link_drop_nexthops(Link *link, bool only_static);
static inline int link_drop_unmanaged_nexthops(Link *link) {
return link_drop_nexthops(link, /* only_static = */ false);
return link_drop_nexthops(link, /* only_static= */ false);
}
static inline int link_drop_static_nexthops(Link *link) {
return link_drop_nexthops(link, /* only_static = */ true);
return link_drop_nexthops(link, /* only_static= */ true);
}
void link_forget_nexthops(Link *link);
src/network/networkd-radv.c
+4 -4
View File
@@ -378,7 +378,7 @@ set_dns:
n_dns,
dns,
link->network->router_dns_lifetime_usec,
/* valid_until = */ USEC_INFINITY);
/* valid_until= */ USEC_INFINITY);
}
static int radv_set_domains(Link *link, Link *uplink) {
@@ -416,7 +416,7 @@ set_domains:
link->radv,
s,
link->network->router_dns_lifetime_usec,
/* valid_until = */ USEC_INFINITY);
/* valid_until= */ USEC_INFINITY);
}
static int radv_find_uplink(Link *link, Link **ret) {
@@ -556,7 +556,7 @@ static int radv_configure(Link *link) {
link->radv,
link->network->router_home_agent_preference,
link->network->home_agent_lifetime_usec,
/* valid_until = */ USEC_INFINITY);
/* valid_until= */ USEC_INFINITY);
if (r < 0)
return r;
}
@@ -583,7 +583,7 @@ static int radv_is_ready_to_configure(Link *link) {
assert(link);
assert(link->network);
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return false;
if (in6_addr_is_null(&link->ipv6ll_address))
src/network/networkd-route-metric.c
+2 -2
View File
@@ -131,7 +131,7 @@ static void route_metric_unset(RouteMetric *metric, uint16_t attr) {
if (metric->n_metrics_set > attr)
metric->metrics_set[attr] = false;
assert_se(route_metric_set_full(metric, attr, 0, /* force = */ false) >= 0);
assert_se(route_metric_set_full(metric, attr, 0, /* force= */ false) >= 0);
}
uint32_t route_metric_get(const RouteMetric *metric, uint16_t attr) {
@@ -412,7 +412,7 @@ int config_parse_route_metric(
&route->metric,
ltype,
k,
/* force = */ true) < 0)
/* force= */ true) < 0)
return log_oom();
return 1;
src/network/networkd-route-nexthop.c
+5 -5
View File
@@ -142,11 +142,11 @@ static int route_nexthop_compare_func_full(const RouteNextHop *a, const RouteNex
}
static void route_nexthop_hash_func(const RouteNextHop *nh, struct siphash *state) {
route_nexthop_hash_func_full(nh, state, /* with_weight = */ true);
route_nexthop_hash_func_full(nh, state, /* with_weight= */ true);
}
static int route_nexthop_compare_func(const RouteNextHop *a, const RouteNextHop *b) {
return route_nexthop_compare_func_full(a, b, /* with_weight = */ true);
return route_nexthop_compare_func_full(a, b, /* with_weight= */ true);
}
DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(
@@ -178,7 +178,7 @@ void route_nexthops_hash_func(const Route *route, struct siphash *state) {
return;
case 1:
route_nexthop_hash_func_full(&route->nexthop, state, /* with_weight = */ false);
route_nexthop_hash_func_full(&route->nexthop, state, /* with_weight= */ false);
return;
default: {
@@ -205,7 +205,7 @@ int route_nexthops_compare_func(const Route *a, const Route *b) {
return CMP(a->nexthop_id, b->nexthop_id);
case 1:
return route_nexthop_compare_func_full(&a->nexthop, &b->nexthop, /* with_weight = */ false);
return route_nexthop_compare_func_full(&a->nexthop, &b->nexthop, /* with_weight= */ false);
default: {
RouteNextHop *nh;
@@ -414,7 +414,7 @@ static bool route_nexthop_is_ready_to_configure(const RouteNextHop *nh, Manager
if (route_nexthop_get_link(manager, nh, &link) < 0)
return false;
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ true))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ true))
return false;
/* If the interface is not managed by us, we request that the interface has carrier.
src/network/networkd-route-util.c
+2 -2
View File
@@ -29,12 +29,12 @@ unsigned routes_max(void) {
/* The kernel internally stores these maximum size in int. */
if (sysctl_read_ip_property_int(AF_INET, /* ifname = */ NULL, "route/max_size", &val4) >= 0)
if (sysctl_read_ip_property_int(AF_INET, /* ifname= */ NULL, "route/max_size", &val4) >= 0)
if (val4 == INT_MAX)
/* This is the default "no limit" value in the kernel */
val4 = ROUTES_DEFAULT_MAX_PER_FAMILY;
if (sysctl_read_ip_property_int(AF_INET6, /* ifname = */ NULL, "route/max_size", &val6) >= 0)
if (sysctl_read_ip_property_int(AF_INET6, /* ifname= */ NULL, "route/max_size", &val6) >= 0)
if (val6 == INT_MAX)
/* This is the default "no limit" value in the kernel */
val6 = ROUTES_DEFAULT_MAX_PER_FAMILY;
src/network/networkd-route.c
+2 -2
View File
@@ -444,7 +444,7 @@ static int route_to_string(const Route *route, Manager *manager, char **ret) {
if (in_addr_is_set(route->family, &route->prefsrc))
(void) in_addr_to_string(route->family, &route->prefsrc, &prefsrc);
(void) route_scope_to_string_alloc(route->scope, &scope);
(void) manager_get_route_table_to_string(manager, route->table, /* append_num = */ true, &table);
(void) manager_get_route_table_to_string(manager, route->table, /* append_num= */ true, &table);
(void) route_protocol_full_to_string_alloc(route->protocol, &proto);
(void) route_flags_to_string_alloc(route->flags, &flags);
@@ -906,7 +906,7 @@ static int route_is_ready_to_configure(const Route *route, Link *link) {
assert(route);
assert(link);
if (!link_is_ready_to_configure(link, /* allow_unmanaged = */ false))
if (!link_is_ready_to_configure(link, /* allow_unmanaged= */ false))
return false;
if (in_addr_is_set(route->family, &route->prefsrc) > 0) {
src/network/networkd-routing-policy-rule.c
+6 -6
View File
@@ -331,7 +331,7 @@ static int routing_policy_rule_compare_func_full(const RoutingPolicyRule *a, con
}
static int routing_policy_rule_compare_func(const RoutingPolicyRule *a, const RoutingPolicyRule *b) {
return routing_policy_rule_compare_func_full(a, b, /* all = */ true);
return routing_policy_rule_compare_func_full(a, b, /* all= */ true);
}
static bool routing_policy_rule_equal(const RoutingPolicyRule *a, const RoutingPolicyRule *b, int family, uint32_t priority) {
@@ -348,7 +348,7 @@ static bool routing_policy_rule_equal(const RoutingPolicyRule *a, const RoutingP
if (b->priority_set && b->priority != priority)
return false;
return routing_policy_rule_compare_func_full(a, b, /* all = */ false) == 0;
return routing_policy_rule_compare_func_full(a, b, /* all= */ false) == 0;
}
static bool routing_policy_rule_can_update(const RoutingPolicyRule *existing, const RoutingPolicyRule *requesting) {
@@ -538,7 +538,7 @@ static void log_routing_policy_rule_debug(const RoutingPolicyRule *rule, const c
return;
(void) network_config_state_to_string_alloc(rule->state, &state);
(void) manager_get_route_table_to_string(m, rule->table, /* append_num = */ true, &table);
(void) manager_get_route_table_to_string(m, rule->table, /* append_num= */ true, &table);
log_link_debug(link,
"%s %s routing policy rule (%s): priority: %"PRIu32", %s -> %s, iif: %s, oif: %s, table: %s",
@@ -878,10 +878,10 @@ static int routing_policy_rule_is_ready_to_configure(const RoutingPolicyRule *ru
* shows [detached] for such rules, that may confuse users. Let's postpone to configure if one of
* IIF/OIF does not exist. */
if (rule->iif && !link_is_ready_to_configure_by_name(link->manager, rule->iif, /* allow_unmanaged = */ true))
if (rule->iif && !link_is_ready_to_configure_by_name(link->manager, rule->iif, /* allow_unmanaged= */ true))
return false;
if (rule->oif && !link_is_ready_to_configure_by_name(link->manager, rule->oif, /* allow_unmanaged = */ true))
if (rule->oif && !link_is_ready_to_configure_by_name(link->manager, rule->oif, /* allow_unmanaged= */ true))
return false;
return true;
@@ -1464,7 +1464,7 @@ static int config_parse_routing_policy_rule_port_range(
assert(rvalue);
r = parse_ip_port_range(rvalue, &p->start, &p->end, /* allow_zero = */ false);
r = parse_ip_port_range(rvalue, &p->start, &p->end, /* allow_zero= */ false);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse routing policy rule port range '%s'", rvalue);
return 0;
src/network/networkd-serialize.c
+6 -6
View File
@@ -41,7 +41,7 @@ int manager_serialize(Manager *manager) {
if (r < 0)
return r;
r = addresses_append_json(link, /* serializing = */ true, &e);
r = addresses_append_json(link, /* serializing= */ true, &e);
if (r < 0)
return r;
@@ -54,11 +54,11 @@ int manager_serialize(Manager *manager) {
if (r < 0)
return r;
r = nexthops_append_json(manager, /* ifindex = */ -1, &v);
r = nexthops_append_json(manager, /* ifindex= */ -1, &v);
if (r < 0)
return r;
r = routes_append_json(manager, /* ifindex = */ -1, &v);
r = routes_append_json(manager, /* ifindex= */ -1, &v);
if (r < 0)
return r;
@@ -69,7 +69,7 @@ int manager_serialize(Manager *manager) {
}
_cleanup_free_ char *dump = NULL;
r = sd_json_variant_format(v, /* flags = */ 0, &dump);
r = sd_json_variant_format(v, /* flags= */ 0, &dump);
if (r < 0)
return r;
@@ -450,8 +450,8 @@ int manager_deserialize(Manager *manager) {
unsigned err_line = 0, err_column = 0;
r = sd_json_parse_file(
f,
/* path = */ NULL,
/* flags = */ 0,
/* path= */ NULL,
/* flags= */ 0,
&v,
&err_line,
&err_column);
src/network/networkd-setlink.c
+22 -22
View File
@@ -88,7 +88,7 @@ static int set_link_handler_internal(
static int link_set_addrgen_mode_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
int r;
r = set_link_handler_internal(rtnl, m, req, link, /* ignore = */ true, NULL);
r = set_link_handler_internal(rtnl, m, req, link, /* ignore= */ true, NULL);
if (r <= 0)
return r;
@@ -102,11 +102,11 @@ static int link_set_addrgen_mode_handler(sd_netlink *rtnl, sd_netlink_message *m
}
static int link_set_bond_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ false, NULL);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ false, NULL);
}
static int link_set_bridge_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ true, NULL);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ true, NULL);
}
static int link_set_bridge_vlan_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
@@ -114,7 +114,7 @@ static int link_set_bridge_vlan_handler(sd_netlink *rtnl, sd_netlink_message *m,
assert(link);
r = set_link_handler_internal(rtnl, m, req, link, /* ignore = */ false, NULL);
r = set_link_handler_internal(rtnl, m, req, link, /* ignore= */ false, NULL);
if (r <= 0)
return r;
@@ -123,27 +123,27 @@ static int link_set_bridge_vlan_handler(sd_netlink *rtnl, sd_netlink_message *m,
}
static int link_del_bridge_vlan_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ false, NULL);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ false, NULL);
}
static int link_set_can_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ false, NULL);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ false, NULL);
}
static int link_set_flags_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ false, get_link_default_handler);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ false, get_link_default_handler);
}
static int link_set_group_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ false, NULL);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ false, NULL);
}
static int link_set_ipoib_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ true, NULL);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ true, NULL);
}
static int link_set_mac_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ true, get_link_default_handler);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ true, get_link_default_handler);
}
static int link_set_mac_allow_retry_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
@@ -160,7 +160,7 @@ static int link_set_mac_allow_retry_handler(sd_netlink *rtnl, sd_netlink_message
log_link_message_debug_errno(link, m, r, "Failed to set MAC address, retrying again");
r = link_request_to_set_mac(link, /* allow_retry = */ false);
r = link_request_to_set_mac(link, /* allow_retry= */ false);
if (r < 0)
link_enter_failed(link);
@@ -171,16 +171,16 @@ static int link_set_mac_allow_retry_handler(sd_netlink *rtnl, sd_netlink_message
}
static int link_set_master_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ false, get_link_master_handler);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ false, get_link_master_handler);
}
static int link_unset_master_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
/* Some devices do not support setting master ifindex. Let's ignore error on unsetting master ifindex. */
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ true, get_link_master_handler);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ true, get_link_master_handler);
}
static int link_set_mtu_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req, Link *link, void *userdata) {
return set_link_handler_internal(rtnl, m, req, link, /* ignore = */ true, get_link_default_handler);
return set_link_handler_internal(rtnl, m, req, link, /* ignore= */ true, get_link_default_handler);
}
static int link_get_arp(Link *link) {
@@ -372,12 +372,12 @@ static int link_configure_fill_message(
return r;
break;
case REQUEST_TYPE_SET_LINK_BRIDGE_VLAN:
r = bridge_vlan_set_message(link, req, /* is_set = */ true);
r = bridge_vlan_set_message(link, req, /* is_set= */ true);
if (r < 0)
return r;
break;
case REQUEST_TYPE_DEL_LINK_BRIDGE_VLAN:
r = bridge_vlan_set_message(link, req, /* is_set = */ false);
r = bridge_vlan_set_message(link, req, /* is_set= */ false);
if (r < 0)
return r;
break;
@@ -908,7 +908,7 @@ int link_request_to_set_mac(Link *link, bool allow_retry) {
return 0;
link->requested_hw_addr = link->network->hw_addr;
r = net_verify_hardware_address(link->ifname, /* is_static = */ true,
r = net_verify_hardware_address(link->ifname, /* is_static= */ true,
link->iftype, &link->hw_addr, &link->requested_hw_addr);
if (r < 0)
return r;
@@ -1049,12 +1049,12 @@ static int link_up_dsa_slave(Link *link) {
if (master->state == LINK_STATE_UNMANAGED) {
/* If the DSA master interface is unmanaged, then it will never become up.
* Let's request to bring up the master. */
r = link_request_to_bring_up_or_down(master, /* up = */ true);
r = link_request_to_bring_up_or_down(master, /* up= */ true);
if (r < 0)
return r;
}
r = link_request_to_bring_up_or_down(link, /* up = */ true);
r = link_request_to_bring_up_or_down(link, /* up= */ true);
if (r < 0)
return r;
@@ -1140,7 +1140,7 @@ static bool link_is_ready_to_activate_one(Link *link, bool allow_unmanaged) {
static bool link_is_ready_to_activate(Link *link, bool up) {
assert(link);
if (!check_ready_for_all_sr_iov_ports(link, /* allow_unmanaged = */ false,
if (!check_ready_for_all_sr_iov_ports(link, /* allow_unmanaged= */ false,
link_is_ready_to_activate_one))
return false;
@@ -1305,11 +1305,11 @@ static int link_up_or_down_now_handler(sd_netlink *rtnl, sd_netlink_message *m,
}
static int link_up_now_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
return link_up_or_down_now_handler(rtnl, m, link, /* up = */ true);
return link_up_or_down_now_handler(rtnl, m, link, /* up= */ true);
}
static int link_down_now_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
return link_up_or_down_now_handler(rtnl, m, link, /* up = */ false);
return link_up_or_down_now_handler(rtnl, m, link, /* up= */ false);
}
int link_up_or_down_now(Link *link, bool up) {
src/network/networkd-sriov.c
+2 -2
View File
@@ -345,7 +345,7 @@ bool check_ready_for_all_sr_iov_ports(
/* If this is a VF port, then also check the PF port. */
if (link->sr_iov_phys_port_ifindex > 0) {
if (link_get_by_index(link->manager, link->sr_iov_phys_port_ifindex, &phys_link) < 0 ||
!check_one(phys_link, /* allow_unmanaged = */ true))
!check_one(phys_link, /* allow_unmanaged= */ true))
return false;
} else
phys_link = link;
@@ -361,7 +361,7 @@ bool check_ready_for_all_sr_iov_ports(
if (link_get_by_index(link->manager, ifindex, &virt_link) < 0)
return false;
if (!check_one(virt_link, /* allow_unmanaged = */ true))
if (!check_one(virt_link, /* allow_unmanaged= */ true))
return false;
}
src/network/networkd-state-file.c
+2 -2
View File
@@ -398,11 +398,11 @@ int manager_save(Manager *m) {
if (r < 0)
return r;
r = link_put_domains(link, /* is_route = */ false, &search_domains);
r = link_put_domains(link, /* is_route= */ false, &search_domains);
if (r < 0)
return r;
r = link_put_domains(link, /* is_route = */ true, &route_domains);
r = link_put_domains(link, /* is_route= */ true, &route_domains);
if (r < 0)
return r;
}
src/network/networkd-sysctl.c
+2 -2
View File
@@ -531,7 +531,7 @@ int link_set_ipv6_mtu(Link *link, int log_level) {
if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED))
return 0;
if (sd_event_source_get_enabled(link->ipv6_mtu_wait_synced_event_source, /* ret = */ NULL) > 0) {
if (sd_event_source_get_enabled(link->ipv6_mtu_wait_synced_event_source, /* ret= */ NULL) > 0) {
log_link_debug(link, "Waiting for IPv6 MTU is synced to link MTU, delaying to set IPv6 MTU.");
return 0;
}
@@ -598,7 +598,7 @@ static int link_set_ipv6_mtu_async_impl(Link *link) {
link->manager->event, &link->ipv6_mtu_wait_synced_event_source,
CLOCK_BOOTTIME, 100 * USEC_PER_MSEC, 0,
ipv6_mtu_wait_synced_handler, link,
/* priority = */ 0, "ipv6-mtu-wait-synced", /* force_reset = */ true);
/* priority= */ 0, "ipv6-mtu-wait-synced", /* force_reset= */ true);
if (r < 0)
return log_link_warning_errno(link, r, "Failed to configure timer event source for waiting for IPv6 MTU being synced: %m");
src/network/networkd-wifi.c
+2 -2
View File
@@ -290,7 +290,7 @@ int manager_genl_process_nl80211_mlme(sd_netlink *genl, sd_netlink_message *mess
* To make SSID= or other WiFi related settings in [Match] section work, let's try to
* reconfigure the interface. */
if (link->ssid && link_has_carrier(link)) {
r = link_reconfigure_impl(link, /* flags = */ 0);
r = link_reconfigure_impl(link, /* flags= */ 0);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to reconfigure interface: %m");
link_enter_failed(link);
@@ -329,7 +329,7 @@ int manager_genl_process_nl80211_mlme(sd_netlink *genl, sd_netlink_message *mess
}
/* If necessary, reconfigure based on those new properties */
r = link_reconfigure_impl(link, /* flags = */ 0);
r = link_reconfigure_impl(link, /* flags= */ 0);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to reconfigure interface: %m");
link_enter_failed(link);
src/network/networkd.c
+1 -1
View File
@@ -79,7 +79,7 @@ static int run(int argc, char *argv[]) {
log_warning_errno(r, "Could not create directory '%s': %m", p);
}
r = manager_new(&m, /* test_mode = */ false);
r = manager_new(&m, /* test_mode= */ false);
if (r < 0)
return log_error_errno(r, "Could not create manager: %m");
src/network/tc/teql.c
+1 -1
View File
@@ -32,7 +32,7 @@ static int trivial_link_equalizer_is_ready(QDisc *qdisc, Link *link) {
if (link_get_by_name(link->manager, qdisc->tca_kind, &teql) < 0)
return false;
return link_is_ready_to_configure(teql, /* allow_unmanaged = */ true);
return link_is_ready_to_configure(teql, /* allow_unmanaged= */ true);
}
const QDiscVTable teql_vtable = {
src/network/test-network.c
+4 -4
View File
@@ -96,12 +96,12 @@ static void test_route_tables_one(Manager *manager, const char *name, uint32_t n
}
ASSERT_OK(asprintf(&expected, "%s(%" PRIu32 ")", name, number));
ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num = */ true, &str));
ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num= */ true, &str));
ASSERT_STREQ(str, expected);
str = mfree(str);
ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num = */ false, &str));
ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num= */ false, &str));
ASSERT_STREQ(str, name);
ASSERT_OK(manager_get_route_table_from_string(manager, name, &t));
@@ -115,7 +115,7 @@ static void test_route_tables_one(Manager *manager, const char *name, uint32_t n
TEST(route_tables) {
_cleanup_(manager_freep) Manager *manager = NULL;
ASSERT_OK(manager_new(&manager, /* test_mode = */ true));
ASSERT_OK(manager_new(&manager, /* test_mode= */ true));
ASSERT_OK(manager_setup(manager));
ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "hoge:123 foo:456 aaa:111", manager, manager));
@@ -153,7 +153,7 @@ TEST(route_tables) {
TEST(manager_enumerate) {
_cleanup_(manager_freep) Manager *manager = NULL;
ASSERT_OK(manager_new(&manager, /* test_mode = */ true));
ASSERT_OK(manager_new(&manager, /* test_mode= */ true));
ASSERT_OK(manager_setup(manager));
/* TODO: should_reload, is false if the config dirs do not exist, so we can't do this test here, move
src/network/test-networkd-conf.c
+1 -1
View File
@@ -186,7 +186,7 @@ static void test_config_parse_address_one(const char *rvalue, int family, unsign
_cleanup_(manager_freep) Manager *manager = NULL;
_cleanup_(network_unrefp) Network *network = NULL;
assert_se(manager_new(&manager, /* test_mode = */ true) >= 0);
assert_se(manager_new(&manager, /* test_mode= */ true) >= 0);
assert_se(network = new0(Network, 1));
network->n_ref = 1;
network->manager = manager;
src/network/wait-online/wait-online-manager.c
+1 -1
View File
@@ -212,7 +212,7 @@ bool manager_configured(Manager *m) {
continue;
}
range = get_state_range(m, l, /* from_cmdline = */ NULL);
range = get_state_range(m, l, /* from_cmdline= */ NULL);
r = manager_link_is_online(m, l, range);
/* Unlike the above loop, unmanaged interfaces are ignored here. Also, Configured but offline