Browse Source

more

pull/1122/head
Jeff Becker 7 years ago
parent
commit
8d7fde0287
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
  1. 17
      libi2pd/NTCPSession.cpp

17
libi2pd/NTCPSession.cpp

@ -237,24 +237,11 @@ namespace transport @@ -237,24 +237,11 @@ namespace transport
}
else
{
#if ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 7)) || defined(__NetBSD__)
// due the bug in gcc 4.7. std::shared_future.get() is not const
CreateAESKey (m_Establisher->phase2.pubKey);
HandlePhase2 ();
#else
auto s = shared_from_this ();
// create AES key in separate thread
auto keyCreated = std::async (std::launch::async, [s] ()
{
m_Server.Work(s, [s]() -> std::function<void(void)> {
s->CreateAESKey (s->m_Establisher->phase2.pubKey);
}).share (); // TODO: use move capture in C++ 14 instead shared_future
// let other operations execute while a key gets created
m_Server.GetService ().post ([s, keyCreated]()
{
keyCreated.get (); // we might wait if no more pending operations
s->HandlePhase2 ();
return std::bind(&NTCPSession::HandlePhase2, s);
});
#endif
}
}

Loading…
Cancel
Save