X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=4439374a675490ea7b6fe09becc9f1fca6a688c7;hp=15a5d7cdff2e22a21bb36953d2cee8c903424617;hb=a9f434cf00d1d36d9a013b9739efe69653dd7279;hpb=d8e538ecd9e62f841242f07e3df5c835c1ba6313
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 15a5d7cdf..4439374a6 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -19,6 +19,8 @@
along with systemd; If not, see .
***/
+#include
+
#include "networkd.h"
#include "network-internal.h"
#include "path-util.h"
@@ -33,6 +35,10 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
[NETDEV_KIND_BOND] = "bond",
[NETDEV_KIND_VLAN] = "vlan",
[NETDEV_KIND_MACVLAN] = "macvlan",
+ [NETDEV_KIND_IPIP] = "ipip",
+ [NETDEV_KIND_GRE] = "gre",
+ [NETDEV_KIND_SIT] = "sit",
+ [NETDEV_KIND_VETH] = "veth",
};
DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind);
@@ -48,24 +54,43 @@ static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(macvlan_mode, MacVlanMode);
DEFINE_CONFIG_PARSE_ENUM(config_parse_macvlan_mode, macvlan_mode, MacVlanMode, "Failed to parse macvlan mode");
-void netdev_free(NetDev *netdev) {
+static void netdev_cancel_callbacks(NetDev *netdev) {
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
netdev_enslave_callback *callback;
if (!netdev)
return;
+ rtnl_message_new_synthetic_error(-ENODEV, 0, &m);
+
while ((callback = netdev->callbacks)) {
+ if (m) {
+ assert(callback->link);
+ assert(callback->callback);
+ assert(netdev->manager);
+ assert(netdev->manager->rtnl);
+
+ callback->callback(netdev->manager->rtnl, m, link);
+ }
+
LIST_REMOVE(callbacks, netdev->callbacks, callback);
free(callback);
}
+}
+
+static void netdev_free(NetDev *netdev) {
+ if (!netdev)
+ return;
+
+ netdev_cancel_callbacks(netdev);
- if (netdev->name)
- hashmap_remove(netdev->manager->netdevs, netdev->name);
+ if (netdev->ifname)
+ hashmap_remove(netdev->manager->netdevs, netdev->ifname);
free(netdev->filename);
free(netdev->description);
- free(netdev->name);
+ free(netdev->ifname);
condition_free_list(netdev->match_host);
condition_free_list(netdev->match_virt);
@@ -75,6 +100,35 @@ void netdev_free(NetDev *netdev) {
free(netdev);
}
+NetDev *netdev_unref(NetDev *netdev) {
+ if (netdev && (-- netdev->n_ref <= 0))
+ netdev_free(netdev);
+
+ return NULL;
+}
+
+NetDev *netdev_ref(NetDev *netdev) {
+ if (netdev)
+ assert_se(++ netdev->n_ref >= 2);
+
+ return netdev;
+}
+
+void netdev_drop(NetDev *netdev) {
+ if (!netdev || netdev->state == NETDEV_STATE_LINGER)
+ return;
+
+ netdev->state = NETDEV_STATE_LINGER;
+
+ log_debug_netdev(netdev, "netdev removed");
+
+ netdev_cancel_callbacks(netdev);
+
+ netdev_unref(netdev);
+
+ return;
+}
+
int netdev_get(Manager *manager, const char *name, NetDev **ret) {
NetDev *netdev;
@@ -144,99 +198,68 @@ static int netdev_enter_ready(NetDev *netdev) {
netdev_enslave_callback *callback;
assert(netdev);
- assert(netdev->name);
+ assert(netdev->ifname);
+
+ if (netdev->state != NETDEV_STATE_CREATING)
+ return 0;
netdev->state = NETDEV_STATE_READY;
log_info_netdev(netdev, "netdev ready");
LIST_FOREACH(callbacks, callback, netdev->callbacks) {
- /* enslave the links that were attempted to be enslaved befor the
+ /* enslave the links that were attempted to be enslaved before the
* link was ready */
netdev_enslave_ready(netdev, callback->link, callback->callback);
}
return 0;
}
-
-static int netdev_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
- void *userdata) {
+static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
NetDev *netdev = userdata;
int r;
- assert(netdev);
-
- if (netdev->state == NETDEV_STATE_FAILED)
- return 1;
+ assert(netdev->state != _NETDEV_STATE_INVALID);
r = sd_rtnl_message_get_errno(m);
- if (r < 0) {
- log_struct_netdev(LOG_ERR, netdev,
- "MESSAGE=%s: could not get link: %s",
- netdev->name, strerror(-r),
- "ERRNO=%d", -r,
- NULL);
+ if (r == -EEXIST)
+ log_debug_netdev(netdev, "netdev exists, using existing");
+ else if (r < 0) {
+ log_warning_netdev(netdev, "netdev could not be created: %s", strerror(-r));
+ netdev_drop(netdev);
+
return 1;
}
- netdev_set_ifindex(netdev, m);
-
return 1;
}
-static int netdev_getlink(NetDev *netdev) {
- _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
- int r;
-
- assert(netdev->manager);
- assert(netdev->manager->rtnl);
- assert(netdev->name);
-
- log_debug_netdev(netdev, "requesting netdev status");
-
- r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req,
- RTM_GETLINK, 0);
- if (r < 0) {
- log_error_netdev(netdev, "Could not allocate RTM_GETLINK message");
- return r;
- }
-
- r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->name);
- if (r < 0) {
- log_error_netdev(netdev, "Colud not append ifname to message: %s",
- strerror(-r));
- return r;
- }
-
- r = sd_rtnl_call_async(netdev->manager->rtnl, req, netdev_getlink_handler,
- netdev, 0, NULL);
- if (r < 0) {
- log_error_netdev(netdev,
- "Could not send rtnetlink message: %s", strerror(-r));
- return r;
- }
-
- return 0;
-}
-
-static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
- NetDev *netdev = userdata;
+int config_parse_tunnel_address(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) {
+ NetDev *n = data;
+ unsigned char family = AF_INET;
int r;
- assert(netdev->state != _NETDEV_STATE_INVALID);
-
- r = sd_rtnl_message_get_errno(m);
- if (r == -EEXIST)
- r = netdev_getlink(netdev);
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+ r = net_parse_inaddr(rvalue, &family, n);
if (r < 0) {
- log_warning_netdev(netdev, "netdev failed: %s", strerror(-r));
- netdev_enter_failed(netdev);
-
- return 1;
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Tunnel address is invalid, ignoring assignment: %s", rvalue);
+ return 0;
}
-
- return 1;
+ return 0;
}
static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
@@ -247,7 +270,7 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
assert(netdev);
assert(!(netdev->kind == NETDEV_KIND_VLAN || netdev->kind == NETDEV_KIND_MACVLAN) ||
(link && callback));
- assert(netdev->name);
+ assert(netdev->ifname);
assert(netdev->manager);
assert(netdev->manager->rtnl);
@@ -269,7 +292,7 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
}
}
- r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->name);
+ r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->ifname);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_IFNAME attribute: %s",
@@ -277,6 +300,16 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
return r;
}
+ if(netdev->mtu) {
+ r = sd_rtnl_message_append_u32(req, IFLA_MTU, netdev->mtu);
+ if (r < 0) {
+ log_error_netdev(netdev,
+ "Could not append IFLA_MTU attribute: %s",
+ strerror(-r));
+ return r;
+ }
+ }
+
r = sd_rtnl_message_open_container(req, IFLA_LINKINFO);
if (r < 0) {
log_error_netdev(netdev,
@@ -353,11 +386,20 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
}
int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
+ int r;
+
if (netdev->kind == NETDEV_KIND_VLAN || netdev->kind == NETDEV_KIND_MACVLAN)
return netdev_create(netdev, link, callback);
+ if(netdev->kind == NETDEV_KIND_IPIP ||
+ netdev->kind == NETDEV_KIND_GRE ||
+ netdev->kind == NETDEV_KIND_SIT)
+ return netdev_create_tunnel(link, netdev_create_handler);
+
if (netdev->state == NETDEV_STATE_READY) {
- netdev_enslave_ready(netdev, link, callback);
+ r = netdev_enslave_ready(netdev, link, callback);
+ if (r < 0)
+ return r;
} else {
/* the netdev is not yet read, save this request for when it is*/
netdev_enslave_callback *cb;
@@ -379,17 +421,57 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
uint16_t type;
const char *kind;
char *received_kind;
+ char *received_name;
int r, ifindex;
assert(netdev);
assert(message);
r = sd_rtnl_message_get_type(message, &type);
- if (r < 0)
+ if (r < 0) {
+ log_error_netdev(netdev, "Could not get rtnl message type");
return r;
+ }
- if (type != RTM_NEWLINK)
+ if (type != RTM_NEWLINK) {
+ log_error_netdev(netdev, "Can not set ifindex from unexpected rtnl message type");
return -EINVAL;
+ }
+
+ r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
+ if (r < 0) {
+ log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
+ netdev_enter_failed(netdev);
+ return r;
+ } else if (ifindex <= 0) {
+ log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex);
+ netdev_enter_failed(netdev);
+ return r;
+ }
+
+ if (netdev->ifindex > 0) {
+ if (netdev->ifindex != ifindex) {
+ log_error_netdev(netdev, "Could not set ifindex to %d, already set to %d",
+ ifindex, netdev->ifindex);
+ netdev_enter_failed(netdev);
+ return -EEXIST;
+ } else
+ /* ifindex already set to the same for this netdev */
+ return 0;
+ }
+
+ r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &received_name);
+ if (r < 0) {
+ log_error_netdev(netdev, "Could not get IFNAME");
+ return r;
+ }
+
+ if (!streq(netdev->ifname, received_name)) {
+ log_error_netdev(netdev, "Received newlink with wrong IFNAME %s",
+ received_name);
+ netdev_enter_failed(netdev);
+ return r;
+ }
r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO);
if (r < 0) {
@@ -403,6 +485,12 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
return r;
}
+ r = sd_rtnl_message_exit_container(message);
+ if (r < 0) {
+ log_error_netdev(netdev, "Could not exit container");
+ return r;
+ }
+
kind = netdev_kind_to_string(netdev->kind);
if (!kind) {
log_error_netdev(netdev, "Could not get kind");
@@ -411,63 +499,55 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
}
if (!streq(kind, received_kind)) {
- log_error_netdev(netdev, "Received newlink with wrong KIND");
- netdev_enter_failed(netdev);
- return r;
- }
-
- r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
- if (r < 0) {
- log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
- netdev_enter_failed(netdev);
- return r;
- } else if (ifindex <= 0) {
- log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex);
+ log_error_netdev(netdev, "Received newlink with wrong KIND %s, "
+ "expected %s", received_kind, kind);
netdev_enter_failed(netdev);
return r;
}
- if (netdev->ifindex > 0) {
- if (netdev->ifindex == ifindex)
- return 0;
- else
- return -EEXIST;
- }
-
netdev->ifindex = ifindex;
+ log_debug_netdev(netdev, "netdev has index %d", netdev->ifindex);
+
netdev_enter_ready(netdev);
return 0;
}
static int netdev_load_one(Manager *manager, const char *filename) {
- _cleanup_netdev_free_ NetDev *netdev = NULL;
+ _cleanup_netdev_unref_ NetDev *netdev = NULL;
_cleanup_fclose_ FILE *file = NULL;
int r;
assert(manager);
assert(filename);
+ if (null_or_empty_path(filename)) {
+ log_debug("skipping empty file: %s", filename);
+ return 0;
+ }
+
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
return 0;
else
- return errno;
+ return -errno;
}
netdev = new0(NetDev, 1);
if (!netdev)
return log_oom();
+ netdev->n_ref = 1;
netdev->manager = manager;
netdev->state = _NETDEV_STATE_INVALID;
netdev->kind = _NETDEV_KIND_INVALID;
netdev->macvlan_mode = _NETDEV_MACVLAN_MODE_INVALID;
netdev->vlanid = VLANID_MAX + 1;
+ netdev->tunnel_pmtudisc = true;
- r = config_parse(NULL, filename, file, "Match\0NetDev\0VLAN\0MACVLAN\0",
+ r = config_parse(NULL, filename, file, "Match\0NetDev\0VLAN\0MACVLAN\0Tunnel\0Peer\0",
config_item_perf_lookup, (void*) network_netdev_gperf_lookup,
false, false, netdev);
if (r < 0) {
@@ -480,7 +560,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
return 0;
}
- if (!netdev->name) {
+ if (!netdev->ifname) {
log_warning("NetDev without Name configured in %s. Ignoring", filename);
return 0;
}
@@ -513,19 +593,27 @@ static int netdev_load_one(Manager *manager, const char *filename) {
NULL, NULL, NULL, NULL, NULL, NULL) <= 0)
return 0;
- r = hashmap_put(netdev->manager->netdevs, netdev->name, netdev);
+ r = hashmap_put(netdev->manager->netdevs, netdev->ifname, netdev);
if (r < 0)
return r;
LIST_HEAD_INIT(netdev->callbacks);
+ if(netdev->kind == NETDEV_KIND_VETH)
+ return netdev_create_veth(netdev, netdev_create_handler);
+
if (netdev->kind != NETDEV_KIND_VLAN &&
- netdev->kind != NETDEV_KIND_MACVLAN) {
+ netdev->kind != NETDEV_KIND_MACVLAN &&
+ netdev->kind != NETDEV_KIND_IPIP &&
+ netdev->kind != NETDEV_KIND_GRE &&
+ netdev->kind != NETDEV_KIND_SIT) {
r = netdev_create(netdev, NULL, NULL);
if (r < 0)
return r;
}
+ log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind));
+
netdev = NULL;
return 0;
@@ -539,7 +627,7 @@ int netdev_load(Manager *manager) {
assert(manager);
while ((netdev = hashmap_first(manager->netdevs)))
- netdev_free(netdev);
+ netdev_unref(netdev);
r = conf_files_list_strv(&files, ".netdev", NULL, network_dirs);
if (r < 0) {