X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-route.c;h=8949299409f476aead74fca52037049b309a60fd;hb=9ff48d0982fcb97923955685fe9fa4e0e67cb238;hp=8b020adba469a29739357262e8e362a8bae6b659;hpb=c6f7c917a1b494d4455800823472227463f87438;p=elogind.git diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 8b020adba..894929940 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -52,7 +52,7 @@ int route_new_static(Network *network, unsigned section, Route **ret) { route->network = network; - LIST_PREPEND(static_routes, network->static_routes, route); + LIST_PREPEND(routes, network->static_routes, route); if (section) { route->section = section; @@ -86,7 +86,7 @@ void route_free(Route *route) { return; if (route->network) { - LIST_REMOVE(static_routes, route->network->static_routes, route); + LIST_REMOVE(routes, route->network->static_routes, route); if (route->section) hashmap_remove(route->network->routes_by_section, @@ -164,6 +164,8 @@ int route_drop(Route *route, Link *link, return r; } + link_ref(link); + return 0; } @@ -235,6 +237,8 @@ int route_configure(Route *route, Link *link, return r; } + link_ref(link); + return 0; } @@ -356,3 +360,38 @@ int config_parse_destination(const char *unit, return 0; } + +int config_parse_route_priority(const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Network *network = userdata; + _cleanup_route_free_ Route *n = NULL; + int r; + + assert(filename); + assert(section); + assert(lvalue); + assert(rvalue); + assert(data); + + r = route_new_static(network, section_line, &n); + if (r < 0) + return r; + + r = config_parse_unsigned(unit, filename, line, section, + section_line, lvalue, ltype, + rvalue, &n->metrics, userdata); + if (r < 0) + return r; + + n = NULL; + + return 0; +}