diff options
| author | Adam <Adam@anope.org> | 2012-11-01 13:32:38 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-11-01 14:47:23 -0400 |
| commit | 90930619bc124e94bac5048c0b13c3f4748b559d (patch) | |
| tree | cbe2325f6295aa188a6dd0f0d56d336eab060bbe /modules/extra/m_ssl.cpp | |
| parent | 5b1c8230191fa626ef9210c5035f14a8df4c0ed6 (diff) | |
Fixed quite a bit of dumbness with m_ssl. Had to
modify socketengines to allow polling for write &
no read, but is it cleaner now. Made m_httpd able
to listen using SSL.
Diffstat (limited to 'modules/extra/m_ssl.cpp')
| -rw-r--r-- | modules/extra/m_ssl.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp index adae7a6fe..2f72744c7 100644 --- a/modules/extra/m_ssl.cpp +++ b/modules/extra/m_ssl.cpp @@ -153,6 +153,10 @@ class SSLModule : public Module SSL_CTX_set_verify(client_ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, SSLModule::AlwaysAccept); SSL_CTX_set_verify(server_ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, SSLModule::AlwaysAccept); + Anope::string context_name = "Anope"; + SSL_CTX_set_session_id_context(client_ctx, reinterpret_cast<const unsigned char *>(context_name.c_str()), context_name.length()); + SSL_CTX_set_session_id_context(server_ctx, reinterpret_cast<const unsigned char *>(context_name.c_str()), context_name.length()); + ModuleManager::Attach(I_OnReload, this); ModuleManager::Attach(I_OnPreServerConnect, this); } @@ -275,7 +279,8 @@ SocketFlag SSLSocketIO::FinishAccept(ClientSocket *cs) int error = SSL_get_error(IO->sslsock, ret); if (ret == -1 && (error == SSL_ERROR_WANT_READ || error == SSL_ERROR_WANT_WRITE)) { - SocketEngine::MarkWritable(cs); + SocketEngine::Change(cs, error == SSL_ERROR_WANT_WRITE, SF_WRITABLE); + SocketEngine::Change(cs, error == SSL_ERROR_WANT_READ, SF_READABLE); return SF_ACCEPTING; } else @@ -290,6 +295,8 @@ SocketFlag SSLSocketIO::FinishAccept(ClientSocket *cs) { cs->SetFlag(SF_ACCEPTED); cs->UnsetFlag(SF_ACCEPTING); + SocketEngine::Change(cs, false, SF_WRITABLE); + SocketEngine::Change(cs, true, SF_READABLE); cs->OnAccept(); return SF_ACCEPTED; } @@ -315,7 +322,7 @@ void SSLSocketIO::Connect(ConnectionSocket *s, const Anope::string &target, int } else { - SocketEngine::MarkWritable(s); + SocketEngine::Change(s, true, SF_WRITABLE); s->SetFlag(SF_CONNECTING); return; } @@ -354,7 +361,8 @@ SocketFlag SSLSocketIO::FinishConnect(ConnectionSocket *s) int error = SSL_get_error(IO->sslsock, ret); if (ret == -1 && (error == SSL_ERROR_WANT_READ || error == SSL_ERROR_WANT_WRITE)) { - SocketEngine::MarkWritable(s); + SocketEngine::Change(s, error == SSL_ERROR_WANT_WRITE, SF_WRITABLE); + SocketEngine::Change(s, error == SSL_ERROR_WANT_READ, SF_READABLE); return SF_CONNECTING; } else @@ -369,6 +377,8 @@ SocketFlag SSLSocketIO::FinishConnect(ConnectionSocket *s) { s->UnsetFlag(SF_CONNECTING); s->SetFlag(SF_CONNECTED); + SocketEngine::Change(s, false, SF_WRITABLE); + SocketEngine::Change(s, true, SF_READABLE); s->OnConnect(); return SF_CONNECTED; } @@ -381,6 +391,8 @@ void SSLSocketIO::Destroy() SSL_shutdown(this->sslsock); SSL_free(this->sslsock); } + + delete this; } MODULE_INIT(SSLModule) |