From 82d8d3c04dfa962781e4d275962cfaa68a32d746 Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Sat, 3 Nov 2018 06:22:07 -0700
Subject: [PATCH] merge

---
 llarp/dns_dotlokilookup.cpp | 78 ++++++++++++++++++-------------------
 llarp/handlers/tun.cpp      |  2 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/llarp/dns_dotlokilookup.cpp b/llarp/dns_dotlokilookup.cpp
index df3846c23..4cf53cc7f 100644
--- a/llarp/dns_dotlokilookup.cpp
+++ b/llarp/dns_dotlokilookup.cpp
@@ -80,48 +80,48 @@ llarp_dotlokilookup_checkQuery(void *u, uint64_t orig, uint64_t left)
   // in_addr ip_address = ((sockaddr_in *)free_private->hostResult)->sin_addr;
 
   llarp::service::Context *routerHiddenServiceContext =
-        (llarp::service::Context *)dll->user;
-    if(!routerHiddenServiceContext)
-    {
-      llarp::LogWarn("dotLokiLookup user isnt a service::Context: ", dll->user);
-      write404_dnss_response(qr->from, qr->request);
-      delete qr;
-      return;
-    }
+      (llarp::service::Context *)dll->user;
+  if(!routerHiddenServiceContext)
+  {
+    llarp::LogWarn("dotLokiLookup user isnt a service::Context: ", dll->user);
+    write404_dnss_response(qr->from, qr->request);
+    delete qr;
+    return;
+  }
 
-    llarp::huint32_t *tunIp =
-        new llarp::huint32_t(routerHiddenServiceContext->GetIpForAddr(addr));
-    if(!tunIp->h)
-    {
-      llarp::LogWarn("dotLokiLookup failed to map address");
-      write404_dnss_response(qr->from, qr->request);
-      delete qr;
-      return;
-    }
+  llarp::huint32_t *tunIp =
+      new llarp::huint32_t(routerHiddenServiceContext->GetIpForAddr(addr));
+  if(!tunIp->h)
+  {
+    llarp::LogWarn("dotLokiLookup failed to map address");
+    write404_dnss_response(qr->from, qr->request);
+    delete qr;
+    return;
+  }
 
-    /*
-    bool mapResult = routerHiddenServiceContext->MapAddressAll(
-        addr, free_private->hostResult);
-    if(!mapResult)
-    {
-      llarp::LogWarn("dotLokiLookup failed to map address");
-      write404_dnss_response(qr->from, qr->request);
-      delete qr;
-      return;
-    }
-    */
+  /*
+  bool mapResult = routerHiddenServiceContext->MapAddressAll(
+      addr, free_private->hostResult);
+  if(!mapResult)
+  {
+    llarp::LogWarn("dotLokiLookup failed to map address");
+    write404_dnss_response(qr->from, qr->request);
+    delete qr;
+    return;
+  }
+  */
 
-    // make a dnsd_query_hook_response for the cache
-    dnsd_query_hook_response *response = new dnsd_query_hook_response;
-    response->dontLookUp               = true;
-    response->dontSendResponse         = false;
-    // llarp::Addr test(*free_private->hostResult.getSockAddr());
-    // llarp::LogInfo("IP Test: ", test);
-    // response->returnThis = &free_private->hostResult;
-    response->returnThis = tunIp;
-    llarp::LogInfo("Saving ", qr->request->question.name);
-    loki_tld_lookup_cache[qr->request->question.name] = response;
-    // we can't delete response now...
+  // make a dnsd_query_hook_response for the cache
+  dnsd_query_hook_response *response = new dnsd_query_hook_response;
+  response->dontLookUp               = true;
+  response->dontSendResponse         = false;
+  // llarp::Addr test(*free_private->hostResult.getSockAddr());
+  // llarp::LogInfo("IP Test: ", test);
+  // response->returnThis = &free_private->hostResult;
+  response->returnThis = tunIp;
+  llarp::LogInfo("Saving ", qr->request->question.name);
+  loki_tld_lookup_cache[qr->request->question.name] = response;
+  // we can't delete response now...
 
   /*
   llarp::handlers::TunEndpoint *tunEndpoint =
diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp
index 767cec257..382a129bd 100644
--- a/llarp/handlers/tun.cpp
+++ b/llarp/handlers/tun.cpp
@@ -105,7 +105,7 @@ namespace llarp
         strncpy(tunif.ifaddr, addr.c_str(), sizeof(tunif.ifaddr) - 1);
 
         // set up address in dotLokiLookup
-        //llarp::Addr tunIp(tunif.ifaddr);
+        // llarp::Addr tunIp(tunif.ifaddr);
         llarp::huint32_t tunIpV4;
         tunIpV4.h = inet_addr(tunif.ifaddr);
         // related to dns_iptracker_setup_dotLokiLookup(&this->dll, tunIp);