Skip to content

Commit 14d20d2

Browse files
ssahanikeszybz
authored andcommitted
networkd: fix route table from unsigned char to uint32_t (systemd#6083)
[zj: struct Route is defined with uint32_t route, so this makes the type of the function parameter match the field it is assigned to.]
1 parent 94fcd9d commit 14d20d2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/network/networkd-route.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ int route_get(Link *link,
230230
unsigned char dst_prefixlen,
231231
unsigned char tos,
232232
uint32_t priority,
233-
unsigned char table,
233+
uint32_t table,
234234
Route **ret) {
235235

236236
Route route, *existing;
@@ -272,7 +272,7 @@ static int route_add_internal(
272272
unsigned char dst_prefixlen,
273273
unsigned char tos,
274274
uint32_t priority,
275-
unsigned char table,
275+
uint32_t table,
276276
Route **ret) {
277277

278278
_cleanup_route_free_ Route *route = NULL;
@@ -318,7 +318,7 @@ int route_add_foreign(
318318
unsigned char dst_prefixlen,
319319
unsigned char tos,
320320
uint32_t priority,
321-
unsigned char table,
321+
uint32_t table,
322322
Route **ret) {
323323

324324
return route_add_internal(link, &link->routes_foreign, family, dst, dst_prefixlen, tos, priority, table, ret);
@@ -331,7 +331,7 @@ int route_add(
331331
unsigned char dst_prefixlen,
332332
unsigned char tos,
333333
uint32_t priority,
334-
unsigned char table,
334+
uint32_t table,
335335
Route **ret) {
336336

337337
Route *route;

src/network/networkd-route.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ void route_free(Route *route);
5959
int route_configure(Route *route, Link *link, sd_netlink_message_handler_t callback);
6060
int route_remove(Route *route, Link *link, sd_netlink_message_handler_t callback);
6161

62-
int route_get(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
63-
int route_add(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
64-
int route_add_foreign(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
62+
int route_get(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, uint32_t table, Route **ret);
63+
int route_add(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, uint32_t table, Route **ret);
64+
int route_add_foreign(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, uint32_t table, Route **ret);
6565
int route_update(Route *route, const union in_addr_union *src, unsigned char src_prefixlen, const union in_addr_union *gw, const union in_addr_union *prefsrc, unsigned char scope, unsigned char protocol);
6666

6767
int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata);

0 commit comments

Comments
 (0)