Move code to correct home

CMakeLists.txt

@@ -501,7 +501,6 @@ set(LIB_SRC
   llarp/crypto/types.cpp
   llarp/dht/bucket.cpp
   llarp/dht/context.cpp
-  llarp/dht/dht_immediate.cpp
   llarp/dht/dht.cpp
   llarp/dht/kademlia.cpp
   llarp/dht/key.cpp
@@ -611,6 +610,7 @@ set(TEST_SRC
   test/dht/test_llarp_dht_bucket.cpp
   test/dht/test_llarp_dht_kademlia.cpp
   test/dht/test_llarp_dht_key.cpp
+  test/dht/test_llarp_dht_txowner.cpp
   test/dns/test_llarp_dns_dns.cpp
   test/exit/test_llarp_exit_context.cpp
   test/link/test_llarp_link.cpp

llarp/dht/dht_immediate.cpp

@@ -1,86 +0,0 @@
-#include <messages/dht_immediate.hpp>
-
-#include <router/router.hpp>
-
-namespace llarp
-{
-  DHTImmediateMessage::~DHTImmediateMessage()
-  {
-  }
-
-  void
-  DHTImmediateMessage::Clear()
-  {
-    msgs.clear();
-  }
-
-  bool
-  DHTImmediateMessage::DecodeKey(llarp_buffer_t key, llarp_buffer_t *buf)
-  {
-    if(llarp_buffer_eq(key, "m"))
-      return llarp::dht::DecodeMesssageList(dht::Key_t(session->GetPubKey()),
-                                            buf, msgs);
-    if(llarp_buffer_eq(key, "v"))
-    {
-      if(!bencode_read_integer(buf, &version))
-        return false;
-      return version == LLARP_PROTO_VERSION;
-    }
-    // bad key
-    return false;
-  }
-
-  bool
-  DHTImmediateMessage::BEncode(llarp_buffer_t *buf) const
-  {
-    if(!bencode_start_dict(buf))
-      return false;
-
-    // message type
-    if(!bencode_write_bytestring(buf, "a", 1))
-      return false;
-    if(!bencode_write_bytestring(buf, "m", 1))
-      return false;
-
-    // dht messages
-    if(!bencode_write_bytestring(buf, "m", 1))
-      return false;
-    // begin list
-    if(!bencode_start_list(buf))
-      return false;
-    for(const auto &msg : msgs)
-    {
-      if(!msg->BEncode(buf))
-        return false;
-    }
-    // end list
-    if(!bencode_end(buf))
-      return false;
-
-    // protocol version
-    if(!bencode_write_version_entry(buf))
-      return false;
-
-    return bencode_end(buf);
-  }
-
-  bool
-  DHTImmediateMessage::HandleMessage(llarp::Router *router) const
-  {
-    DHTImmediateMessage reply;
-    reply.session = session;
-    bool result   = true;
-    for(auto &msg : msgs)
-    {
-      result &= msg->HandleMessage(router->dht, reply.msgs);
-    }
-    if(reply.msgs.size())
-    {
-      if(result)
-      {
-        result = router->SendToOrQueue(session->GetPubKey(), &reply);
-      }
-    }
-    return result;
-  }
-}  // namespace llarp

llarp/messages/dht_immediate.cpp

@@ -1 +1,86 @@
 #include <messages/dht_immediate.hpp>
+
+#include <router/router.hpp>
+
+namespace llarp
+{
+  DHTImmediateMessage::~DHTImmediateMessage()
+  {
+  }
+
+  void
+  DHTImmediateMessage::Clear()
+  {
+    msgs.clear();
+  }
+
+  bool
+  DHTImmediateMessage::DecodeKey(llarp_buffer_t key, llarp_buffer_t *buf)
+  {
+    if(llarp_buffer_eq(key, "m"))
+      return llarp::dht::DecodeMesssageList(dht::Key_t(session->GetPubKey()),
+                                            buf, msgs);
+    if(llarp_buffer_eq(key, "v"))
+    {
+      if(!bencode_read_integer(buf, &version))
+        return false;
+      return version == LLARP_PROTO_VERSION;
+    }
+    // bad key
+    return false;
+  }
+
+  bool
+  DHTImmediateMessage::BEncode(llarp_buffer_t *buf) const
+  {
+    if(!bencode_start_dict(buf))
+      return false;
+
+    // message type
+    if(!bencode_write_bytestring(buf, "a", 1))
+      return false;
+    if(!bencode_write_bytestring(buf, "m", 1))
+      return false;
+
+    // dht messages
+    if(!bencode_write_bytestring(buf, "m", 1))
+      return false;
+    // begin list
+    if(!bencode_start_list(buf))
+      return false;
+    for(const auto &msg : msgs)
+    {
+      if(!msg->BEncode(buf))
+        return false;
+    }
+    // end list
+    if(!bencode_end(buf))
+      return false;
+
+    // protocol version
+    if(!bencode_write_version_entry(buf))
+      return false;
+
+    return bencode_end(buf);
+  }
+
+  bool
+  DHTImmediateMessage::HandleMessage(llarp::Router *router) const
+  {
+    DHTImmediateMessage reply;
+    reply.session = session;
+    bool result   = true;
+    for(auto &msg : msgs)
+    {
+      result &= msg->HandleMessage(router->dht, reply.msgs);
+    }
+    if(reply.msgs.size())
+    {
+      if(result)
+      {
+        result = router->SendToOrQueue(session->GetPubKey(), &reply);
+      }
+    }
+    return result;
+  }
+}  // namespace llarp