X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=9ab4f2306887ff4d0d0aa4f685e353662361c5d4;hp=2e68bec2e745a520b24aa105e1ade33092d4efa1;hb=0372cb2bd2342fa5c5585c666f79159a8341f4a6;hpb=edbb03e95a3c31bf719d5c6c46eec14d0bcb9c8f
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 2e68bec2e..9ab4f2306 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -19,8 +19,11 @@
along with systemd; If not, see .
***/
+#include
+#include
+
#include "networkd.h"
-#include "net-util.h"
+#include "network-internal.h"
#include "path-util.h"
#include "conf-files.h"
#include "conf-parser.h"
@@ -41,7 +44,12 @@ static int network_load_one(Manager *manager, const char *filename) {
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);
@@ -53,10 +61,18 @@ static int network_load_one(Manager *manager, const char *filename) {
LIST_HEAD_INIT(network->static_addresses);
LIST_HEAD_INIT(network->static_routes);
- network->vlans = hashmap_new(uint64_hash_func, uint64_compare_func);
+ 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->vxlans = hashmap_new(uint64_hash_func, uint64_compare_func);
+ if (!network->vxlans)
+ return log_oom();
+
network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
if (!network->addresses_by_section)
return log_oom();
@@ -69,9 +85,12 @@ static int network_load_one(Manager *manager, const char *filename) {
if (!network->filename)
return log_oom();
+ network->dhcp_ntp = true;
network->dhcp_dns = true;
network->dhcp_hostname = true;
network->dhcp_domainname = true;
+ network->dhcp_routes = true;
+ network->dhcp_sendhost = 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);
@@ -82,7 +101,7 @@ static int network_load_one(Manager *manager, const char *filename) {
LIST_PREPEND(networks, manager->networks, network);
- LIST_FOREACH(static_routes, route, network->static_routes) {
+ LIST_FOREACH(routes, route, network->static_routes) {
if (!route->family) {
log_warning("Route section without Gateway field configured in %s. "
"Ignoring", filename);
@@ -90,7 +109,7 @@ static int network_load_one(Manager *manager, const char *filename) {
}
}
- LIST_FOREACH(static_addresses, address, network->static_addresses) {
+ LIST_FOREACH(addresses, address, network->static_addresses) {
if (!address->family) {
log_warning("Address section without Address field configured in %s. "
"Ignoring", filename);
@@ -130,8 +149,10 @@ int network_load(Manager *manager) {
}
void network_free(Network *network) {
+ NetDev *netdev;
Route *route;
Address *address;
+ Iterator i;
if (!network)
return;
@@ -146,10 +167,34 @@ void network_free(Network *network) {
free(network->description);
- address_free(network->dns);
+ while ((address = network->ntp)) {
+ LIST_REMOVE(addresses, network->ntp, address);
+ address_free(address);
+ }
+
+ while ((address = network->dns)) {
+ LIST_REMOVE(addresses, network->dns, address);
+ address_free(address);
+ }
+
+ netdev_unref(network->bridge);
+ netdev_unref(network->bond);
+
+ netdev_unref(network->tunnel);
+
+ 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);
+
+ HASHMAP_FOREACH(netdev, network->vxlans, i)
+ netdev_unref(netdev);
+ hashmap_free(network->vxlans);
+
while ((route = network->static_routes))
route_free(route);
@@ -162,30 +207,36 @@ void network_free(Network *network) {
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);
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, network->match_host,
- network->match_virt, network->match_kernel,
- network->match_arch,
- udev_device_get_sysattr_value(device, "address"),
- udev_device_get_property_value(device, "ID_PATH"),
- udev_device_get_driver(udev_device_get_parent(device)),
- udev_device_get_devtype(device),
- udev_device_get_sysname(device))) {
- log_debug("%s: found matching network '%s'",
- udev_device_get_sysname(device),
- network->filename);
+ 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'", IFNAMSIZ, ifname,
+ network->filename);
*ret = network;
return 0;
}
@@ -201,12 +252,8 @@ int network_apply(Manager *manager, Network *network, Link *link) {
link->network = network;
- r = link_configure(link);
- if (r < 0)
- return r;
-
- if (network->dns) {
- r = manager_update_resolv_conf(manager);
+ if (network->dns || network->ntp) {
+ r = link_save(link);
if (r < 0)
return r;
}
@@ -214,7 +261,7 @@ int network_apply(Manager *manager, Network *network, Link *link) {
return 0;
}
-int config_parse_bridge(const char *unit,
+int config_parse_netdev(const char *unit,
const char *filename,
unsigned line,
const char *section,
@@ -225,7 +272,10 @@ int config_parse_bridge(const char *unit,
void *data,
void *userdata) {
Network *network = userdata;
+ _cleanup_free_ char *kind_string = NULL;
+ char *p;
NetDev *netdev;
+ NetDevKind kind;
int r;
assert(filename);
@@ -233,71 +283,89 @@ int config_parse_bridge(const char *unit,
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,
- "Bridge is invalid, ignoring assignment: %s", rvalue);
+ "%s could not be found, ignoring assignment: %s", lvalue, rvalue);
return 0;
}
- if (netdev->kind != NETDEV_KIND_BRIDGE) {
+ if (netdev->kind != kind) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "NetDev is not a bridge, ignoring assignment: %s", rvalue);
+ "NetDev is not a %s, ignoring assignment: %s", lvalue, rvalue);
return 0;
}
- network->bridge = netdev;
+ switch (kind) {
+ case NETDEV_KIND_BRIDGE:
+ network->bridge = netdev;
- return 0;
-}
+ break;
+ case NETDEV_KIND_BOND:
+ network->bond = netdev;
-int config_parse_bond(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;
- NetDev *netdev;
- int r;
+ 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;
+ }
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
+ break;
+ case NETDEV_KIND_MACVLAN:
+ r = hashmap_put(network->macvlans, netdev->ifname, netdev);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Can not add MACVLAN to network: %s", rvalue);
+ return 0;
+ }
- r = netdev_get(network->manager, rvalue, &netdev);
- if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Bond is invalid, ignoring assignment: %s", rvalue);
- return 0;
- }
+ break;
+ case NETDEV_KIND_VXLAN:
+ r = hashmap_put(network->vxlans, netdev->ifname, netdev);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Can not add VXLAN to network: %s", rvalue);
+ return 0;
+ }
- if (netdev->kind != NETDEV_KIND_BOND) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "NetDev is not a bond, ignoring assignment: %s", rvalue);
- return 0;
+ break;
+ default:
+ assert_not_reached("Can not parse NetDev");
}
- network->bond = netdev;
+ netdev_ref(netdev);
return 0;
}
-int config_parse_vlan(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) {
+int config_parse_tunnel(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;
NetDev *netdev;
int r;
@@ -310,22 +378,20 @@ int config_parse_vlan(const char *unit,
r = netdev_get(network->manager, rvalue, &netdev);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "VLAN is invalid, ignoring assignment: %s", rvalue);
+ "Tunnel is invalid, ignoring assignment: %s", rvalue);
return 0;
}
- if (netdev->kind != NETDEV_KIND_VLAN) {
+ if (netdev->kind != NETDEV_KIND_IPIP &&
+ netdev->kind != NETDEV_KIND_SIT &&
+ netdev->kind != NETDEV_KIND_GRE &&
+ netdev->kind != NETDEV_KIND_VTI) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "NetDev is not a VLAN, ignoring assignment: %s", rvalue);
+ "NetDev is not a tunnel, ignoring assignment: %s", rvalue);
return 0;
}
- 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;
- }
+ network->tunnel = netdev;
return 0;
}