Skip to content

[Pick][0.8 to 0.9] | Simplify do_resolver #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Coldwings wants to merge 1 commit into
base: release/0.9
Choose a base branch
from
Open

[Pick][0.8 to 0.9] | Simplify do_resolver #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions net/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ class DefaultResolver : public Resolver {
};
IPAddr do_resolve(std::string_view host, Delegate<bool, IPAddr> filter) {
auto ctr = [&]() -> IPAddrList* {
<<<<<<< HEAD
auto addrs = new IPAddrList();
photon::semaphore sem;
std::thread([&]() {
Expand All @@ -293,6 +294,33 @@ class DefaultResolver : public Resolver {
}).detach();
sem.wait(1, resolve_timeout_);
return addrs;
=======
std::unique_ptr<IPAddrList> addrs(new IPAddrList());
auto ctx = std::make_shared<ResolveCtx>();
ctx->addrs = addrs.get();
ctx->host = std::string(host);
ctx->filter = filter;
std::thread([ctx]() {
auto cb = [&](IPAddr addr) -> int {
SCOPED_LOCK(ctx->lock);
if (ctx->filter && !ctx->filter.fire(addr)) return 0;
if (ctx->addrs) {
ctx->addrs->push_back(new IPAddrNode(addr));
}
return 0;
};
_gethostbyname(ctx->host, cb);
ctx->sem.signal(1);
}).detach();
ctx->sem.wait(1, resolve_timeout_);
SCOPED_LOCK(ctx->lock);
ctx->addrs = nullptr;
ctx->filter = {};
if (addrs->empty()) {
return nullptr;
}
return addrs.release();
>>>>>>> ba6d32b (Simplify do_resolver)
};
auto ips = dnscache_.borrow(host, ctr);
if (ips->empty()) LOG_ERRNO_RETURN(0, IPAddr(), "Domain resolution for '`' failed", host);
Expand Down