chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: always create --user bus when kdbus is active
[elogind.git]
/
src
/
network
/
networkd-network.c
diff --git
a/src/network/networkd-network.c
b/src/network/networkd-network.c
index ae8d4d160d9259585f4c8f6b74a9079079048e7f..3cbc9aba2634d3424121f0e0983d8fee9295be8e 100644
(file)
--- a/
src/network/networkd-network.c
+++ b/
src/network/networkd-network.c
@@
-24,12
+24,16
@@
#include "path-util.h"
#include "conf-files.h"
#include "conf-parser.h"
#include "path-util.h"
#include "conf-files.h"
#include "conf-parser.h"
+#include "util.h"
static int network_load_one(Manager *manager, const char *filename) {
_cleanup_network_free_ Network *network = NULL;
_cleanup_fclose_ FILE *file = NULL;
int r;
static int network_load_one(Manager *manager, const char *filename) {
_cleanup_network_free_ Network *network = NULL;
_cleanup_fclose_ FILE *file = NULL;
int r;
+ assert(manager);
+ assert(filename);
+
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
@@
-44,8
+48,8
@@
static int network_load_one(Manager *manager, const char *filename) {
network->manager = manager;
network->manager = manager;
- LIST_HEAD_INIT(network->addresses);
- LIST_HEAD_INIT(network->routes);
+ LIST_HEAD_INIT(network->
static_
addresses);
+ LIST_HEAD_INIT(network->
static_
routes);
network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
if (!network->addresses_by_section)
network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
if (!network->addresses_by_section)
@@
-64,8
+68,7
@@
static int network_load_one(Manager *manager, const char *filename) {
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
return r;
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
return r;
- } else
- log_debug("Parsed configuration file %s", filename);
+ }
LIST_PREPEND(networks, manager->networks, network);
network = NULL;
LIST_PREPEND(networks, manager->networks, network);
network = NULL;
@@
-75,7
+78,8
@@
static int network_load_one(Manager *manager, const char *filename) {
int network_load(Manager *manager) {
Network *network;
int network_load(Manager *manager) {
Network *network;
- char **files, **f;
+ _cleanup_strv_free_ char **files = NULL;
+ char **f;
int r;
assert(manager);
int r;
assert(manager);
@@
-85,7
+89,7
@@
int network_load(Manager *manager) {
r = conf_files_list_strv(&files, ".network", NULL, (const char **)manager->network_dirs);
if (r < 0) {
r = conf_files_list_strv(&files, ".network", NULL, (const char **)manager->network_dirs);
if (r < 0) {
- log_error("
f
ailed to enumerate network files: %s", strerror(-r));
+ log_error("
F
ailed to enumerate network files: %s", strerror(-r));
return r;
}
return r;
}
@@
-95,8
+99,6
@@
int network_load(Manager *manager) {
return r;
}
return r;
}
- strv_free(files);
-
return 0;
}
return 0;
}
@@
-107,6
+109,8
@@
void network_free(Network *network) {
if (!network)
return;
if (!network)
return;
+ assert(network->manager);
+
free(network->filename);
free(network->match_mac);
free(network->filename);
free(network->match_mac);
@@
-117,16
+121,17
@@
void network_free(Network *network) {
free(network->description);
free(network->description);
- while ((route = network->routes))
+ while ((route = network->
static_
routes))
route_free(route);
route_free(route);
- while ((address = network->addresses))
+ while ((address = network->
static_
addresses))
address_free(address);
hashmap_free(network->addresses_by_section);
hashmap_free(network->routes_by_section);
address_free(address);
hashmap_free(network->addresses_by_section);
hashmap_free(network->routes_by_section);
- LIST_REMOVE(networks, network->manager->networks, network);
+ if (network->manager->networks)
+ LIST_REMOVE(networks, network->manager->networks, network);
free(network);
}
free(network);
}
@@
-150,9
+155,9
@@
int network_get(Manager *manager, struct udev_device *device, Network **ret) {
udev_device_get_driver(device),
udev_device_get_devtype(device),
udev_device_get_sysname(device))) {
udev_device_get_driver(device),
udev_device_get_devtype(device),
udev_device_get_sysname(device))) {
- log_debug("
Network file %s applies to link %s
",
-
network->filename
,
-
udev_device_get_sysname(device)
);
+ log_debug("
%s: found matching network '%s'
",
+
udev_device_get_sysname(device)
,
+
network->filename
);
*ret = network;
return 0;
}
*ret = network;
return 0;
}
@@
-166,9
+171,6
@@
int network_get(Manager *manager, struct udev_device *device, Network **ret) {
int network_apply(Manager *manager, Network *network, Link *link) {
int r;
int network_apply(Manager *manager, Network *network, Link *link) {
int r;
- log_info("Network '%s' being applied to link '%s'",
- network->description, link->ifname);
-
link->network = network;
r = link_configure(link);
link->network = network;
r = link_configure(link);