Commit ba98f34d authored by jan.koester's avatar jan.koester
Browse files

test

parent a9d7662f
Loading
Loading
Loading
Loading
+6 −3
Changes for src/network.cpp: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -381,11 +381,14 @@ std::vector<std::string> NetworkManager::enumInterfaces() {
        // devices are (links to) directories; bonding_masters is a file
        if (!entry.is_directory(ec)) continue;
        std::string name = entry.path().filename().string();
        // Skip loopback and virtual interfaces
        if (name == "lo" || name.find("sit") == 0 || name.find("tun") == 0 ||
        // Skip loopback and virtual interfaces others manage (Docker's br-*,
        // libvirt's virbr*, containers' veth*) -- but never a device of one
        // of our own .netdev files, whatever its name (a bridge br-lan)
        bool foreign = name.find("sit") == 0 || name.find("tun") == 0 ||
                       name.find("tap") == 0 || name.find("veth") == 0 ||
                       name.find("docker") == 0 || name.find("br-") == 0 ||
            name.find("virbr") == 0)
                       name.find("virbr") == 0;
        if (name == "lo" || (foreign && !findNetDev(name)))
            continue;
        result.push_back(name);
    }