chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: do not invoke RegisterMachine on machined from inside the new PID namespace
[elogind.git]
/
src
/
network
/
networkd-route.c
diff --git
a/src/network/networkd-route.c
b/src/network/networkd-route.c
index 3eaefa2cc741ffa42e84da99acdd2065d2be1613..83dad655db19658d5434c4191881afae439c21bd 100644
(file)
--- a/
src/network/networkd-route.c
+++ b/
src/network/networkd-route.c
@@
-28,7
+28,7
@@
#include "conf-parser.h"
#include "net-util.h"
#include "conf-parser.h"
#include "net-util.h"
-int route_new(Network *network, unsigned section, Route **ret) {
+int route_new
_static
(Network *network, unsigned section, Route **ret) {
_cleanup_route_free_ Route *route = NULL;
if (section) {
_cleanup_route_free_ Route *route = NULL;
if (section) {
@@
-49,7
+49,7
@@
int route_new(Network *network, unsigned section, Route **ret) {
route->network = network;
route->network = network;
- LIST_PREPEND(
routes, network->
routes, route);
+ LIST_PREPEND(
static_routes, network->static_
routes, route);
if (section) {
route->section = section;
if (section) {
route->section = section;
@@
-62,15
+62,30
@@
int route_new(Network *network, unsigned section, Route **ret) {
return 0;
}
return 0;
}
+int route_new_dynamic(Route **ret) {
+ _cleanup_route_free_ Route *route = NULL;
+
+ route = new0(Route, 1);
+ if (!route)
+ return -ENOMEM;
+
+ *ret = route;
+ route = NULL;
+
+ return 0;
+}
+
void route_free(Route *route) {
if (!route)
return;
void route_free(Route *route) {
if (!route)
return;
- LIST_REMOVE(routes, route->network->routes, route);
+ if (route->network) {
+ LIST_REMOVE(static_routes, route->network->static_routes, route);
- if (route->section)
- hashmap_remove(route->network->routes_by_section,
- &route->section);
+ if (route->section)
+ hashmap_remove(route->network->routes_by_section,
+ &route->section);
+ }
free(route);
}
free(route);
}
@@
-160,7
+175,7
@@
int config_parse_gateway(const char *unit,
section_line = 0;
}
section_line = 0;
}
- r = route_new(network, section_line, &n);
+ r = route_new
_static
(network, section_line, &n);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-198,7
+213,7
@@
int config_parse_destination(const char *unit,
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- r = route_new(network, section_line, &n);
+ r = route_new
_static
(network, section_line, &n);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-216,7
+231,7
@@
int config_parse_destination(const char *unit,
return log_oom();
}
return log_oom();
}
- r = net_parse_inaddr(address, &n->family, &n->dst_addr);
+ r = net_parse_inaddr(address, &n->
dst_
family, &n->dst_addr);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Destination is invalid, ignoring assignment: %s", address);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Destination is invalid, ignoring assignment: %s", address);
@@
-237,7
+252,7
@@
int config_parse_destination(const char *unit,
n->dst_prefixlen = (unsigned char) i;
} else {
n->dst_prefixlen = (unsigned char) i;
} else {
- switch (n->family) {
+ switch (n->
dst_
family) {
case AF_INET:
n->dst_prefixlen = 32;
break;
case AF_INET:
n->dst_prefixlen = 32;
break;