hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2483: Fix dcb.hh includes

Browse Source 
The header depended on ssl.hh to include the OpenSSL headers even though
it used OpenSSL types. By fixing these dependencies the ssl.h header can
now freely include the rworker_local type which removes the need for the
hidden implementation of SSLProvider.
This commit is contained in:
Markus Mäkelä
2019-05-23 15:57:17 +03:00
parent d5ec357731
commit c2975d33f8
3 changed files with 18 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/maxscale/dcb.hh
View File

@ -17,13 +17,15 @@
*/
#include <maxscale/ccdefs.hh>
#include <openssl/ssl.h>
#include <netinet/in.h>
#include <maxbase/poll.h>
#include <maxscale/authenticator.hh>
#include <maxscale/buffer.hh>
#include <maxscale/modinfo.h>
#include <maxscale/protocol.hh>
#include <maxscale/ssl.hh>
#include <memory>

9
include/maxscale/ssl.hh
View File

@ -22,6 +22,7 @@
#include <maxscale/protocol.hh>
#include <maxscale/modinfo.h>
#include <maxscale/routingworker.hh>
#include <openssl/crypto.h>
#include <openssl/ssl.h>
@ -142,14 +143,14 @@ private:
class SSLProvider
{
public:
SSLProvider(std::unique_ptr<mxs::SSLContext> context);
const mxs::SSLConfig& config() const;
mxs::SSLContext* context() const;
void set_context(std::unique_ptr<mxs::SSLContext> ssl);
SSLProvider(std::unique_ptr<mxs::SSLContext>&& context);
~SSLProvider();
private:
std::unique_ptr<SSLProviderImp> m_imp;
mxs::rworker_local<std::shared_ptr<mxs::SSLContext>> m_context; /**< SSL context */
mxs::SSLConfig m_config; /**< SSL configuration */
};
}