4 files changed, 161 insertions, 8 deletions

diff --git a/contrib/epee/src/CMakeLists.txt b/contrib/epee/src/CMakeLists.txt
index 5201f59c2..88018d71a 100644
--- a/contrib/epee/src/CMakeLists.txt
+++ b/contrib/epee/src/CMakeLists.txt
@@ -26,7 +26,7 @@
 # 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.
 
-add_library(epee STATIC byte_slice.cpp hex.cpp http_auth.cpp mlog.cpp net_helper.cpp net_utils_base.cpp string_tools.cpp wipeable_string.cpp
+add_library(epee STATIC byte_slice.cpp hex.cpp abstract_http_client.cpp http_auth.cpp mlog.cpp net_helper.cpp net_utils_base.cpp string_tools.cpp wipeable_string.cpp
     levin_base.cpp memwipe.c connection_basic.cpp network_throttle.cpp network_throttle-detail.cpp mlocker.cpp buffer.cpp net_ssl.cpp
     int-util.cpp)
 
diff --git a/contrib/epee/src/abstract_http_client.cpp b/contrib/epee/src/abstract_http_client.cpp
new file mode 100644
index 000000000..98b5b67d9
--- /dev/null
+++ b/contrib/epee/src/abstract_http_client.cpp
@@ -0,0 +1,142 @@
+#include "net/abstract_http_client.h"
+#include "net/http_base.h"
+#include "net/net_parse_helpers.h"
+
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "net.http"
+
+namespace epee
+{
+namespace net_utils
+{
+  //----------------------------------------------------------------------------------------------------
+  bool is_unsafe(unsigned char compare_char)
+  {
+    if(compare_char <= 32 || compare_char >= 123)
+      return true;
+
+    const char* punsave = get_unsave_chars();
+
+    for(int ichar_pos = 0; 0!=punsave[ichar_pos] ;ichar_pos++)
+      if(compare_char == punsave[ichar_pos])
+        return true;
+
+    return false;
+  }
+  //----------------------------------------------------------------------------------------------------
+  std::string dec_to_hex(char num, int radix)
+  {
+    int temp=0;
+    std::string csTmp;
+    int num_char;
+
+    num_char = (int) num;
+    if (num_char < 0)
+      num_char = 256 + num_char;
+
+    while (num_char >= radix)
+    {
+      temp = num_char % radix;
+      num_char = (int)floor((float)num_char / (float)radix);
+      csTmp = get_hex_vals()[temp];
+    }
+
+    csTmp += get_hex_vals()[num_char];
+
+    if(csTmp.size() < 2)
+    {
+      csTmp += '0';
+    }
+
+    std::reverse(csTmp.begin(), csTmp.end());
+    //_mbsrev((unsigned char*)csTmp.data());
+
+    return csTmp;
+  }
+  //----------------------------------------------------------------------------------------------------
+  int get_index(const char *s, char c)
+  {
+    const char *ptr = (const char*)memchr(s, c, 16);
+    return ptr ? ptr-s : -1;
+  }
+  //----------------------------------------------------------------------------------------------------
+  std::string hex_to_dec_2bytes(const char *s)
+  {
+    const char *hex = get_hex_vals();
+    int i0 = get_index(hex, toupper(s[0]));
+    int i1 = get_index(hex, toupper(s[1]));
+    if (i0 < 0 || i1 < 0)
+      return std::string("%") + std::string(1, s[0]) + std::string(1, s[1]);
+    return std::string(1, i0 * 16 | i1);
+  }
+  //----------------------------------------------------------------------------------------------------
+  std::string convert(char val)
+  {
+    std::string csRet;
+    csRet += "%";
+    csRet += dec_to_hex(val, 16);
+    return  csRet;
+  }
+  //----------------------------------------------------------------------------------------------------
+  std::string conver_to_url_format(const std::string& uri)
+  {
+
+    std::string result;
+
+    for(size_t i = 0; i!= uri.size(); i++)
+    {
+      if(is_unsafe(uri[i]))
+        result += convert(uri[i]);
+      else
+        result += uri[i];
+
+    }
+
+    return result;
+  }
+  //----------------------------------------------------------------------------------------------------
+  std::string convert_from_url_format(const std::string& uri)
+  {
+
+    std::string result;
+
+    for(size_t i = 0; i!= uri.size(); i++)
+    {
+      if(uri[i] == '%' && i + 2 < uri.size())
+      {
+        result += hex_to_dec_2bytes(uri.c_str() + i + 1);
+        i += 2;
+      }
+      else
+        result += uri[i];
+
+    }
+
+    return result;
+  }
+  //----------------------------------------------------------------------------------------------------
+  std::string convert_to_url_format_force_all(const std::string& uri)
+  {
+    std::string result;
+
+    for(size_t i = 0; i!= uri.size(); i++)
+    {
+        result += convert(uri[i]);
+    }
+    return result;
+  }
+
+namespace http
+{
+  //----------------------------------------------------------------------------------------------------
+  bool epee::net_utils::http::abstract_http_client::set_server(const std::string& address, boost::optional<login> user, ssl_options_t ssl_options)
+  {
+    http::url_content parsed{};
+    const bool r = parse_url(address, parsed);
+    CHECK_AND_ASSERT_MES(r, false, "failed to parse url: " << address);
+    set_server(std::move(parsed.host), std::to_string(parsed.port), std::move(user), std::move(ssl_options));
+    return true;
+  }
+}
+}
+}
diff --git a/contrib/epee/src/byte_slice.cpp b/contrib/epee/src/byte_slice.cpp
index 216049e5b..3ad3b3e7e 100644
--- a/contrib/epee/src/byte_slice.cpp
+++ b/contrib/epee/src/byte_slice.cpp
@@ -49,12 +49,16 @@ namespace epee
     std::atomic<std::size_t> ref_count;
   };
 
-  void release_byte_slice::operator()(byte_slice_data* ptr) const noexcept
+  void release_byte_slice::call(void*, void* ptr) noexcept
   {
-    if (ptr && --(ptr->ref_count) == 0)
+    if (ptr)
     {
-      ptr->~byte_slice_data();
-      free(ptr);
+      byte_slice_data* self = static_cast<byte_slice_data*>(ptr);
+      if (--(self->ref_count) == 0)
+      {
+        self->~byte_slice_data();
+        free(self);
+      }
     }
   }
 
@@ -206,4 +210,11 @@ namespace epee
       return {};
     return {storage_.get(), {portion_.begin() + begin, end - begin}};
   }
+
+  std::unique_ptr<byte_slice_data, release_byte_slice> byte_slice::take_buffer() noexcept
+  {
+    std::unique_ptr<byte_slice_data, release_byte_slice> out{std::move(storage_)};
+    portion_ = nullptr;
+    return out;
+  }
 } // epee
diff --git a/contrib/epee/src/hex.cpp b/contrib/epee/src/hex.cpp
index b25ce5421..b53efe6b8 100644
--- a/contrib/epee/src/hex.cpp
+++ b/contrib/epee/src/hex.cpp
@@ -141,7 +141,7 @@ namespace epee
     result.reserve(count / 2);
 
     // the data to work with (std::string is always null-terminated)
-    auto data = src.data();
+    auto data = src.begin();
 
     // convert a single hex character to an unsigned integer
     auto char_to_int = [](const char *input) {
@@ -167,9 +167,9 @@ namespace epee
     };
 
     // keep going until we reach the end
-    while (data[0] != '\0') {
+    while (data != src.end()) {
       // skip unwanted characters
-      if (!include(data[0])) {
+      if (!include(*data)) {
         ++data;
         continue;
       }