From: Yu Watanabe Date: Fri, 5 Jan 2024 19:44:40 +0000 (+0900) Subject: network/route: rename n -> route in conf parsers X-Git-Tag: v256-rc1~1247^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f48e52bda8eff38d5ae91168c1e02fbd4b53bd41;p=thirdparty%2Fsystemd.git network/route: rename n -> route in conf parsers --- diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 0d2765ccf87..7c8461abb73 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1930,7 +1930,7 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, Ma } int network_add_ipv4ll_route(Network *network) { - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; unsigned section_line; int r; @@ -1944,28 +1944,28 @@ int network_add_ipv4ll_route(Network *network) { return r; /* IPv4LLRoute= is in [Network] section. */ - r = route_new_static(network, network->filename, section_line, &n); + r = route_new_static(network, network->filename, section_line, &route); if (r < 0) return r; - r = in_addr_from_string(AF_INET, "169.254.0.0", &n->dst); + r = in_addr_from_string(AF_INET, "169.254.0.0", &route->dst); if (r < 0) return r; - n->family = AF_INET; - n->dst_prefixlen = 16; - n->scope = RT_SCOPE_LINK; - n->scope_set = true; - n->table_set = true; - n->priority = IPV4LL_ROUTE_METRIC; - n->protocol = RTPROT_STATIC; + route->family = AF_INET; + route->dst_prefixlen = 16; + route->scope = RT_SCOPE_LINK; + route->scope_set = true; + route->table_set = true; + route->priority = IPV4LL_ROUTE_METRIC; + route->protocol = RTPROT_STATIC; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } int network_add_default_route_on_device(Network *network) { - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; unsigned section_line; int r; @@ -1979,16 +1979,16 @@ int network_add_default_route_on_device(Network *network) { return r; /* DefaultRouteOnDevice= is in [Network] section. */ - r = route_new_static(network, network->filename, section_line, &n); + r = route_new_static(network, network->filename, section_line, &route); if (r < 0) return r; - n->family = AF_INET; - n->scope = RT_SCOPE_LINK; - n->scope_set = true; - n->protocol = RTPROT_STATIC; + route->family = AF_INET; + route->scope = RT_SCOPE_LINK; + route->scope_set = true; + route->protocol = RTPROT_STATIC; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2005,7 +2005,7 @@ int config_parse_gateway( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; assert(filename); @@ -2016,7 +2016,7 @@ int config_parse_gateway( if (streq(section, "Network")) { /* we are not in an Route section, so use line number instead */ - r = route_new_static(network, filename, line, &n); + r = route_new_static(network, filename, line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2025,7 +2025,7 @@ int config_parse_gateway( return 0; } } else { - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2035,43 +2035,43 @@ int config_parse_gateway( } if (isempty(rvalue)) { - n->gateway_from_dhcp_or_ra = false; - n->gw_family = AF_UNSPEC; - n->gw = IN_ADDR_NULL; - TAKE_PTR(n); + route->gateway_from_dhcp_or_ra = false; + route->gw_family = AF_UNSPEC; + route->gw = IN_ADDR_NULL; + TAKE_PTR(route); return 0; } if (streq(rvalue, "_dhcp")) { - n->gateway_from_dhcp_or_ra = true; - TAKE_PTR(n); + route->gateway_from_dhcp_or_ra = true; + TAKE_PTR(route); return 0; } if (streq(rvalue, "_dhcp4")) { - n->gw_family = AF_INET; - n->gateway_from_dhcp_or_ra = true; - TAKE_PTR(n); + route->gw_family = AF_INET; + route->gateway_from_dhcp_or_ra = true; + TAKE_PTR(route); return 0; } if (streq(rvalue, "_ipv6ra")) { - n->gw_family = AF_INET6; - n->gateway_from_dhcp_or_ra = true; - TAKE_PTR(n); + route->gw_family = AF_INET6; + route->gateway_from_dhcp_or_ra = true; + TAKE_PTR(route); return 0; } } - r = in_addr_from_string_auto(rvalue, &n->gw_family, &n->gw); + r = in_addr_from_string_auto(rvalue, &route->gw_family, &route->gw); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, "Invalid %s='%s', ignoring assignment: %m", lvalue, rvalue); return 0; } - n->gateway_from_dhcp_or_ra = false; - TAKE_PTR(n); + route->gateway_from_dhcp_or_ra = false; + TAKE_PTR(route); return 0; } @@ -2088,7 +2088,7 @@ int config_parse_preferred_src( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; assert(filename); @@ -2097,7 +2097,7 @@ int config_parse_preferred_src( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2106,17 +2106,17 @@ int config_parse_preferred_src( return 0; } - if (n->family == AF_UNSPEC) - r = in_addr_from_string_auto(rvalue, &n->family, &n->prefsrc); + if (route->family == AF_UNSPEC) + r = in_addr_from_string_auto(rvalue, &route->family, &route->prefsrc); else - r = in_addr_from_string(n->family, rvalue, &n->prefsrc); + r = in_addr_from_string(route->family, rvalue, &route->prefsrc); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, EINVAL, "Invalid %s='%s', ignoring assignment: %m", lvalue, rvalue); return 0; } - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2133,7 +2133,7 @@ int config_parse_destination( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; union in_addr_union *buffer; unsigned char *prefixlen; int r; @@ -2144,7 +2144,7 @@ int config_parse_destination( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2154,27 +2154,27 @@ int config_parse_destination( } if (streq(lvalue, "Destination")) { - buffer = &n->dst; - prefixlen = &n->dst_prefixlen; + buffer = &route->dst; + prefixlen = &route->dst_prefixlen; } else if (streq(lvalue, "Source")) { - buffer = &n->src; - prefixlen = &n->src_prefixlen; + buffer = &route->src; + prefixlen = &route->src_prefixlen; } else assert_not_reached(); - if (n->family == AF_UNSPEC) - r = in_addr_prefix_from_string_auto(rvalue, &n->family, buffer, prefixlen); + if (route->family == AF_UNSPEC) + r = in_addr_prefix_from_string_auto(rvalue, &route->family, buffer, prefixlen); else - r = in_addr_prefix_from_string(rvalue, n->family, buffer, prefixlen); + r = in_addr_prefix_from_string(rvalue, route->family, buffer, prefixlen); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, EINVAL, "Invalid %s='%s', ignoring assignment: %m", lvalue, rvalue); return 0; } - (void) in_addr_mask(n->family, buffer, *prefixlen); + (void) in_addr_mask(route->family, buffer, *prefixlen); - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2191,7 +2191,7 @@ int config_parse_route_priority( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; assert(filename); @@ -2200,7 +2200,7 @@ int config_parse_route_priority( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2209,15 +2209,15 @@ int config_parse_route_priority( return 0; } - r = safe_atou32(rvalue, &n->priority); + r = safe_atou32(rvalue, &route->priority); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, "Could not parse route priority \"%s\", ignoring assignment: %m", rvalue); return 0; } - n->priority_set = true; - TAKE_PTR(n); + route->priority_set = true; + TAKE_PTR(route); return 0; } @@ -2234,7 +2234,7 @@ int config_parse_route_scope( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; assert(filename); @@ -2243,7 +2243,7 @@ int config_parse_route_scope( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2258,9 +2258,9 @@ int config_parse_route_scope( return 0; } - n->scope = r; - n->scope_set = true; - TAKE_PTR(n); + route->scope = r; + route->scope_set = true; + TAKE_PTR(route); return 0; } @@ -2277,7 +2277,7 @@ int config_parse_route_nexthop( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; uint32_t id; int r; @@ -2287,7 +2287,7 @@ int config_parse_route_nexthop( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2297,8 +2297,8 @@ int config_parse_route_nexthop( } if (isempty(rvalue)) { - n->nexthop_id = 0; - TAKE_PTR(n); + route->nexthop_id = 0; + TAKE_PTR(route); return 0; } @@ -2312,8 +2312,8 @@ int config_parse_route_nexthop( return 0; } - n->nexthop_id = id; - TAKE_PTR(n); + route->nexthop_id = id; + TAKE_PTR(route); return 0; } @@ -2329,7 +2329,7 @@ int config_parse_route_table( void *data, void *userdata) { - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; Network *network = userdata; int r; @@ -2339,7 +2339,7 @@ int config_parse_route_table( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2348,15 +2348,15 @@ int config_parse_route_table( return 0; } - r = manager_get_route_table_from_string(network->manager, rvalue, &n->table); + r = manager_get_route_table_from_string(network->manager, rvalue, &route->table); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, "Could not parse route table \"%s\", ignoring assignment: %m", rvalue); return 0; } - n->table_set = true; - TAKE_PTR(n); + route->table_set = true; + TAKE_PTR(route); return 0; } @@ -2373,7 +2373,7 @@ int config_parse_route_boolean( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; assert(filename); @@ -2382,7 +2382,7 @@ int config_parse_route_boolean( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2399,15 +2399,15 @@ int config_parse_route_boolean( } if (STR_IN_SET(lvalue, "GatewayOnLink", "GatewayOnlink")) - n->gateway_onlink = r; + route->gateway_onlink = r; else if (streq(lvalue, "QuickAck")) - n->quickack = r; + route->quickack = r; else if (streq(lvalue, "FastOpenNoCookie")) - n->fast_open_no_cookie = r; + route->fast_open_no_cookie = r; else assert_not_reached(); - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2424,10 +2424,10 @@ int config_parse_ipv6_route_preference( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2437,18 +2437,18 @@ int config_parse_ipv6_route_preference( } if (streq(rvalue, "low")) - n->pref = ICMPV6_ROUTER_PREF_LOW; + route->pref = ICMPV6_ROUTER_PREF_LOW; else if (streq(rvalue, "medium")) - n->pref = ICMPV6_ROUTER_PREF_MEDIUM; + route->pref = ICMPV6_ROUTER_PREF_MEDIUM; else if (streq(rvalue, "high")) - n->pref = ICMPV6_ROUTER_PREF_HIGH; + route->pref = ICMPV6_ROUTER_PREF_HIGH; else { log_syntax(unit, LOG_WARNING, filename, line, 0, "Unknown route preference: %s", rvalue); return 0; } - n->pref_set = true; - TAKE_PTR(n); + route->pref_set = true; + TAKE_PTR(route); return 0; } @@ -2465,10 +2465,10 @@ int config_parse_route_protocol( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2484,9 +2484,9 @@ int config_parse_route_protocol( return 0; } - n->protocol = r; + route->protocol = r; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2503,10 +2503,10 @@ int config_parse_route_type( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int t, r; - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2522,9 +2522,9 @@ int config_parse_route_type( return 0; } - n->type = (unsigned char) t; + route->type = (unsigned char) t; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2540,7 +2540,7 @@ int config_parse_route_hop_limit( void *data, void *userdata) { - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; Network *network = userdata; uint32_t k; int r; @@ -2551,7 +2551,7 @@ int config_parse_route_hop_limit( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2561,8 +2561,8 @@ int config_parse_route_hop_limit( } if (isempty(rvalue)) { - n->hop_limit = 0; - TAKE_PTR(n); + route->hop_limit = 0; + TAKE_PTR(route); return 0; } @@ -2583,9 +2583,9 @@ int config_parse_route_hop_limit( return 0; } - n->hop_limit = k; + route->hop_limit = k; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2602,7 +2602,7 @@ int config_parse_tcp_congestion( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; assert(filename); @@ -2611,7 +2611,7 @@ int config_parse_tcp_congestion( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2621,11 +2621,11 @@ int config_parse_tcp_congestion( } r = config_parse_string(unit, filename, line, section, section_line, lvalue, ltype, - rvalue, &n->tcp_congestion_control_algo, userdata); + rvalue, &route->tcp_congestion_control_algo, userdata); if (r < 0) return r; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2641,7 +2641,7 @@ int config_parse_tcp_advmss( void *data, void *userdata) { - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; Network *network = userdata; uint64_t u; int r; @@ -2652,7 +2652,7 @@ int config_parse_tcp_advmss( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2662,8 +2662,8 @@ int config_parse_tcp_advmss( } if (isempty(rvalue)) { - n->advmss = 0; - TAKE_PTR(n); + route->advmss = 0; + TAKE_PTR(route); return 0; } @@ -2680,9 +2680,9 @@ int config_parse_tcp_advmss( return 0; } - n->advmss = u; + route->advmss = u; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2741,7 +2741,7 @@ int config_parse_route_tcp_window( void *data, void *userdata) { - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; Network *network = userdata; uint32_t *d; int r; @@ -2752,7 +2752,7 @@ int config_parse_route_tcp_window( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2762,9 +2762,9 @@ int config_parse_route_tcp_window( } if (streq(lvalue, "InitialCongestionWindow")) - d = &n->initcwnd; + d = &route->initcwnd; else if (streq(lvalue, "InitialAdvertisedReceiveWindow")) - d = &n->initrwnd; + d = &route->initrwnd; else assert_not_reached(); @@ -2772,7 +2772,7 @@ int config_parse_route_tcp_window( if (r < 0) return r; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2789,7 +2789,7 @@ int config_parse_route_mtu( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; int r; assert(filename); @@ -2798,7 +2798,7 @@ int config_parse_route_mtu( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2807,11 +2807,11 @@ int config_parse_route_mtu( return 0; } - r = config_parse_mtu(unit, filename, line, section, section_line, lvalue, ltype, rvalue, &n->mtu, userdata); + r = config_parse_mtu(unit, filename, line, section, section_line, lvalue, ltype, rvalue, &route->mtu, userdata); if (r <= 0) return r; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2828,7 +2828,7 @@ int config_parse_route_tcp_rto( void *userdata) { Network *network = userdata; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; usec_t usec; int r; @@ -2838,7 +2838,7 @@ int config_parse_route_tcp_rto( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2861,9 +2861,9 @@ int config_parse_route_tcp_rto( return 0; } - n->tcp_rto_usec = usec; + route->tcp_rto_usec = usec; - TAKE_PTR(n); + TAKE_PTR(route); return 0; } @@ -2880,7 +2880,7 @@ int config_parse_multipath_route( void *userdata) { _cleanup_(multipath_route_freep) MultipathRoute *m = NULL; - _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + _cleanup_(route_free_or_set_invalidp) Route *route = NULL; _cleanup_free_ char *word = NULL; Network *network = userdata; union in_addr_union a; @@ -2894,7 +2894,7 @@ int config_parse_multipath_route( assert(rvalue); assert(data); - r = route_new_static(network, filename, section_line, &n); + r = route_new_static(network, filename, section_line, &route); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2904,8 +2904,8 @@ int config_parse_multipath_route( } if (isempty(rvalue)) { - n->multipath_routes = ordered_set_free_with_destructor(n->multipath_routes, multipath_route_free); - TAKE_PTR(n); + route->multipath_routes = ordered_set_free_with_destructor(route->multipath_routes, multipath_route_free); + TAKE_PTR(route); return 0; } @@ -2971,7 +2971,7 @@ int config_parse_multipath_route( m->weight--; } - r = ordered_set_ensure_put(&n->multipath_routes, NULL, m); + r = ordered_set_ensure_put(&route->multipath_routes, NULL, m); if (r == -ENOMEM) return log_oom(); if (r < 0) { @@ -2981,7 +2981,7 @@ int config_parse_multipath_route( } TAKE_PTR(m); - TAKE_PTR(n); + TAKE_PTR(route); return 0; }