From: Tom Gundersen Date: Fri, 3 Jan 2014 17:27:26 +0000 (+0100) Subject: networkd: link hash uses 64, not 32 bit keys X-Git-Tag: v209~553 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8b264404b6cc412d3a588ca1b54fd2c1b09c5270;p=elogind.git networkd: link hash uses 64, not 32 bit keys --- diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 7b0c5d765..4e2cf4579 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -241,6 +241,7 @@ int manager_udev_listen(Manager *m) { static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { Manager *m = userdata; Link *link; + uint64_t ifindex_64; int r, ifindex; r = sd_rtnl_message_link_get_ifindex(message, &ifindex); @@ -249,9 +250,10 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo return 0; } - link = hashmap_get(m->links, &ifindex); + ifindex_64 = ifindex; + link = hashmap_get(m->links, &ifindex_64); if (!link) { - log_debug("received RTM_NEWLINK message for ifindex we are not tracking (%d)", ifindex); + log_debug("received RTM_NEWLINK message for untracked ifindex %d", ifindex); return 0; } @@ -261,7 +263,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo if (r < 0) return 0; } else - log_debug("received RTM_NEWLINK message for link we are not managing (%d)", ifindex); + log_debug("%s: received RTM_NEWLINK message for unmanaged link", link->ifname); return 1; }