8000 Take into account address family when resolving DHT node address by tatsuhiro-t · Pull Request #794 · aria2/aria2 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Take into account address family when resolving DHT node address #794

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

Merged
merged 1 commit into from
Dec 4, 2016
Merged

Take into account address family when resolving DHT node address #794

Show file tree
Hide file tree
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
39 changes: 16 additions & 23 deletions src/DHTEntryPointNameResolveCommand.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
namespace aria2 {

DHTEntryPointNameResolveCommand::DHTEntryPointNameResolveCommand(
cuid_t cuid, DownloadEngine* e,
cuid_t cuid, DownloadEngine* e, int family,
const std::vector<std::pair<std::string, uint16_t>>& entryPoints)
: Command{cuid},
e_{e},
Expand All @@ -68,11 +68,14 @@ DHTEntryPointNameResolveCommand::DHTEntryPointNameResolveCommand(
taskFactory_{nullptr},
routingTable_{nullptr},
entryPoints_(std::begin(entryPoints), std::end(entryPoints)),
family_{family},
numSuccess_{0},
bootstrapEnabled_{false}
{
#ifdef ENABLE_ASYNC_DNS
configureAsyncNameResolverMan(asyncNameResolverMan_.get(), e_->getOption());
asyncNameResolverMan_->setIPv4(family_ == AF_INET);
asyncNameResolverMan_->setIPv6(family_ == AF_INET6);
#endif // ENABLE_ASYNC_DNS
}

Expand All @@ -93,28 +96,20 @@ bool DHTEntryPointNameResolveCommand::execute()
if (e_->getOption()->getAsBool(PREF_ASYNC_DNS)) {
while (!entryPoints_.empty()) {
std::string hostname = entryPoints_.front().first;
if (util::isNumericHost(hostname)) {
++numSuccess_;
std::pair<std::string, uint16_t> p(hostname,
entryPoints_.front().second);
addPingTask(p);
std::vector<std::string> res;
int rv = resolveHostname(res, hostname);
if (rv == 0) {
e_->addCommand(std::unique_ptr<Command>(this));
return false;
}
else {
std::vector<std::string> res;
int rv = resolveHostname(res, hostname);
if (rv == 0) {
e_->addCommand(std::unique_ptr<Command>(this));
return false;
}
else {
if (rv == 1) {
++numSuccess_;
std::pair<std::string, uint16_t> p(res.front(),
entryPoints_.front().second);
addPingTask(p);
}
asyncNameResolverMan_->reset(e_, this);
if (rv == 1) {
++numSuccess_;
std::pair<std::string, uint16_t> p(res.front(),
entryPoints_.front().second);
addPingTask(p);
}
asyncNameResolverMan_->reset(e_, this);
}
entryPoints_.pop_front();
}
Expand All @@ -124,9 +119,7 @@ bool DHTEntryPointNameResolveCommand::execute()
{
NameResolver res;
res.setSocktype(SOCK_DGRAM);
if (e_->getOption()->getAsBool(PREF_DISABLE_IPV6)) {
res.setFamily(AF_INET);
}
res.setFamily(family_);
while (!entryPoints_.empty()) {
std::string hostname = entryPoints_.front().first;
try {
Expand Down
4 changes: 3 additions & 1 deletion src/DHTEntryPointNameResolveCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ class DHTEntryPointNameResolveCommand : public Command {

std::deque<std::pair<std::string, uint16_t>> entryPoints_;

int family_;

int numSuccess_;

bool bootstrapEnabled_;
Expand All @@ -85,7 +87,7 @@ class DHTEntryPointNameResolveCommand : public Command {

public:
DHTEntryPointNameResolveCommand(
cuid_t cuid, DownloadEngine* e,
cuid_t cuid, DownloadEngine* e, int family,
const std::vector<std::pair<std::string, uint16_t>>& entryPoints);

virtual ~DHTEntryPointNameResolveCommand();
Expand Down
2 changes: 1 addition & 1 deletion src/DHTSetup.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ DHTSetup::setup(DownloadEngine* e, int family)
std::vector<std::pair<std::string, uint16_t>> entryPoints;
entryPoints.push_back(addr);
auto command = make_unique<DHTEntryPointNameResolveCommand>(
e->newCUID(), e, entryPoints);
e->newCUID(), e, family, entryPoints);
command->setBootstrapEnabled(true);
command->setTaskQueue(taskQueue.get());
command->setTaskFactory(taskFactory.get());
Expand Down
32 changes: 22 additions & 10 deletions src/RequestGroup.cc
View file
Open in desktop
93B6
Original file line number Diff line number Diff line change
Expand Up @@ -371,16 +371,28 @@ void RequestGroup::createInitialCommand(
}
}
const auto& nodes = torrentAttrs->nodes;
// TODO Are nodes in torrent IPv4 only?
if (!torrentAttrs->privateTorrent && !nodes.empty() &&
DHTRegistry::isInitialized()) {
auto command = make_unique<DHTEntryPointNameResolveCommand>(
e->newCUID(), e, nodes);
command->setTaskQueue(DHTRegistry::getData().taskQueue.get());
command->setTaskFactory(DHTRegistry::getData().taskFactory.get());
command->setRoutingTable(DHTRegistry::getData().routingTable.get());
command->setLocalNode(DHTRegistry::getData().localNode);
e->addCommand(std::move(command));
if (!torrentAttrs->privateTorrent && !nodes.empty()) {
if (DHTRegistry::isInitialized()) {
auto command = make_unique<DHTEntryPointNameResolveCommand>(
e->newCUID(), e, AF_INET, nodes);
const auto& data = DHTRegistry::getData();
command->setTaskQueue(data.taskQueue.get());
command->setTaskFactory(data.taskFactory.get());
command->setRoutingTable(data.routingTable.get());
command->setLocalNode(data.localNode);
e->addCommand(std::move(command));
}

if (DHTRegistry::isInitialized6()) {
auto command = make_unique<DHTEntryPointNameResolveCommand>(
e->newCUID(), e, AF_INET6, nodes);
const auto& data = DHTRegistry::getData6();
command->setTaskQueue(data.taskQueue.get());
command->setTaskFactory(data.taskFactory.get());
command->setRoutingTable(data.routingTable.get());
command->setLocalNode(data.localNode);
e->addCommand(std::move(command));
}
}
}
else if (metadataGetMode) {
Expand Down
0