X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=a452096836bd6160e7da413ba0809a32b95acefc;hp=69c55edb8fe3ef588bb5d13a45a3817cb332c581;hb=47e2dc3168cb0509d8d61f5dbeffaa3c252685b5;hpb=f579559b3a14c1f1ef96c372e7626c4733e6ef7d
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 69c55edb8..a45209683 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -19,44 +19,100 @@
along with systemd; If not, see .
***/
+#include
+
#include "networkd.h"
-#include "net-util.h"
+#include "network-internal.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;
+ Route *route;
+ Address *address;
int r;
+ assert(manager);
+ assert(filename);
+
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
return 0;
else
- return errno;
+ return -errno;
+ }
+
+ if (null_or_empty_path(filename)) {
+ log_debug("skipping empty file: %s", filename);
+ return 0;
}
network = new0(Network, 1);
if (!network)
return log_oom();
- LIST_HEAD_INIT(network->addresses);
+ network->manager = manager;
- r = config_parse(NULL, filename, file, "Match\0Network\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));
- return r;
- } else
- log_debug("Parsed configuration file %s", filename);
+ LIST_HEAD_INIT(network->static_addresses);
+ LIST_HEAD_INIT(network->static_routes);
+
+ network->vlans = hashmap_new(string_hash_func, string_compare_func);
+ if (!network->vlans)
+ return log_oom();
+
+ network->macvlans = hashmap_new(uint64_hash_func, uint64_compare_func);
+ if (!network->macvlans)
+ return log_oom();
+
+ network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
+ if (!network->addresses_by_section)
+ return log_oom();
+
+ network->routes_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
+ if (!network->routes_by_section)
+ return log_oom();
+
+ network->dns = set_new(NULL, NULL);
+ if (!network->dns)
+ return log_oom();
network->filename = strdup(filename);
if (!network->filename)
return log_oom();
+ network->dhcp_dns = true;
+ network->dhcp_hostname = true;
+ network->dhcp_domainname = true;
+
+ r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup,
+ (void*) network_network_gperf_lookup, false, false, network);
+ if (r < 0) {
+ log_warning("Could not parse config file %s: %s", filename, strerror(-r));
+ return r;
+ }
+
LIST_PREPEND(networks, manager->networks, network);
+
+ LIST_FOREACH(static_routes, route, network->static_routes) {
+ if (!route->family) {
+ log_warning("Route section without Gateway field configured in %s. "
+ "Ignoring", filename);
+ return 0;
+ }
+ }
+
+ LIST_FOREACH(static_addresses, address, network->static_addresses) {
+ if (!address->family) {
+ log_warning("Address section without Address field configured in %s. "
+ "Ignoring", filename);
+ return 0;
+ }
+ }
+
network = NULL;
return 0;
@@ -64,7 +120,8 @@ static int network_load_one(Manager *manager, const char *filename) {
int network_load(Manager *manager) {
Network *network;
- char **files, **f;
+ _cleanup_strv_free_ char **files = NULL;
+ char **f;
int r;
assert(manager);
@@ -72,12 +129,9 @@ int network_load(Manager *manager) {
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);
+ r = conf_files_list_strv(&files, ".network", NULL, network_dirs);
if (r < 0) {
- log_error("failed to enumerate network files: %s", strerror(-r));
+ log_error("Failed to enumerate network files: %s", strerror(-r));
return r;
}
@@ -87,18 +141,14 @@ int network_load(Manager *manager) {
return r;
}
- strv_free(files);
-
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) {
+ NetDev *netdev;
Route *route;
Address *address;
+ Iterator i;
if (!network)
return;
@@ -113,39 +163,65 @@ void network_free(Network *network) {
free(network->description);
- while ((route = network->routes))
+ SET_FOREACH(address, network->dns, i)
+ address_free(address);
+
+ set_free(network->dns);
+
+ netdev_unref(network->bridge);
+
+ netdev_unref(network->bond);
+
+ HASHMAP_FOREACH(netdev, network->vlans, i)
+ netdev_unref(netdev);
+ hashmap_free(network->vlans);
+
+ HASHMAP_FOREACH(netdev, network->macvlans, i)
+ netdev_unref(netdev);
+ hashmap_free(network->macvlans);
+
+ while ((route = network->static_routes))
route_free(route);
- while ((address = network->addresses))
+ while ((address = network->static_addresses))
address_free(address);
- LIST_REMOVE(networks, network->manager->networks, network);
+ hashmap_free(network->addresses_by_section);
+ hashmap_free(network->routes_by_section);
+
+ if (network->manager && network->manager->networks)
+ LIST_REMOVE(networks, network->manager->networks, network);
+
+ condition_free_list(network->match_host);
+ condition_free_list(network->match_virt);
+ condition_free_list(network->match_kernel);
+ condition_free_list(network->match_arch);
free(network);
}
-int network_get(Manager *manager, struct udev_device *device, Network **ret) {
+int network_get(Manager *manager, struct udev_device *device,
+ const char *ifname, const struct ether_addr *address,
+ Network **ret) {
Network *network;
assert(manager);
- assert(device);
assert(ret);
- if (network_should_reload(manager))
- network_load(manager);
-
LIST_FOREACH(networks, network, manager->networks) {
if (net_match_config(network->match_mac, network->match_path,
- network->match_driver, network->match_type,
- network->match_name,
- udev_device_get_sysattr_value(device, "address"),
- udev_device_get_property_value(device, "ID_PATH"),
- 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));
+ network->match_driver, network->match_type,
+ network->match_name, network->match_host,
+ network->match_virt, network->match_kernel,
+ network->match_arch,
+ address,
+ udev_device_get_property_value(device, "ID_PATH"),
+ udev_device_get_driver(udev_device_get_parent(device)),
+ udev_device_get_property_value(device, "ID_NET_DRIVER"),
+ udev_device_get_devtype(device),
+ ifname)) {
+ log_debug("%s: found matching network '%s'", ifname,
+ network->filename);
*ret = network;
return 0;
}
@@ -157,30 +233,100 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) {
}
int network_apply(Manager *manager, Network *network, Link *link) {
- Address *address;
- Route *route;
int r;
- log_info("Network '%s' being applied to link '%u'",
- network->description, (unsigned) link->ifindex);
-
link->network = network;
- LIST_FOREACH(addresses, address, network->addresses) {
- r = address_configure(manager, address, link);
+ if (network->dns) {
+ r = manager_update_resolv_conf(manager);
if (r < 0)
return r;
}
- r = link_up(manager, link);
- if (r < 0)
- return r;
+ return 0;
+}
- LIST_FOREACH(routes, route, network->routes) {
- r = route_configure(manager, route, link);
- if (r < 0)
- return r;
+int config_parse_netdev(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;
+ char *kind_string, *p;
+ NetDev *netdev;
+ NetDevKind kind;
+ int r;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ kind_string = strdup(lvalue);
+ if (!kind_string)
+ return log_oom();
+
+ /* the keys are CamelCase versions of the kind */
+ for (p = kind_string; *p; p++)
+ *p = tolower(*p);
+
+ kind = netdev_kind_from_string(kind_string);
+ if (kind == _NETDEV_KIND_INVALID) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Invalid NetDev kind: %s", lvalue);
+ return 0;
+ }
+
+ r = netdev_get(network->manager, rvalue, &netdev);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "%s could not be found, ignoring assignment: %s", lvalue, rvalue);
+ return 0;
+ }
+
+ if (netdev->kind != kind) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "NetDev is not a %s, ignoring assignment: %s", lvalue, rvalue);
+ return 0;
}
+ switch (kind) {
+ case NETDEV_KIND_BRIDGE:
+ network->bridge = netdev;
+
+ break;
+ case NETDEV_KIND_BOND:
+ network->bond = netdev;
+
+ break;
+ case NETDEV_KIND_VLAN:
+ r = hashmap_put(network->vlans, &netdev->vlanid, netdev);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Can not add VLAN to network: %s", rvalue);
+ return 0;
+ }
+
+ break;
+ case NETDEV_KIND_MACVLAN:
+ r = hashmap_put(network->macvlans, netdev->name, netdev);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Can not add MACVLAN to network: %s", rvalue);
+ return 0;
+ }
+
+ break;
+ default:
+ assert_not_reached("Can not parse NetDev");
+ }
+
+ netdev_ref(netdev);
+
return 0;
}