From 6550aa844c8763d584cedd05561eae432f875b68 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Sun, 7 Mar 2021 17:43:44 -0500
Subject: [PATCH] try to unbreak more

---
 llarp/dns/unbound_resolver.cpp | 10 +++++-----
 llarp/handlers/tun.cpp         |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/llarp/dns/unbound_resolver.cpp b/llarp/dns/unbound_resolver.cpp
index 6155f4663..946cdfdba 100644
--- a/llarp/dns/unbound_resolver.cpp
+++ b/llarp/dns/unbound_resolver.cpp
@@ -9,8 +9,8 @@ namespace llarp::dns
   {
     std::weak_ptr<UnboundResolver> resolver;
     Message msg;
-    SockAddr source;
-    SockAddr replyFrom;
+    SockAddr resolverAddr;
+    SockAddr askerAddr;
   };
 
   void
@@ -56,7 +56,7 @@ namespace llarp::dns
     {
       Message& msg = lookup->msg;
       msg.AddServFail();
-      this_ptr->failFunc(lookup->replyFrom, lookup->source, msg);
+      this_ptr->failFunc(lookup->resolverAddr, lookup->askerAddr, msg);
       ub_resolve_free(result);
       return;
     }
@@ -71,7 +71,7 @@ namespace llarp::dns
     buf.cur = buf.base;
     hdr.Encode(&buf);
 
-    this_ptr->replyFunc(lookup->replyFrom, lookup->source, std::move(pkt));
+    this_ptr->replyFunc(lookup->resolverAddr, lookup->askerAddr, std::move(pkt));
 
     ub_resolve_free(result);
   }
@@ -126,7 +126,7 @@ namespace llarp::dns
     }
 
     const auto& q = msg.questions[0];
-    auto* lookup = new PendingUnboundLookup{weak_from_this(), msg, from, to};
+    auto* lookup = new PendingUnboundLookup{weak_from_this(), msg, to, from};
     int err = ub_resolve_async(
         unboundContext,
         q.Name().c_str(),
diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp
index 8aa19cd23..a711c0d06 100644
--- a/llarp/handlers/tun.cpp
+++ b/llarp/handlers/tun.cpp
@@ -102,8 +102,8 @@ namespace llarp
         const uint8_t* ptr = pkt.buf + ip_header_size;
         const auto dst = ToNet(pkt.dstv4());
         const auto src = ToNet(pkt.srcv4());
-        const SockAddr raddr{src.n, *reinterpret_cast<const uint16_t*>(ptr)};
-        const SockAddr laddr{dst.n, *reinterpret_cast<const uint16_t*>(ptr + 2)};
+        const SockAddr laddr{src.n, *reinterpret_cast<const uint16_t*>(ptr)};
+        const SockAddr raddr{dst.n, *reinterpret_cast<const uint16_t*>(ptr + 2)};
 
         OwnedBuffer buf{pkt.sz - (udp_header_size + ip_header_size)};
         std::copy_n(ptr + udp_header_size, buf.sz, buf.buf.get());