From 7ddad07df2f5e5865986cbc98f0110bd063847b8 Mon Sep 17 00:00:00 2001 From: moss9001 Date: Fri, 22 Oct 2021 00:20:37 +0300 Subject: [PATCH] Tested IP of api.hive.blog = 51.79.10.214 Not work: hive-node-ip = 51.79.10.214 hive-node-rpc-port = 443 - bad request! Work: hive-node-ip = https://51.79.10.214 hive-node-rpc-port = 443 Work: hive-node-ip = https://api.hive.blog hive-node-rpc-port = 443 Work: hive-node-ip = 10.11.12.202 hive-node-rpc-port = 28090 Work: hive-node-ip = http://10.11.12.202 hive-node-rpc-port = 28090 Work: hive-node-ip = http://localhost hive-node-rpc-port = 28090 Work: hive-node-ip = localhost hive-node-rpc-port = 28090 --- libraries/plugins/peerplays_sidechain/common/net_utl.cpp | 3 +-- libraries/plugins/peerplays_sidechain/common/net_utl.h | 2 +- libraries/plugins/peerplays_sidechain/common/rpc_client.cpp | 4 +++- .../peerplays_sidechain/sidechain_net_handler_hive.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/plugins/peerplays_sidechain/common/net_utl.cpp b/libraries/plugins/peerplays_sidechain/common/net_utl.cpp index d895193d..6037438a 100644 --- a/libraries/plugins/peerplays_sidechain/common/net_utl.cpp +++ b/libraries/plugins/peerplays_sidechain/common/net_utl.cpp @@ -19,11 +19,10 @@ std::string resolveHostAddr(const std::string & hostName) { std::string stripProtoName(const std::string & url) { auto index = url.find("://"); - if (index == url::npos) + if (index == std::string::npos) return url; return url.substr(index + 3); } - } // net } // peerplays diff --git a/libraries/plugins/peerplays_sidechain/common/net_utl.h b/libraries/plugins/peerplays_sidechain/common/net_utl.h index d549fef3..22533aa0 100644 --- a/libraries/plugins/peerplays_sidechain/common/net_utl.h +++ b/libraries/plugins/peerplays_sidechain/common/net_utl.h @@ -6,7 +6,7 @@ namespace peerplays { namespace net { std::string resolveHostAddr(const std::string & hostName); -std::string stripProtoName(const std::string & utl); +std::string stripProtoName(const std::string & url); } // net diff --git a/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp b/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp index 32edfc2d..2774e062 100644 --- a/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp +++ b/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp @@ -9,6 +9,8 @@ #include #include +#include + #include "https_call.h" #include "net_utl.h" @@ -152,7 +154,7 @@ fc::http::reply rpc_client::send_post_request(std::string body, bool show_log) { addr = fc::ip::address(host); } catch (...) { try { - addr = fc::ip::address(peerplays::net::resolveHostIp(host)); + addr = fc::ip::address(peerplays::net::resolveHostAddr(host)); } catch (...) { if (show_log) { std::string url = ip + ":" + std::to_string(port); diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp index 8e270c4c..3565416b 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp @@ -156,7 +156,7 @@ sidechain_net_handler_hive::sidechain_net_handler_hive(peerplays_sidechain_plugi addr = fc::ip::address(host); } catch (...) { try { - addr = fc::ip::address(peerplays::net::resolveHostIp(host)); + addr = fc::ip::address(peerplays::net::resolveHostAddr(host)); } catch (...) { elog("Failed to resolve Hive node address ${ip}", ("ip", node_ip)); FC_ASSERT(false);