From 331e6aac7d1ac7a6fd7c0b0fa092099eb25c99a1 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 20 Jun 2014 12:22:37 -0400 Subject: [PATCH] Convert networking exceptions to fc::exceptions to properly catch them in NTP code (fixes at least some of the shutdown crashes) --- src/network/ntp.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/network/ntp.cpp b/src/network/ntp.cpp index de590d4..a764448 100644 --- a/src/network/ntp.cpp +++ b/src/network/ntp.cpp @@ -74,7 +74,10 @@ namespace fc { fc::ip::endpoint from; std::array 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_host = bswap_64(receive_timestamp_net_order); @@ -120,7 +123,7 @@ namespace fc } catch ( const fc::exception& ) { - // we exepect canceled exceptions, but cannot throw + // we expect canceled exceptions, but cannot throw // from destructor } }