Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 21:37:17 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

catch error 10045 on stopping SAM acceptor (#1233), fix warning in util

Browse source
This commit is contained in:
R4SAS 2019-02-06 03:03:37 +03:00
parent a14d554947
commit f5f4190803
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libi2pd/util.cpp
View file

@ -203,7 +203,9 @@ namespace net
#endif #endif
if (IsWindowsXPorLater()) if (IsWindowsXPorLater())
{
#define inet_pton inet_pton_xp #define inet_pton inet_pton_xp
}
if(localAddress.is_v4()) if(localAddress.is_v4())
{ {
@ -220,7 +222,6 @@ namespace net
LogPrint(eLogError, "NetIface: GetMTU(): address family is not supported"); LogPrint(eLogError, "NetIface: GetMTU(): address family is not supported");
return fallback; return fallback;
} }
} }
#else // assume unix #else // assume unix
int GetMTUUnix(const boost::asio::ip::address& localAddress, int fallback) int GetMTUUnix(const boost::asio::ip::address& localAddress, int fallback)

11
libi2pd_client/SAM.cpp
View file

@ -963,7 +963,16 @@ namespace client
void SAMBridge::Stop () void SAMBridge::Stop ()
{ {
m_IsRunning = false; m_IsRunning = false;
m_Acceptor.cancel ();
try
{
m_Acceptor.cancel ();
}
catch (const std::exception& ex)
{
LogPrint (eLogError, "SAM: runtime exception: ", ex.what ());
}
for (auto& it: m_Sessions) for (auto& it: m_Sessions)
it.second->CloseStreams (); it.second->CloseStreams ();
m_Sessions.clear (); m_Sessions.clear ();