4 files changed, 3 insertions, 148 deletions
diff --git a/src/common/boost_serialization_helper.h b/src/common/boost_serialization_helper.h
deleted file mode 100644
index 4a903107f..000000000
--- a/src/common/boost_serialization_helper.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) 2014-2022, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-
-#pragma once
-
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/archive/portable_binary_oarchive.hpp>
-#include <boost/archive/portable_binary_iarchive.hpp>
-#include <boost/filesystem/operations.hpp>
-
-
-namespace tools
-{
-  template<class t_object>
-  bool serialize_obj_to_file(t_object& obj, const std::string& file_path)
-  {
-    TRY_ENTRY();
-#if defined(_MSC_VER)
-    // Need to know HANDLE of file to call FlushFileBuffers
-    HANDLE data_file_handle = ::CreateFile(file_path.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (INVALID_HANDLE_VALUE == data_file_handle)
-      return false;
-
-    int data_file_descriptor = _open_osfhandle((intptr_t)data_file_handle, 0);
-    if (-1 == data_file_descriptor)
-    {
-      ::CloseHandle(data_file_handle);
-      return false;
-    }
-
-    const std::unique_ptr<FILE, tools::close_file> data_file_file{_fdopen(data_file_descriptor, "wb")};
-    if (nullptr == data_file_file)
-    {
-      // Call CloseHandle is not necessary
-      _close(data_file_descriptor);
-      return false;
-    }
-
-    // HACK: undocumented constructor, this code may not compile
-    std::ofstream data_file(data_file_file.get());
-    if (data_file.fail())
-    {
-      // Call CloseHandle and _close are not necessary
-      return false;
-    }
-#else
-    std::ofstream data_file;
-    data_file.open(file_path , std::ios_base::binary | std::ios_base::out| std::ios::trunc);
-    if (data_file.fail())
-      return false;
-#endif
-
-    boost::archive::portable_binary_oarchive a(data_file);
-    a << obj;
-    if (data_file.fail())
-      return false;
-
-    data_file.flush();
-#if defined(_MSC_VER)
-    // To make sure the file is fully stored on disk
-    ::FlushFileBuffers(data_file_handle);
-#endif
-
-    return true;
-    CATCH_ENTRY_L0("serialize_obj_to_file", false);
-  }
-
-  template<class t_object>
-  bool unserialize_obj_from_file(t_object& obj, const std::string& file_path)
-  {
-    TRY_ENTRY();
-
-    std::ifstream data_file;  
-    data_file.open( file_path, std::ios_base::binary | std::ios_base::in);
-    if(data_file.fail())
-      return false;
-    try
-    {
-      // first try reading in portable mode
-      boost::archive::portable_binary_iarchive a(data_file);
-      a >> obj;
-    }
-    catch(...)
-    {
-      // if failed, try reading in unportable mode
-      boost::filesystem::copy_file(file_path, file_path + ".unportable", boost::filesystem::copy_option::overwrite_if_exists);
-      data_file.close();
-      data_file.open( file_path, std::ios_base::binary | std::ios_base::in);
-      if(data_file.fail())
-        return false;
-      boost::archive::binary_iarchive a(data_file);
-      a >> obj;
-    }
-    return !data_file.fail();
-    CATCH_ENTRY_L0("unserialize_obj_from_file", false);
-  }
-}
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index e00421f87..466224390 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -30,6 +30,8 @@
 // check local first (in the event of static or in-source compilation of libunbound)
 #include "unbound.h"
 
+#include <deque>
+#include <set>
 #include <stdlib.h>
 #include "include_base_utils.h"
 #include "common/threadpool.h"
@@ -326,11 +328,6 @@ std::vector<std::string> DNSResolver::get_record(const std::string& url, int rec
   dnssec_available = false;
   dnssec_valid = false;
 
-  if (!check_address_syntax(url.c_str()))
-  {
-    return addresses;
-  }
-
   // destructor takes care of cleanup
   ub_result_ptr result;
 
@@ -413,16 +410,6 @@ DNSResolver DNSResolver::create()
   return DNSResolver();
 }
 
-bool DNSResolver::check_address_syntax(const char *addr) const
-{
-  // if string doesn't contain a dot, we won't consider it a url for now.
-  if (strchr(addr,'.') == NULL)
-  {
-    return false;
-  }
-  return true;
-}
-
 namespace dns_utils
 {
 
diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h
index f9507b42a..81079ba30 100644
--- a/src/common/dns_utils.h
+++ b/src/common/dns_utils.h
@@ -159,15 +159,6 @@ private:
   // TODO: modify this to accommodate DNSSEC
   std::vector<std::string> get_record(const std::string& url, int record_type, boost::optional<std::string> (*reader)(const char *,size_t), bool& dnssec_available, bool& dnssec_valid);
 
-  /**
-   * @brief Checks a string to see if it looks like a URL
-   *
-   * @param addr the string to be checked
-   *
-   * @return true if it looks enough like a URL, false if not
-   */
-  bool check_address_syntax(const char *addr) const;
-
   DNSResolverData *m_data;
 }; // class DNSResolver
 
diff --git a/src/common/threadpool.h b/src/common/threadpool.h
index 53421e18b..fcf8ca945 100644
--- a/src/common/threadpool.h
+++ b/src/common/threadpool.h
@@ -31,6 +31,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <cstddef>
+#include <deque>
 #include <functional>
 #include <utility>
 #include <vector>