diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c index e83665bfda8..66b192256e9 100644 --- a/src/network/networkd-address-label.c +++ b/src/network/networkd-address-label.c @@ -151,7 +151,7 @@ int link_set_address_labels(Link *link) { return 0; } -void network_verify_address_labels(Network *network) { +void network_drop_invalid_address_labels(Network *network) { AddressLabel *label; assert(network); diff --git a/src/network/networkd-address-label.h b/src/network/networkd-address-label.h index aacab867e7a..b92828c72e2 100644 --- a/src/network/networkd-address-label.h +++ b/src/network/networkd-address-label.h @@ -21,7 +21,7 @@ typedef struct AddressLabel { AddressLabel *address_label_free(AddressLabel *label); -void network_verify_address_labels(Network *network); +void network_drop_invalid_address_labels(Network *network); int link_set_address_labels(Link *link); diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 6e58ac9782c..7407eeec9bc 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -1874,7 +1874,7 @@ static int address_section_verify(Address *address) { return 0; } -void network_verify_addresses(Network *network) { +void network_drop_invalid_addresses(Network *network) { Address *address; assert(network); diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h index 88dbefc1269..431e507851c 100644 --- a/src/network/networkd-address.h +++ b/src/network/networkd-address.h @@ -70,7 +70,7 @@ int ipv4_dad_update_mac(Link *link); int manager_rtnl_process_address(sd_netlink *nl, sd_netlink_message *message, Manager *m); -void network_verify_addresses(Network *network); +void network_drop_invalid_addresses(Network *network); void address_hash_func(const Address *a, struct siphash *state); int address_compare_func(const Address *a1, const Address *a2); diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index 47db9291872..2e35f7d1bf5 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -185,7 +185,7 @@ int link_set_bridge_fdb(Link *link) { return 0; } -void network_verify_fdb_entries(Network *network) { +void network_drop_invalid_fdb_entries(Network *network) { FdbEntry *fdb_entry; assert(network); diff --git a/src/network/networkd-fdb.h b/src/network/networkd-fdb.h index 4aeb8be9ce7..935406e022b 100644 --- a/src/network/networkd-fdb.h +++ b/src/network/networkd-fdb.h @@ -41,7 +41,7 @@ typedef struct FdbEntry { FdbEntry *fdb_entry_free(FdbEntry *fdb_entry); -void network_verify_fdb_entries(Network *network); +void network_drop_invalid_fdb_entries(Network *network); int link_set_bridge_fdb(Link *link); diff --git a/src/network/networkd-mdb.c b/src/network/networkd-mdb.c index 169cc6eb008..bca3e620dd4 100644 --- a/src/network/networkd-mdb.c +++ b/src/network/networkd-mdb.c @@ -278,7 +278,7 @@ static int mdb_entry_verify(MdbEntry *mdb_entry) { return 0; } -void network_verify_mdb_entries(Network *network) { +void network_drop_invalid_mdb_entries(Network *network) { MdbEntry *mdb_entry; assert(network); diff --git a/src/network/networkd-mdb.h b/src/network/networkd-mdb.h index e0d9052497d..563a9e6d994 100644 --- a/src/network/networkd-mdb.h +++ b/src/network/networkd-mdb.h @@ -21,7 +21,7 @@ typedef struct MdbEntry { MdbEntry *mdb_entry_free(MdbEntry *mdb_entry); -void network_verify_mdb_entries(Network *network); +void network_drop_invalid_mdb_entries(Network *network); int link_set_bridge_mdb(Link *link); diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c index c14c8f7e06f..b553f1707ec 100644 --- a/src/network/networkd-neighbor.c +++ b/src/network/networkd-neighbor.c @@ -591,7 +591,7 @@ static int neighbor_section_verify(Neighbor *neighbor) { return 0; } -void network_verify_neighbors(Network *network) { +void network_drop_invalid_neighbors(Network *network) { Neighbor *neighbor; assert(network); diff --git a/src/network/networkd-neighbor.h b/src/network/networkd-neighbor.h index f40fdccc481..bb403ef2da2 100644 --- a/src/network/networkd-neighbor.h +++ b/src/network/networkd-neighbor.h @@ -32,7 +32,7 @@ typedef struct Neighbor { Neighbor *neighbor_free(Neighbor *neighbor); -void network_verify_neighbors(Network *network); +void network_drop_invalid_neighbors(Network *network); int link_set_neighbors(Link *link); int link_drop_neighbors(Link *link); diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index ec4dc227576..1ef3a6a6d80 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -287,18 +287,18 @@ int network_verify(Network *network) { network->ipv6_proxy_ndp_addresses = set_free_free(network->ipv6_proxy_ndp_addresses); } - network_verify_addresses(network); - network_verify_routes(network); - network_verify_nexthops(network); - network_verify_fdb_entries(network); - network_verify_mdb_entries(network); - network_verify_neighbors(network); - network_verify_address_labels(network); - network_verify_prefixes(network); - network_verify_route_prefixes(network); - network_verify_routing_policy_rules(network); - network_verify_traffic_control(network); - network_verify_sr_iov(network); + network_drop_invalid_addresses(network); + network_drop_invalid_routes(network); + network_drop_invalid_nexthops(network); + network_drop_invalid_fdb_entries(network); + network_drop_invalid_mdb_entries(network); + network_drop_invalid_neighbors(network); + network_drop_invalid_address_labels(network); + network_drop_invalid_prefixes(network); + network_drop_invalid_route_prefixes(network); + network_drop_invalid_routing_policy_rules(network); + network_drop_invalid_traffic_control(network); + network_drop_invalid_sr_iov(network); return 0; } diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index 1f03cbfe07d..6edeaabf88a 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -449,7 +449,7 @@ static int nexthop_section_verify(NextHop *nh) { return 0; } -void network_verify_nexthops(Network *network) { +void network_drop_invalid_nexthops(Network *network) { NextHop *nh; assert(network); diff --git a/src/network/networkd-nexthop.h b/src/network/networkd-nexthop.h index f286f0e61e4..3cdb068efd7 100644 --- a/src/network/networkd-nexthop.h +++ b/src/network/networkd-nexthop.h @@ -31,7 +31,7 @@ typedef struct NextHop { NextHop *nexthop_free(NextHop *nexthop); -void network_verify_nexthops(Network *network); +void network_drop_invalid_nexthops(Network *network); int link_set_nexthop(Link *link); diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index bf906d517b6..1167f2865f6 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -160,7 +160,7 @@ static int route_prefix_new_static(Network *network, const char *filename, unsig return 0; } -void network_verify_prefixes(Network *network) { +void network_drop_invalid_prefixes(Network *network) { Prefix *prefix; assert(network); @@ -170,7 +170,7 @@ void network_verify_prefixes(Network *network) { prefix_free(prefix); } -void network_verify_route_prefixes(Network *network) { +void network_drop_invalid_route_prefixes(Network *network) { RoutePrefix *prefix; assert(network); diff --git a/src/network/networkd-radv.h b/src/network/networkd-radv.h index 52ea2f2a372..fbb93a9accc 100644 --- a/src/network/networkd-radv.h +++ b/src/network/networkd-radv.h @@ -45,8 +45,8 @@ typedef struct RoutePrefix { Prefix *prefix_free(Prefix *prefix); RoutePrefix *route_prefix_free(RoutePrefix *prefix); -void network_verify_prefixes(Network *network); -void network_verify_route_prefixes(Network *network); +void network_drop_invalid_prefixes(Network *network); +void network_drop_invalid_route_prefixes(Network *network); int radv_emit_dns(Link *link); int radv_configure(Link *link); diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index c8ae8d5bce4..659fecbf2e5 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -2212,7 +2212,7 @@ static int route_section_verify(Route *route, Network *network) { return 0; } -void network_verify_routes(Network *network) { +void network_drop_invalid_routes(Network *network) { Route *route; assert(network); diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h index ada1059aadd..3347c7c57b4 100644 --- a/src/network/networkd-route.h +++ b/src/network/networkd-route.h @@ -89,7 +89,7 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, Ma int network_add_ipv4ll_route(Network *network); int network_add_default_route_on_device(Network *network); -void network_verify_routes(Network *network); +void network_drop_invalid_routes(Network *network); CONFIG_PARSER_PROTOTYPE(config_parse_gateway); CONFIG_PARSER_PROTOTYPE(config_parse_preferred_src); diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c index 588c36f306c..de60bd9555c 100644 --- a/src/network/networkd-routing-policy-rule.c +++ b/src/network/networkd-routing-policy-rule.c @@ -1473,7 +1473,7 @@ static int routing_policy_rule_section_verify(RoutingPolicyRule *rule) { return 0; } -void network_verify_routing_policy_rules(Network *network) { +void network_drop_invalid_routing_policy_rules(Network *network) { RoutingPolicyRule *rule; assert(network); diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h index ac5cbbed0e9..bc1193a1111 100644 --- a/src/network/networkd-routing-policy-rule.h +++ b/src/network/networkd-routing-policy-rule.h @@ -50,7 +50,7 @@ typedef struct RoutingPolicyRule { RoutingPolicyRule *routing_policy_rule_free(RoutingPolicyRule *rule); -void network_verify_routing_policy_rules(Network *network); +void network_drop_invalid_routing_policy_rules(Network *network); int link_set_routing_policy_rules(Link *link); diff --git a/src/network/networkd-sriov.c b/src/network/networkd-sriov.c index d2a389d95d2..61382a89937 100644 --- a/src/network/networkd-sriov.c +++ b/src/network/networkd-sriov.c @@ -262,7 +262,7 @@ static int sr_iov_section_verify(SRIOV *sr_iov) { return 0; } -void network_verify_sr_iov(Network *network) { +void network_drop_invalid_sr_iov(Network *network) { SRIOV *sr_iov; assert(network); diff --git a/src/network/networkd-sriov.h b/src/network/networkd-sriov.h index acd9f9b7535..8a48545d64b 100644 --- a/src/network/networkd-sriov.h +++ b/src/network/networkd-sriov.h @@ -35,7 +35,7 @@ typedef struct SRIOV { SRIOV *sr_iov_free(SRIOV *sr_iov); int link_configure_sr_iov(Link *link); -void network_verify_sr_iov(Network *network); +void network_drop_invalid_sr_iov(Network *network); DEFINE_NETWORK_SECTION_FUNCTIONS(SRIOV, sr_iov_free); diff --git a/src/network/tc/tc.c b/src/network/tc/tc.c index 2bb9c8f07f0..974bb8c8220 100644 --- a/src/network/tc/tc.c +++ b/src/network/tc/tc.c @@ -69,7 +69,7 @@ static int traffic_control_section_verify(TrafficControl *tc, bool *qdisc_has_ro } } -void network_verify_traffic_control(Network *network) { +void network_drop_invalid_traffic_control(Network *network) { bool has_root = false, has_clsact = false; TrafficControl *tc; diff --git a/src/network/tc/tc.h b/src/network/tc/tc.h index 7e277f63232..916ad3300aa 100644 --- a/src/network/tc/tc.h +++ b/src/network/tc/tc.h @@ -29,4 +29,4 @@ typedef struct TrafficControl { void traffic_control_free(TrafficControl *tc); int link_configure_traffic_control(Link *link); -void network_verify_traffic_control(Network *network); +void network_drop_invalid_traffic_control(Network *network);