Merge pull request #281 from anonimal/master

Catch exception in SSUServer that would dump core.
PurpleI2P · Oct 14, 2015 · 45d27f8 · 45d27f8
2 parents e4f1971 + 6ae5f20
commit 45d27f8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/core/RouterInfo.cpp b/core/RouterInfo.cpp
@@ -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);

diff --git a/core/transport/SSU.cpp b/core/transport/SSU.cpp
@@ -136,11 +136,19 @@ 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()) 
-            m_Socket.send_to (boost::asio::buffer (buf, len), 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
-            m_SocketV6.send_to (boost::asio::buffer (buf, len), to);
-    }   
+            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 ()
     {