X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=2fff962b58a8ae8fb24ab7c865a8046b5c126772;hp=4439374a675490ea7b6fe09becc9f1fca6a688c7;hb=9e358851b470a1994287c8cb1d9eb78837faaf60;hpb=a9f434cf00d1d36d9a013b9739efe69653dd7279 diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 4439374a6..2fff962b5 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -27,6 +27,7 @@ #include "conf-files.h" #include "conf-parser.h" #include "list.h" +#include "siphash24.h" #define VLANID_MAX 4094 @@ -35,10 +36,13 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { [NETDEV_KIND_BOND] = "bond", [NETDEV_KIND_VLAN] = "vlan", [NETDEV_KIND_MACVLAN] = "macvlan", + [NETDEV_KIND_VXLAN] = "vxlan", [NETDEV_KIND_IPIP] = "ipip", [NETDEV_KIND_GRE] = "gre", [NETDEV_KIND_SIT] = "sit", [NETDEV_KIND_VETH] = "veth", + [NETDEV_KIND_VTI] = "vti", + [NETDEV_KIND_DUMMY] = "dummy", }; DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind); @@ -91,6 +95,9 @@ static void netdev_free(NetDev *netdev) { free(netdev->description); free(netdev->ifname); + free(netdev->ifname_peer); + free(netdev->mac); + free(netdev->mac_peer); condition_free_list(netdev->match_host); condition_free_list(netdev->match_virt); @@ -215,8 +222,10 @@ static int netdev_enter_ready(NetDev *netdev) { return 0; } + +/* callback for netdev's created without a backing Link */ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - NetDev *netdev = userdata; + _cleanup_netdev_unref_ NetDev *netdev = userdata; int r; assert(netdev->state != _NETDEV_STATE_INVALID); @@ -300,7 +309,7 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c return r; } - if(netdev->mtu) { + if (netdev->mtu) { r = sd_rtnl_message_append_u32(req, IFLA_MTU, netdev->mtu); if (r < 0) { log_error_netdev(netdev, @@ -310,6 +319,16 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c } } + if (netdev->mac) { + r = sd_rtnl_message_append_ether_addr(req, IFLA_ADDRESS, netdev->mac); + if (r < 0) { + log_error_netdev(netdev, + "Colud not append IFLA_ADDRESS attribute: %s", + strerror(-r)); + return r; + } + } + r = sd_rtnl_message_open_container(req, IFLA_LINKINFO); if (r < 0) { log_error_netdev(netdev, @@ -370,9 +389,11 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c if (link) r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL); - else + else { r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL); - if (r < 0) { + + netdev_ref(netdev); + } if (r < 0) { log_error_netdev(netdev, "Could not send rtnetlink message: %s", strerror(-r)); return r; @@ -385,16 +406,24 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c return 0; } +/* the callback must be called, possibly after a timeout, as otherwise the Link will hang */ 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) + switch(netdev->kind) { + case NETDEV_KIND_VLAN: + case 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); + case NETDEV_KIND_VXLAN: + return netdev_create_vxlan(netdev, link, callback); + case NETDEV_KIND_IPIP: + case NETDEV_KIND_GRE: + case NETDEV_KIND_SIT: + case NETDEV_KIND_VTI: + return netdev_create_tunnel(netdev, link, callback); + default: + break; + } if (netdev->state == NETDEV_STATE_READY) { r = netdev_enslave_ready(netdev, link, callback); @@ -514,6 +543,52 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { return 0; } +#define HASH_KEY SD_ID128_MAKE(52,e1,45,bd,00,6f,29,96,21,c6,30,6d,83,71,04,48) + +static int netdev_get_mac(const char *ifname, struct ether_addr **ret) { + _cleanup_free_ struct ether_addr *mac = NULL; + uint8_t result[8]; + size_t l, sz; + uint8_t *v; + int r; + + assert(ifname); + assert(ret); + + mac = new0(struct ether_addr, 1); + if (!mac) + return -ENOMEM; + + l = strlen(ifname); + sz = sizeof(sd_id128_t) + l; + v = alloca(sz); + + /* fetch some persistent data unique to the machine */ + r = sd_id128_get_machine((sd_id128_t*) v); + if (r < 0) + return r; + + /* combine with some data unique (on this machine) to this + * netdev */ + memcpy(v + sizeof(sd_id128_t), ifname, l); + + /* Let's hash the host machine ID plus the container name. We + * use a fixed, but originally randomly created hash key here. */ + siphash24(result, v, sz, HASH_KEY.bytes); + + assert_cc(ETH_ALEN <= sizeof(result)); + memcpy(mac->ether_addr_octet, result, ETH_ALEN); + + /* see eth_random_addr in the kernel */ + mac->ether_addr_octet[0] &= 0xfe; /* clear multicast bit */ + mac->ether_addr_octet[0] |= 0x02; /* set local assignment bit (IEEE802) */ + + *ret = mac; + mac = NULL; + + return 0; +} + static int netdev_load_one(Manager *manager, const char *filename) { _cleanup_netdev_unref_ NetDev *netdev = NULL; _cleanup_fclose_ FILE *file = NULL; @@ -545,9 +620,12 @@ static int netdev_load_one(Manager *manager, const char *filename) { netdev->kind = _NETDEV_KIND_INVALID; netdev->macvlan_mode = _NETDEV_MACVLAN_MODE_INVALID; netdev->vlanid = VLANID_MAX + 1; + netdev->vxlanid = VXLAN_VID_MAX + 1; netdev->tunnel_pmtudisc = true; + netdev->learning = true; - r = config_parse(NULL, filename, file, "Match\0NetDev\0VLAN\0MACVLAN\0Tunnel\0Peer\0", + r = config_parse(NULL, filename, file, + "Match\0NetDev\0VLAN\0MACVLAN\0VXLAN\0Tunnel\0Peer\0", config_item_perf_lookup, (void*) network_netdev_gperf_lookup, false, false, netdev); if (r < 0) { @@ -570,12 +648,23 @@ static int netdev_load_one(Manager *manager, const char *filename) { return 0; } + if (netdev->kind == NETDEV_KIND_VXLAN && netdev->vxlanid > VXLAN_VID_MAX) { + log_warning("VXLAN without valid Id configured in %s. Ignoring", filename); + return 0; + } + if (netdev->kind != NETDEV_KIND_VLAN && netdev->vlanid <= VLANID_MAX) { log_warning("VLAN Id configured for a %s in %s. Ignoring", netdev_kind_to_string(netdev->kind), filename); return 0; } + if (netdev->kind != NETDEV_KIND_VXLAN && netdev->vxlanid <= VXLAN_VID_MAX) { + log_warning("VXLAN Id configured for a %s in %s. Ignoring", + netdev_kind_to_string(netdev->kind), filename); + return 0; + } + if (netdev->kind != NETDEV_KIND_MACVLAN && netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) { log_warning("MACVLAN Mode configured for a %s in %s. Ignoring", @@ -593,23 +682,59 @@ static int netdev_load_one(Manager *manager, const char *filename) { NULL, NULL, NULL, NULL, NULL, NULL) <= 0) return 0; + if (!netdev->mac) { + r = netdev_get_mac(netdev->ifname, &netdev->mac); + if (r < 0) { + log_error("Failed to generate predictable MAC address for %s", + netdev->ifname); + return r; + } + } + 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); + switch (netdev->kind) { + case NETDEV_KIND_VETH: + if (!netdev->ifname_peer) { + log_warning("Veth NetDev without peer name configured " + "in %s. Ignoring", filename); + return 0; + } + + if (!netdev->mac) { + r = netdev_get_mac(netdev->ifname_peer, &netdev->mac_peer); + if (r < 0) { + log_error("Failed to generate predictable MAC address for %s", + netdev->ifname_peer); + return r; + } + } + + r = netdev_create_veth(netdev, netdev_create_handler); + if (r < 0) + return r; + + break; + case NETDEV_KIND_DUMMY: + r = netdev_create_dummy(netdev, netdev_create_handler); + if (r < 0) + return r; + + netdev_ref(netdev); - if (netdev->kind != NETDEV_KIND_VLAN && - netdev->kind != NETDEV_KIND_MACVLAN && - netdev->kind != NETDEV_KIND_IPIP && - netdev->kind != NETDEV_KIND_GRE && - netdev->kind != NETDEV_KIND_SIT) { + break; + case NETDEV_KIND_BRIDGE: + case NETDEV_KIND_BOND: r = netdev_create(netdev, NULL, NULL); if (r < 0) return r; + break; + default: + break; } log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind));