146 Commits

Author SHA1 Message Date
Markus Makela
b756690123 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
Markus Makela
a1801237a8 Fixed error messages being printed for existing directories. 2015-07-13 19:35:38 +03:00
counterpoint
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
Markus Makela
5b75443744 Fixed module load failure referring to lib/maxscale/modules instead of lib/maxscale. 2015-07-04 09:07:37 +03:00
Markus Makela
7e704d2312 Fixed module load failure referring to lib/maxscale/modules instead of lib/maxscale. 2015-07-04 07:13:14 +03:00
Markus Makela
cff01cad05 Fixed compile errors with old SSL library. 2015-06-25 17:13:10 +03:00
Markus Makela
80709ce039 Fixed compile errors for older SSL libraries. 2015-06-25 16:46:26 +03:00
Markus Makela
e5d9abbdcb Fixes to Coverity defects. 2015-06-25 06:01:33 +03:00
Markus Makela
c42d3d9f7a Added missing NULL checks. 2015-06-23 17:05:31 +03:00
Markus Makela
039cbff181 Added missing null checks. 2015-06-23 16:45:10 +03:00
Markus Makela
3de7798fac Added missing session state changes. 2015-06-23 11:49:27 +03:00
Markus Makela
c22c6ea46a ServiceStop only removed DCBs from the polling system
This removes the need to establish new DCBs for each of the listeners while still blocking new session creation
for a service which is shut down. The client will not receive an error and the connection will be accepted
when the service is restarted.
2015-06-23 09:15:06 +03:00
counterpoint
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
Markus Makela
e14b29baf9 Fix to MXS-212: https://mariadb.atlassian.net/browse/MXS-212
The listener DCB is now properly closed instead of just being removed from the poll set.
2015-06-21 12:51:54 +03:00
Martin Brampton
4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
Martin Brampton
b1c657c2eb Add another debug output; fix bug; clarify variable names. 2015-06-19 20:51:22 +01:00
Markus Makela
425dd8cb3b Removed SSLv2 methods from serviceInitSSL because OpenSSL 1.1.0 does not support them. 2015-06-17 10:24:02 +03:00
Markus Makela
97a06e4006 Updated function documentation. 2015-06-16 14:24:38 +03:00
Markus Makela
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
Markus Makela
3f34d237ca enabled all bug fixes for OpenSSL. 2015-06-11 15:26:05 +03:00
Markus Makela
2cf92a1894 Added RSA key generator. 2015-06-11 13:22:18 +03:00
Markus Makela
ab120cb1de Added Diffie-Hellman key exchange for MaxScale. 2015-06-09 17:04:51 +03:00
Markus Makela
e83799648a Fixed queries getting stuck when the SSL records were of the maximum allowed size. 2015-06-05 11:00:51 +03:00
Markus Makela
19ac70fc2f Added unit tests for SSL. 2015-06-03 13:15:45 +03:00
Markus Makela
57060cafec Added SSL level configuration to services. 2015-06-02 17:16:53 +03:00
Markus Makela
d7232d8b6e Moved SSL structure to the DCB instead of the MySQL protocol.
This allows for non-MySQL SSL connections.
2015-06-01 20:51:26 +03:00
Markus Makela
a2768955e7 SSL handshake now successfully completes when a client connects with SSL enabled. 2015-06-01 13:50:22 +03:00
Markus Makela
a572166ffd Added ssl handshake to mysql_client 2015-05-28 22:19:50 +03:00
Markus Makela
3d6259cb00 Added configuration options for different SSL modes. 2015-05-28 16:33:51 +03:00
Markus Makela
16d6bd6d2c Added service SSL mode variables. 2015-05-28 11:56:14 +03:00
Markus Makela
9e0a2bfc12 Changed relevant files to use get_cachedir() instead of using the now deprecated MAXSCALE_HOME. 2015-04-27 21:55:57 +03:00
Markus Makela
bbcecc0db5 Changed all MaxScale.cnf code references to maxscale.cnf 2015-04-27 13:44:36 +03:00
Markus Makela
17a7b2addb Updated more variables. 2015-04-26 20:08:27 +03:00
Markus Makela
ed426ca30d Updated packaging install layout, moved some cmake files around. 2015-04-26 06:35:36 +03:00
Markus Makela
d16e4fe134 Added an option for optimization of wildcard grants to individual grants. The default behavior now checks first for specific grants to a database the wildcard grants. 2015-04-15 06:51:52 +03:00
Markus Makela
da406db292 Changed install path to /usr/local/mariadb-maxscale 2015-03-23 20:12:56 +02:00
Markus Makela
7cfc1d3cc9 Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'. 2015-03-23 14:53:31 +02:00
Markus Makela
72d48452d5 Fixed a bug with authentication data being loaded too many times. 2015-03-16 13:44:50 +02:00
Markus Makela
06318cf0ea Fixed possible error in user authentication from multiple sources. 2015-03-16 11:15:40 +02:00
Markus Makela
a7ae856de2 Fixed missing printf parameter in service.c. 2015-03-13 06:56:19 +02:00
MassimilianoPinto
7af2843bcb Notification Service integration added
Notification Service integration added
2015-03-09 18:06:16 +01:00
MassimilianoPinto
698af9d3b7 Send modules list into to Notification server
Send modules list into to Notification server

TODO: remove fprintf  in module_feedback_send and use log manager
instead
2015-03-05 13:20:22 +01:00
Markus Makela
880adca73e Merge branch 'develop' into MAX-324 2015-03-05 10:45:48 +02:00
MassimilianoPinto
bc5dfe82c2 merge from develop
merge from develop
2015-03-04 17:02:04 +01:00
Markus Makela
1b0fd4576a Merge branch 'maxinfo' into develop
Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h
2015-03-04 11:33:00 +02:00
MassimilianoPinto
74e303f601 Fixed routine name
Fixed routine name
2015-03-02 17:36:00 +01:00
MassimilianoPinto
64c0b7b041 Notification service support
Notification service support
2015-03-02 17:15:31 +01:00
MassimilianoPinto
193fe22ef0 Addition of module_feedback_send
Addition of module_feedback_send.
Every 30 second data is sent to 127.0.0.1
Missing routines for configuration parameters and blocking the send
after successful completion
2015-02-26 17:47:01 +01:00
Markus Makela
9e7afeb302 Merge branch 'develop' into MAX-324
Conflicts:
	macros.cmake
	server/core/config.c
	server/core/service.c
	server/modules/routing/CMakeLists.txt
2015-02-24 06:26:55 +02:00
Markus Makela
57f89f5689 Small optimizations to session timeouts. 2015-02-23 19:59:36 +02:00