From 7b2e797fdfa27794b0f4a96bba0c42b5e67a6050 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 19 Jan 2016 10:50:21 +0900
Subject: [PATCH] Disable IPv6 on non-async NameResolver if configuration wants

---
 src/DHTEntryPointNameResolveCommand.cc | 3 +++
 src/NameResolveCommand.cc              | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/DHTEntryPointNameResolveCommand.cc b/src/DHTEntryPointNameResolveCommand.cc
index 7379ec0a..700e6d39 100644
--- a/src/DHTEntryPointNameResolveCommand.cc
+++ b/src/DHTEntryPointNameResolveCommand.cc
@@ -124,6 +124,9 @@ bool DHTEntryPointNameResolveCommand::execute()
     {
       NameResolver res;
       res.setSocktype(SOCK_DGRAM);
+      if (e_->getOption()->getAsBool(PREF_DISABLE_IPV6)) {
+        res.setFamily(AF_INET);
+      }
       while (!entryPoints_.empty()) {
         std::string hostname = entryPoints_.front().first;
         try {
diff --git a/src/NameResolveCommand.cc b/src/NameResolveCommand.cc
index 5c56b6d2..ec0ce044 100644
--- a/src/NameResolveCommand.cc
+++ b/src/NameResolveCommand.cc
@@ -105,6 +105,9 @@ bool NameResolveCommand::execute()
     {
       NameResolver resolver;
       resolver.setSocktype(SOCK_DGRAM);
+      if (e_->getOption()->getAsBool(PREF_DISABLE_IPV6)) {
+        resolver.setFamily(AF_INET);
+      }
       try {
         resolver.resolve(res, hostname);
       }