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=5ee257f984b815a97e3a2a4896acccf8fc200e13;hp=075a8790a091f442f6ad6a65ec946d3f3a5beaca;hb=b226d99b044222739dccfa9cf9f7a9d79576c407;hpb=cdc85c875b842b9309f72caefc51c262f521cf92 diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 075a8790a..5ee257f98 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -25,7 +25,6 @@ #include "conf-files.h" #include "conf-parser.h" #include "list.h" -#include "siphash24.h" #define VLANID_MAX 4094 @@ -49,7 +48,7 @@ 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_free(NetDev *netdev) { netdev_enslave_callback *callback; if (!netdev) @@ -76,6 +75,20 @@ 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; +} + int netdev_get(Manager *manager, const char *name, NetDev **ret) { NetDev *netdev; @@ -155,7 +168,7 @@ static int netdev_enter_ready(NetDev *netdev) { 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); } @@ -181,48 +194,8 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda return 1; } -#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); - assert(netdev->name); - assert(mac); - - l = strlen(netdev->name); - 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), netdev->name, 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) */ - - 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; @@ -233,12 +206,6 @@ 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, @@ -265,14 +232,6 @@ 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, @@ -349,11 +308,15 @@ 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->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; @@ -375,6 +338,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); @@ -391,6 +355,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"); @@ -417,29 +417,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"); - 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 && 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); @@ -448,13 +431,18 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) { } 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) @@ -467,6 +455,7 @@ static int netdev_load_one(Manager *manager, const char *filename) { if (!netdev) return log_oom(); + netdev->n_ref = 1; netdev->manager = manager; netdev->state = _NETDEV_STATE_INVALID; netdev->kind = _NETDEV_KIND_INVALID; @@ -532,6 +521,8 @@ static int netdev_load_one(Manager *manager, const char *filename) { return r; } + log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind)); + netdev = NULL; return 0; @@ -545,7 +536,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) {