if (!network)
return log_oom();
+ network->manager = manager;
+
LIST_HEAD_INIT(network->addresses);
+ LIST_HEAD_INIT(network->routes);
+
+ network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
+ if (!network->addresses_by_section)
+ return log_oom();
- r = config_parse(NULL, filename, file, "Match\0Network\0", config_item_perf_lookup,
+ network->routes_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
+ if (!network->routes_by_section)
+ return log_oom();
+
+ network->filename = strdup(filename);
+ if (!network->filename)
+ return log_oom();
+
+ r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0", config_item_perf_lookup,
(void*) network_gperf_lookup, false, false, network);
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
} else
log_debug("Parsed configuration file %s", filename);
- network->filename = strdup(filename);
- if (!network->filename)
- return log_oom();
-
- network->manager = manager;
-
LIST_PREPEND(networks, manager->networks, network);
network = NULL;
while ((network = manager->networks))
network_free(network);
- /* update timestamp */
- paths_check_timestamp(manager->network_dirs, &manager->network_dirs_ts_usec, true);
-
r = conf_files_list_strv(&files, ".network", NULL, (const char **)manager->network_dirs);
if (r < 0) {
log_error("failed to enumerate network files: %s", strerror(-r));
return 0;
}
-bool network_should_reload(Manager *manager) {
- return paths_check_timestamp(manager->network_dirs, &manager->network_dirs_ts_usec, false);
-}
-
void network_free(Network *network) {
Route *route;
Address *address;
while ((address = network->addresses))
address_free(address);
+ hashmap_free(network->addresses_by_section);
+ hashmap_free(network->routes_by_section);
+
LIST_REMOVE(networks, network->manager->networks, network);
free(network);
assert(device);
assert(ret);
- if (network_should_reload(manager))
- network_load(manager);
+ if (manager_should_reload(manager))
+ manager_load_config(manager);
LIST_FOREACH(networks, network, manager->networks) {
if (net_match_config(network->match_mac, network->match_path,
int network_apply(Manager *manager, Network *network, Link *link) {
int r;
- log_info("Network '%s' being applied to link '%u'",
- network->description, (unsigned) link->ifindex);
+ log_info("Network '%s' being applied to link '%s'",
+ network->description, link->ifname);
link->network = network;
return 0;
}
+
+int config_parse_bridge(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;
+ Bridge *bridge;
+ int r;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ r = bridge_get(network->manager, rvalue, &bridge);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Bridge is invalid, ignoring assignment: %s", rvalue);
+ return 0;
+ }
+
+ network->bridge = bridge;
+
+ return 0;
+}