Merge pull request #281 from anonimal/master

Catch exception in SSUServer that would dump core.
This commit is contained in:
EinMByte 2015-10-14 11:05:43 +02:00
commit 45d27f8ddc
2 changed files with 13 additions and 5 deletions

View File

@ -426,7 +426,7 @@ namespace data
void RouterInfo::CreateBuffer (const PrivateKeys& privateKeys)
{
m_Timestamp = i2p::util::GetMillisecondsSinceEpoch (); // refresh timstamp
m_Timestamp = i2p::util::GetMillisecondsSinceEpoch (); // refresh timestamp
std::stringstream s;
uint8_t ident[1024];
auto identLen = privateKeys.GetPublic ().ToBuffer (ident, 1024);

View File

@ -137,9 +137,17 @@ namespace transport
void SSUServer::Send (const uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& to)
{
if (to.protocol () == boost::asio::ip::udp::v4())
try {
m_Socket.send_to (boost::asio::buffer (buf, len), to);
} catch (const std::exception& ex) {
LogPrint (eLogError, "SSUServer send error: ", ex.what());
}
else
try {
m_SocketV6.send_to (boost::asio::buffer (buf, len), to);
} catch (const std::exception& ex) {
LogPrint (eLogError, "SSUServer V6 send error: ", ex.what());
}
}
void SSUServer::Receive ()