Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert networking exceptions to fc::exceptions to properly catch them in NTP code (fixes at least some of the shutdown crashes)

Browse source
This commit is contained in:
Eric Frias 2014-06-20 12:22:37 -04:00
parent 2b3728af37
commit 331e6aac7d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/network/ntp.cpp
View file

@ -74,7 +74,10 @@ namespace fc
{ {
fc::ip::endpoint from; fc::ip::endpoint from;
std::array<uint64_t, 1024> recv_buf; std::array<uint64_t, 1024> recv_buf;
_sock.receive_from( (char*)recv_buf.data(), recv_buf.size(), from ); try
{
_sock.receive_from( (char*)recv_buf.data(), recv_buf.size(), from );
} FC_RETHROW_EXCEPTIONS(error, "Error reading from NTP socket");
uint64_t receive_timestamp_net_order = recv_buf[4]; uint64_t receive_timestamp_net_order = recv_buf[4];
uint64_t receive_timestamp_host = bswap_64(receive_timestamp_net_order); uint64_t receive_timestamp_host = bswap_64(receive_timestamp_net_order);
@ -120,7 +123,7 @@ namespace fc
} }
catch ( const fc::exception& ) catch ( const fc::exception& )
{ {
// we exepect canceled exceptions, but cannot throw // we expect canceled exceptions, but cannot throw
// from destructor // from destructor
} }
} }