Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-08-05 22:44:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

httpserver: Check for and tolerate more possible system limitations

Browse Source
This commit is contained in:
Luke Dashjr 2018-12-28 07:28:17 +00:00
parent de303675e4
commit e8461128b8
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/httpserver.cpp
View File

@ -357,7 +357,7 @@ static void ThreadHTTP(struct event_base* base)
} }
static struct evhttp_bound_socket * static struct evhttp_bound_socket *
my_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint16_t port) my_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint16_t port, bool& ignorable_error)
{ {
evutil_socket_t fd; evutil_socket_t fd;
struct evhttp_bound_socket *bound; struct evhttp_bound_socket *bound;
@ -381,9 +381,18 @@ my_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint16_t
const std::string strport = strprintf("%d", port); const std::string strport = strprintf("%d", port);
ai_result = evutil_getaddrinfo(address, strport.c_str(), &hints, &aitop); ai_result = evutil_getaddrinfo(address, strport.c_str(), &hints, &aitop);
if (ai_result || !aitop) { if (ai_result || !aitop) {
if (ai_result == EVUTIL_EAI_SYSTEM) { switch (ai_result) {
case 0:
break;
case EVUTIL_EAI_SYSTEM:
LogPrintf("libevent: getaddrinfo\n"); LogPrintf("libevent: getaddrinfo\n");
} else if (ai_result) { break;
case EVUTIL_EAI_ADDRFAMILY:
case EVUTIL_EAI_FAMILY:
case EVUTIL_EAI_SOCKTYPE:
ignorable_error = true;
break;
default:
LogPrintf("libevent: getaddrinfo: %s\n", evutil_gai_strerror(ai_result)); LogPrintf("libevent: getaddrinfo: %s\n", evutil_gai_strerror(ai_result));
} }
return nullptr; return nullptr;
@ -454,7 +463,8 @@ static bool HTTPBindAddresses(struct evhttp* http)
int num_fail = 0; int num_fail = 0;
for (std::vector<std::pair<std::string, uint16_t> >::iterator i = endpoints.begin(); i != endpoints.end(); ++i) { for (std::vector<std::pair<std::string, uint16_t> >::iterator i = endpoints.begin(); i != endpoints.end(); ++i) {
LogPrintf("Binding RPC on address %s port %i\n", i->first, i->second); LogPrintf("Binding RPC on address %s port %i\n", i->first, i->second);
evhttp_bound_socket *bind_handle = my_bind_socket_with_handle(http, i->first.empty() ? nullptr : i->first.c_str(), i->second); bool ignorable_error = false;
evhttp_bound_socket *bind_handle = my_bind_socket_with_handle(http, i->first.empty() ? nullptr : i->first.c_str(), i->second, ignorable_error);
if (bind_handle) { if (bind_handle) {
const std::optional<CNetAddr> addr{LookupHost(i->first, false)}; const std::optional<CNetAddr> addr{LookupHost(i->first, false)};
if (i->first.empty() || (addr.has_value() && addr->IsBindAny())) { if (i->first.empty() || (addr.has_value() && addr->IsBindAny())) {
@ -463,7 +473,7 @@ static bool HTTPBindAddresses(struct evhttp* http)
boundSockets.push_back(bind_handle); boundSockets.push_back(bind_handle);
} else { } else {
int err = EVUTIL_SOCKET_ERROR(); int err = EVUTIL_SOCKET_ERROR();
if (!is_default || (err != EADDRNOTAVAIL && err != ENOENT)) { if (!is_default || (err != EADDRNOTAVAIL && err != ENOENT && err != EOPNOTSUPP && !ignorable_error)) {
LogPrintf("Binding RPC on address %s port %i failed (Error: %s).\n", i->first, i->second, NetworkErrorString(err)); LogPrintf("Binding RPC on address %s port %i failed (Error: %s).\n", i->first, i->second, NetworkErrorString(err));
num_fail += 1; num_fail += 1;
} else { } else {