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

Allow using hostnames for seed nodes

Browse source
This commit is contained in:
Eric Frias 2015-07-15 15:48:01 -04:00
parent 8944facd41
commit b6a5119226
1 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
libraries/app/application.cpp
View file

@ -30,6 +30,7 @@
#include <fc/rpc/api_connection.hpp> #include <fc/rpc/api_connection.hpp>
#include <fc/rpc/websocket_api.hpp> #include <fc/rpc/websocket_api.hpp>
#include <fc/network/resolve.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <boost/signals2.hpp> #include <boost/signals2.hpp>
@ -101,12 +102,15 @@ namespace detail {
if( _options->count("seed-node") ) if( _options->count("seed-node") )
{ {
auto seeds = _options->at("seed-node").as<vector<string>>(); auto seeds = _options->at("seed-node").as<vector<string>>();
for( const string& ep : seeds ) for( const string& endpoint_string : seeds )
{ {
fc::ip::endpoint node = fc::ip::endpoint::from_string(ep); std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string);
ilog("Adding seed node ${ip}", ("ip", node)); for (const fc::ip::endpoint& endpoint : endpoints)
_p2p_network->add_node(node); {
_p2p_network->connect_to_endpoint(node); ilog("Adding seed node ${endpoint}", ("endpoint", endpoint));
_p2p_network->add_node(endpoint);
_p2p_network->connect_to_endpoint(endpoint);
}
} }
} }
@ -123,6 +127,33 @@ namespace detail {
std::vector<uint32_t>()); std::vector<uint32_t>());
} FC_CAPTURE_AND_RETHROW() } } FC_CAPTURE_AND_RETHROW() }
std::vector<fc::ip::endpoint> resolve_string_to_ip_endpoints(const std::string& endpoint_string)
{
try
{
string::size_type colon_pos = endpoint_string.find(':');
if (colon_pos == std::string::npos)
FC_THROW("Missing required port number in endpoint string \"${endpoint_string}\"",
("endpoint_string", endpoint_string));
std::string port_string = endpoint_string.substr(colon_pos + 1);
try
{
uint16_t port = boost::lexical_cast<uint16_t>(port_string);
std::string hostname = endpoint_string.substr(0, colon_pos);
std::vector<fc::ip::endpoint> endpoints = fc::resolve(hostname, port);
if (endpoints.empty())
FC_THROW_EXCEPTION(fc::unknown_host_exception, "The host name can not be resolved: ${hostname}", ("hostname", hostname));
return endpoints;
}
catch (const boost::bad_lexical_cast&)
{
FC_THROW("Bad port: ${port}", ("port", port_string));
}
}
FC_CAPTURE_AND_RETHROW((endpoint_string))
}
void reset_websocket_server() void reset_websocket_server()
{ try { { try {
if( !_options->count("rpc-endpoint") ) if( !_options->count("rpc-endpoint") )
@ -395,9 +426,9 @@ namespace detail {
{ try { { try {
std::vector<item_hash_t> result; std::vector<item_hash_t> result;
result.reserve(30); result.reserve(30);
auto head_block_num = _chain_db->head_block_num(); uint32_t head_block_num = _chain_db->head_block_num();
result.push_back(_chain_db->head_block_id()); result.push_back(_chain_db->head_block_id());
auto current = 1; uint32_t current = 1;
while( current < head_block_num ) while( current < head_block_num )
{ {
result.push_back(_chain_db->get_block_id_for_num(head_block_num - current)); result.push_back(_chain_db->get_block_id_for_num(head_block_num - current));