shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-09 12:58:26 +03:00
Code

local-addresses: rename metric -> priority

Browse Source 
To make it consistent with the netlink attribute RTA_PRIORITY.
This commit is contained in:
Yu Watanabe 2024-01-19 19:24:45 +09:00
parent d8a3e44a5c
commit 37359b1c81
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/shared/local-addresses.c
View File

@ -25,7 +25,7 @@ static int address_compare(const struct local_address *a, const struct local_add
if (r != 0) if (r != 0)
return r; return r;
r = CMP(a->metric, b->metric); r = CMP(a->priority, b->priority);
if (r != 0) if (r != 0)
return r; return r;
@ -180,7 +180,7 @@ static int add_local_gateway(
size_t *n_list, size_t *n_list,
int af, int af,
int ifindex, int ifindex,
uint32_t metric, uint32_t priority,
const RouteVia *via) { const RouteVia *via) {
assert(list); assert(list);
@ -195,7 +195,7 @@ static int add_local_gateway(
(*list)[(*n_list)++] = (struct local_address) { (*list)[(*n_list)++] = (struct local_address) {
.ifindex = ifindex, .ifindex = ifindex,
.metric = metric, .priority = priority,
.family = via->family, .family = via->family,
.address = via->address, .address = via->address,
}; };
@ -249,7 +249,7 @@ int local_gateways(
union in_addr_union gateway; union in_addr_union gateway;
uint16_t type; uint16_t type;
unsigned char dst_len, src_len, table; unsigned char dst_len, src_len, table;
uint32_t ifi = 0, metric = 0; uint32_t ifi = 0, priority = 0;
size_t rta_len; size_t rta_len;
int family; int family;
RouteVia via; RouteVia via;
@ -283,7 +283,7 @@ int local_gateways(
if (table != RT_TABLE_MAIN) if (table != RT_TABLE_MAIN)
continue; continue;
r = sd_netlink_message_read_u32(m, RTA_PRIORITY, &metric); r = sd_netlink_message_read_u32(m, RTA_PRIORITY, &priority);
if (r < 0 && r != -ENODATA) if (r < 0 && r != -ENODATA)
return r; return r;
@ -308,7 +308,7 @@ int local_gateways(
if (r >= 0) { if (r >= 0) {
via.family = family; via.family = family;
via.address = gateway; via.address = gateway;
r = add_local_gateway(&list, &n_list, af, ifi, metric, &via); r = add_local_gateway(&list, &n_list, af, ifi, priority, &via);
if (r < 0) if (r < 0)
return r; return r;
@ -322,7 +322,7 @@ int local_gateways(
if (r < 0 && r != -ENODATA) if (r < 0 && r != -ENODATA)
return r; return r;
if (r >= 0) { if (r >= 0) {
r = add_local_gateway(&list, &n_list, af, ifi, metric, &via); r = add_local_gateway(&list, &n_list, af, ifi, priority, &via);
if (r < 0) if (r < 0)
return r; return r;
@ -344,7 +344,7 @@ int local_gateways(
if (ifindex > 0 && mr->ifindex != ifindex) if (ifindex > 0 && mr->ifindex != ifindex)
continue; continue;
r = add_local_gateway(&list, &n_list, af, ifi, metric, &mr->gateway); r = add_local_gateway(&list, &n_list, af, ifi, priority, &mr->gateway);
if (r < 0) if (r < 0)
return r; return r;
} }

5
src/shared/local-addresses.h
View File

@ -6,9 +6,10 @@
#include "in-addr-util.h" #include "in-addr-util.h"
struct local_address { struct local_address {
int family, ifindex; int ifindex;
unsigned char scope; unsigned char scope;
uint32_t metric; uint32_t priority;
int family;
union in_addr_union address; union in_addr_union address;
}; };

4
src/test/test-local-addresses.c
View File

@ -10,8 +10,8 @@
static void print_local_addresses(const struct local_address *a, size_t n) { static void print_local_addresses(const struct local_address *a, size_t n) {
FOREACH_ARRAY(i, a, n) FOREACH_ARRAY(i, a, n)
log_debug("%s ifindex=%i scope=%u metric=%"PRIu32" address=%s", log_debug("%s ifindex=%i scope=%u priority=%"PRIu32" address=%s",
af_to_name(i->family), i->ifindex, i->scope, i->metric, af_to_name(i->family), i->ifindex, i->scope, i->priority,
IN_ADDR_TO_STRING(i->family, &i->address)); IN_ADDR_TO_STRING(i->family, &i->address));
} }