Browse Source

* correct shutdown of httpserver & socksproxy

pull/358/head
hagen 9 years ago
parent
commit
62cec2a31c
  1. 20
      ClientContext.cpp
  2. 8
      Daemon.cpp

20
ClientContext.cpp

@ -100,15 +100,19 @@ namespace client
void ClientContext::Stop () void ClientContext::Stop ()
{ {
LogPrint(eLogInfo, "Clients: stopping HTTP Proxy"); if (m_HttpProxy) {
m_HttpProxy->Stop(); LogPrint(eLogInfo, "Clients: stopping HTTP Proxy");
delete m_HttpProxy; m_HttpProxy->Stop();
m_HttpProxy = nullptr; delete m_HttpProxy;
m_HttpProxy = nullptr;
}
LogPrint(eLogInfo, "Clients: stopping SOCKS Proxy"); if (m_SocksProxy) {
m_SocksProxy->Stop(); LogPrint(eLogInfo, "Clients: stopping SOCKS Proxy");
delete m_SocksProxy; m_SocksProxy->Stop();
m_SocksProxy = nullptr; delete m_SocksProxy;
m_SocksProxy = nullptr;
}
for (auto& it: m_ClientTunnels) for (auto& it: m_ClientTunnels)
{ {

8
Daemon.cpp

@ -210,9 +210,11 @@ namespace i2p
i2p::transport::transports.Stop(); i2p::transport::transports.Stop();
LogPrint(eLogInfo, "Daemon: stopping NetDB"); LogPrint(eLogInfo, "Daemon: stopping NetDB");
i2p::data::netdb.Stop(); i2p::data::netdb.Stop();
LogPrint(eLogInfo, "Daemon: stopping HTTP Server"); if (d.httpServer) {
d.httpServer->Stop(); LogPrint(eLogInfo, "Daemon: stopping HTTP Server");
d.httpServer = nullptr; d.httpServer->Stop();
d.httpServer = nullptr;
}
if (d.m_I2PControlService) if (d.m_I2PControlService)
{ {
LogPrint(eLogInfo, "Daemon: stopping I2PControl"); LogPrint(eLogInfo, "Daemon: stopping I2PControl");

Loading…
Cancel
Save