Merge remote-tracking branch 'purple/openssl'

This commit is contained in:
Jeff Becker 2016-12-18 13:31:02 -05:00
commit 557696b1d8

View file

@ -417,7 +417,9 @@ namespace client
HandleI2PAccept(stream); HandleI2PAccept(stream);
} else { } else {
SendMessageReply (SAM_STREAM_STATUS_I2P_ERROR, strlen(SAM_STREAM_STATUS_I2P_ERROR), true); SendMessageReply (SAM_STREAM_STATUS_I2P_ERROR, strlen(SAM_STREAM_STATUS_I2P_ERROR), true);
Terminate(); auto s = shared_from_this ();
m_Owner.GetService ().post ([s] { s->Terminate (); });
} }
} }
size_t SAMSocket::ProcessDatagramSend (char * buf, size_t len, const char * data) size_t SAMSocket::ProcessDatagramSend (char * buf, size_t len, const char * data)
@ -583,7 +585,7 @@ namespace client
if (!ecode) if (!ecode)
s->Receive (); s->Receive ();
else else
s->Terminate (); s->m_Owner.GetService ().post ([s] { s->Terminate (); });
}); });
} }
} }