From 66b5541970dfc58cab54b439a34eb24886c0b557 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 31 Jul 2019 12:38:40 -0500 Subject: [PATCH] netconfig: make ROUTE_PRIORITY_OFFSET a uint32_t Also move it up into the static variable block --- src/netconfig.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/netconfig.c b/src/netconfig.c index 3d74c61e..f5a507c6 100644 --- a/src/netconfig.c +++ b/src/netconfig.c @@ -59,6 +59,12 @@ struct netconfig_ifaddr { static struct l_netlink *rtnl; static struct l_queue *netconfig_list; +/* + * Routing priority offset, configurable in main.conf. The route with lower + * priority offset is preferred. + */ +static uint32_t ROUTE_PRIORITY_OFFSET; + static void do_debug(const char *str, void *user_data) { const char *prefix = user_data; @@ -361,12 +367,6 @@ static void netconfig_ifaddr_cmd_cb(int error, uint16_t type, netconfig_ifaddr_notify(type, data, len, user_data); } -/* - * Routing priority offset, configurable in main.conf. The route with lower - * priority offset is preferred. - */ -static int ROUTE_PRIORITY_OFFSET; - static void netconfig_route_cmd_cb(int error, uint16_t type, const void *data, uint32_t len, void *user_data) @@ -789,7 +789,7 @@ static int netconfig_init(void) goto error; } - if (!l_settings_get_int(iwd_get_config(), "General", + if (!l_settings_get_uint(iwd_get_config(), "General", "route_priority_offset", &ROUTE_PRIORITY_OFFSET)) ROUTE_PRIORITY_OFFSET = 300;