From: Dan van der Ster Date: Tue, 23 Mar 2021 08:00:11 +0000 (+0100) Subject: common/ipaddr: also skip just `lo` X-Git-Tag: v15.2.13~13^2~4^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef5a12e77744c4b4c58f3bc1127360f4fc31b527;p=ceph.git common/ipaddr: also skip just `lo` Skip iface's with name like 'lo' or of the form 'lo:0', 'lo:1'. This brings back the original behavior from b6d0fc9e0e515e50894c08217d688a8c94db7570 Signed-off-by: Dan van der Ster Fixes: https://tracker.ceph.com/issues/49938 (cherry picked from commit 6147c0917157efd2d35610e759685656a4989abb) --- diff --git a/src/common/ipaddr.cc b/src/common/ipaddr.cc index 520b7aea1a69..0abf7f20ca71 100644 --- a/src/common/ipaddr.cc +++ b/src/common/ipaddr.cc @@ -56,7 +56,7 @@ const struct ifaddrs *find_ipv4_in_subnet(const struct ifaddrs *addrs, if (addrs->ifa_addr == NULL) continue; - if (boost::starts_with(addrs->ifa_name, "lo:")) + if (strcmp(addrs->ifa_name, "lo") == 0 || boost::starts_with(addrs->ifa_name, "lo:")) continue; if (numa_node >= 0 && !match_numa_node(addrs->ifa_name, numa_node)) @@ -103,7 +103,7 @@ const struct ifaddrs *find_ipv6_in_subnet(const struct ifaddrs *addrs, if (addrs->ifa_addr == NULL) continue; - if (boost::starts_with(addrs->ifa_name, "lo")) + if (strcmp(addrs->ifa_name, "lo") == 0 || boost::starts_with(addrs->ifa_name, "lo:")) continue; if (numa_node >= 0 && !match_numa_node(addrs->ifa_name, numa_node))