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=717ecdf0e5a6af5dae090486efd42435cae55f1a;hp=762eff2f6287625f52652e5450a0a7eaf2662661;hb=a21df104887552e8558d6c11388dff466641a031;hpb=ba5596ec2ed65943b66d42fbe6e9ef7ebc79216c diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 762eff2f6..717ecdf0e 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -25,6 +25,7 @@ #include "conf-files.h" #include "conf-parser.h" #include "list.h" +#include "siphash24.h" #define VLANID_MAX 4094 @@ -161,89 +162,67 @@ static int netdev_enter_ready(NetDev *netdev) { 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 failed: %s", strerror(-r)); + netdev_enter_failed(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; +#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(NetDev *netdev, struct ether_addr *mac) { + uint8_t result[8]; + size_t l, sz; + uint8_t *v; int r; - assert(netdev->manager); - assert(netdev->manager->rtnl); + assert(netdev); assert(netdev->name); + assert(mac); - 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; - } + l = strlen(netdev->name); + sz = sizeof(sd_id128_t) + l; + v = alloca(sz); - 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)); + /* fetch some persistent data unique to the machine */ + r = sd_id128_get_machine((sd_id128_t*) v); + if (r < 0) return r; - } - return 0; -} + /* combine with some data unique (on this machine) to this + * netdev */ + memcpy(v + sizeof(sd_id128_t), netdev->name, l); -static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - NetDev *netdev = userdata; - int r; + /* 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(netdev->state != _NETDEV_STATE_INVALID); + assert_cc(ETH_ALEN <= sizeof(result)); + memcpy(mac->ether_addr_octet, result, ETH_ALEN); - r = sd_rtnl_message_get_errno(m); - if (r == -EEXIST) - r = netdev_getlink(netdev); - - if (r < 0) { - log_warning_netdev(netdev, "netdev failed: %s", strerror(-r)); - netdev_enter_failed(netdev); + /* 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) */ - return 1; - } - - return 1; + return 0; } static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; + struct ether_addr mac; const char *kind; int r; @@ -254,6 +233,12 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c assert(netdev->manager); assert(netdev->manager->rtnl); + r = netdev_get_mac(netdev, &mac); + if (r < 0) { + log_error("Failed to generate predictable MAC address for %s", netdev->name); + return r; + } + r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_NEWLINK, 0); if (r < 0) { log_error_netdev(netdev, @@ -280,6 +265,14 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c return r; } + r = sd_rtnl_message_append_ether_addr(req, IFLA_ADDRESS, &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, @@ -382,6 +375,7 @@ 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); @@ -398,6 +392,42 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { 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->name, 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) { log_error_netdev(netdev, "Could not get LINKINFO"); @@ -410,6 +440,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"); @@ -418,29 +454,12 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { } if (!streq(kind, received_kind)) { - log_error_netdev(netdev, "Received newlink with wrong KIND"); + log_error_netdev(netdev, "Received newlink with wrong KIND %s, " + "expected %s", received_kind, 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); - netdev_enter_failed(netdev); - return r; - } - - if (netdev->ifindex > 0 && 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; - } - netdev->ifindex = ifindex; netdev_enter_ready(netdev); @@ -461,7 +480,7 @@ static int netdev_load_one(Manager *manager, const char *filename) { if (errno == ENOENT) return 0; else - return errno; + return -errno; } netdev = new0(NetDev, 1);