Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

[SON for Hive] - Implement HTTPS RPC client #610

Merged
serkixenos merged 18 commits from feature/son-for-hive-https-support into feature/son-for-hive 2021-10-25 15:18:33 +00:00
Conversation 5 Commits 18 Files changed 5 +6 -5
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7ddad07df2 - Show all commits

3
libraries/plugins/peerplays_sidechain/common/net_utl.cpp
View file

@ -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

2
libraries/plugins/peerplays_sidechain/common/net_utl.h
View file

@ -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

4
libraries/plugins/peerplays_sidechain/common/rpc_client.cpp
View file

@ -9,6 +9,8 @@
#include <fc/log/logger.hpp>
#include <fc/network/ip.hpp>
#include <boost/algorithm/string/case_conv.hpp>
#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);

2
libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
View file

@ -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);