chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: make sure Network and Link can always be freed
[elogind.git]
/
src
/
network
/
networkd-network.c
diff --git
a/src/network/networkd-network.c
b/src/network/networkd-network.c
index 69c55edb8fe3ef588bb5d13a45a3817cb332c581..7be9645d594ebd8ac73801dceaea5e849d9542e2 100644
(file)
--- a/
src/network/networkd-network.c
+++ b/
src/network/networkd-network.c
@@
-42,6
+42,8
@@
static int network_load_one(Manager *manager, const char *filename) {
if (!network)
return log_oom();
if (!network)
return log_oom();
+ network->manager = manager;
+
LIST_HEAD_INIT(network->addresses);
r = config_parse(NULL, filename, file, "Match\0Network\0", config_item_perf_lookup,
LIST_HEAD_INIT(network->addresses);
r = config_parse(NULL, filename, file, "Match\0Network\0", config_item_perf_lookup,
@@
-157,8
+159,6
@@
int network_get(Manager *manager, struct udev_device *device, Network **ret) {
}
int network_apply(Manager *manager, Network *network, Link *link) {
}
int network_apply(Manager *manager, Network *network, Link *link) {
- Address *address;
- Route *route;
int r;
log_info("Network '%s' being applied to link '%u'",
int r;
log_info("Network '%s' being applied to link '%u'",
@@
-166,21
+166,9
@@
int network_apply(Manager *manager, Network *network, Link *link) {
link->network = network;
link->network = network;
- LIST_FOREACH(addresses, address, network->addresses) {
- r = address_configure(manager, address, link);
- if (r < 0)
- return r;
- }
-
- r = link_up(manager, link);
+ r = link_configure(link);
if (r < 0)
return r;
if (r < 0)
return r;
- LIST_FOREACH(routes, route, network->routes) {
- r = route_configure(manager, route, link);
- if (r < 0)
- return r;
- }
-
return 0;
}
return 0;
}