mysql_client_server_protocol.h moved.

Moved to include/maxscale/protocol/mysql.h

include/maxscale/protocol/mysql.h

@@ -1,5 +1,5 @@
-#ifndef _MYSQL_PROTOCOL_H
-#define _MYSQL_PROTOCOL_H
+#ifndef _MAXSCALE_PROTOCOL_MYSQL_H
+#define _MAXSCALE_PROTOCOL_MYSQL_H
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -59,7 +59,7 @@
 #include <maxscale/skygw_debug.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/gwdirs.h>
 
 #include <stdio.h>

query_classifier/qc_sqlite/qc_sqlite.c

@@ -17,7 +17,7 @@
 #include <string.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/platform.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/skygw_utils.h>

query_classifier/test/compare.cc

@@ -22,7 +22,7 @@
 #include <sstream>
 #include <maxscale/gwdirs.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 using std::cerr;
 using std::cin;

server/core/dbusers.c

@@ -46,7 +46,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/secrets.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysqld_error.h>
 #include <regex.h>
 #include <maxscale/mysql_utils.h>

server/core/modutil.c

@@ -26,7 +26,7 @@
  */
 #include <maxscale/buffer.h>
 #include <string.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include <maxscale/modutil.h>

server/core/secrets.c

@@ -16,7 +16,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <ctype.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/random_jkiss.h>
 #include <maxscale/alloc.h>

server/core/test/test_mysql_users.c

@@ -35,7 +35,7 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/secrets.h>
 #include <maxscale/dbusers.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysql_auth.h>
 #include <maxscale/listener.h>
 #include <arpa/inet.h>

server/modules/authenticator/gssapi_auth.c

@@ -15,7 +15,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include "gssapi_auth.h"
 
 typedef struct gssapi_instance

server/modules/authenticator/gssapi_backend_auth.c

@@ -15,7 +15,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include "gssapi_auth.h"
 
 /**

server/modules/authenticator/mysql_auth.c

@@ -26,7 +26,7 @@
  */
 
 #include <mysql_auth.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
@@ -133,7 +133,7 @@ GWAUTHENTICATOR* GetModuleObject()
  *
  * @param dcb Request handler DCB connected to the client
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 static int
 mysql_auth_authenticate(DCB *dcb)
@@ -233,7 +233,7 @@ mysql_auth_authenticate(DCB *dcb)
  * @param dcb Request handler DCB connected to the client
  * @param buffer Pointer to pointer to buffer containing data from client
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  * @see https://dev.mysql.com/doc/internals/en/client-server-protocol.html
  */
 static int
@@ -286,7 +286,7 @@ mysql_auth_set_protocol_data(DCB *dcb, GWBUF *buf)
  * @param client_auth_packet The data from the buffer received from client
  * @param client_auth_packet size An integer giving the size of the data
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  * @see https://dev.mysql.com/doc/internals/en/client-server-protocol.html
  */
 static int
@@ -581,7 +581,7 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
  * @param username      The current username in the authentication request
  * @param stage1_hash   The SHA1(candidate_password) decoded by this routine
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  *
  */
 int
@@ -707,7 +707,7 @@ gw_check_mysql_scramble_data(DCB *dcb,
  * @param database A string containing the database name
  * @param auth_ret The authentication status prior to calling this function.
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 int
 check_db_name_after_auth(DCB *dcb, char *database, int auth_ret)
@@ -764,7 +764,7 @@ check_db_name_after_auth(DCB *dcb, char *database, int auth_ret)
  * @param stage1_hash A password hash for authentication
  * @param database A string containing the name for the default database
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 static int combined_auth_check(
     DCB             *dcb,

server/modules/authenticator/mysql_backend_auth.c

@@ -30,7 +30,7 @@
  */
 
 #include <maxscale/gw_authenticator.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
 

server/modules/filter/cache/cache_storage_api.h

@@ -16,7 +16,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <maxscale/buffer.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/skygw_debug.h>
 
 EXTERN_C_BLOCK_BEGIN

server/modules/filter/cache/rules.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.h>
 #include "cache.h"

server/modules/filter/dbfwfilter/dbfwfilter.c

@@ -68,7 +68,7 @@
 #include <maxscale/modutil.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/skygw_types.h>
 #include <time.h>

server/modules/filter/mqfilter/mqfilter.c

@@ -70,7 +70,7 @@
 #include <amqp_framing.h>
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/spinlock.h>

server/modules/filter/tee/tee.c

@@ -56,7 +56,7 @@
 #include <maxscale/dcb.h>
 #include <sys/time.h>
 #include <maxscale/poll.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/alloc.h>
 #include <maxscale/listmanager.h>

server/modules/include/mysql_auth.h

@@ -26,7 +26,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
 #include <stdint.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 int gw_check_mysql_scramble_data(DCB *dcb,
                                  uint8_t *token,

server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>

server/modules/protocol/MySQL/MySQLClient/mysql_client.c

@@ -49,7 +49,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysql_auth.h>
 #include <maxscale/gw_ssl.h>
 #include <maxscale/poll.h>
@@ -874,7 +874,7 @@ gw_read_finish_processing(DCB *dcb, GWBUF *read_buffer, uint8_t capabilities)
  *
  * @param dcb Request handler DCB connected to the client
  * @param auth_val The type of authentication failure
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 static void
 mysql_client_auth_error_handling(DCB *dcb, int auth_val)

server/modules/protocol/MySQL/mysql_common.c

@@ -44,7 +44,7 @@
 
 #include <maxscale/gw.h>
 #include <maxscale/utils.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
@@ -1273,7 +1273,7 @@ load_hashed_password(uint8_t *scramble, uint8_t *payload, uint8_t *passwd)
  * @param db_specified Whether the connection request specified a database
  * @param compress Whether compression is requested - NOT SUPPORTED
  * @return Bit mask (32 bits)
- * @note Capability bits are defined in mysql_client_server_protocol.h
+ * @note Capability bits are defined in maxscale/protocol/mysql.h
  */
 static uint32_t
 create_capabilities(MySQLProtocol *conn, bool db_specified, bool compress)

server/modules/routing/avro/avro.c

@@ -43,7 +43,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 

server/modules/routing/avro/avrorouter.h

@@ -33,7 +33,7 @@
 #include <maxavro.h>
 #include <binlog_common.h>
 #include <sqlite3.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 /** SQLite3 version 3.7.14 introduced the new v2 close interface */
 #if SQLITE_VERSION_NUMBER < 3007014

server/modules/routing/binlog/blr.c

@@ -75,7 +75,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 #include <uuid/uuid.h>

server/modules/routing/binlog/blr.h

@@ -44,7 +44,7 @@
 #include <maxscale/memlog.h>
 #include <maxscale/thread.h>
 #include <zlib.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 #define BINLOG_FNAMELEN         255
 #define BLR_PROTOCOL            "MySQLBackend"

server/modules/routing/binlog/blr_master.c

@@ -77,7 +77,7 @@
 #include <maxscale/thread.h>
 
 /* Temporary requirement for auth data */
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 
 

server/modules/routing/binlog/test/testbinlog.c

@@ -42,7 +42,7 @@
 #include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 #include <getopt.h>

server/modules/routing/readconnroute/readconnroute.c

@@ -47,7 +47,7 @@
  *					and necessary headers.
  * 17/07/2013	Massimiliano Pinto	Added clientReply routine:
  *					called by backend server to send data to client
- *					Included mysql_client_server_protocol.h
+ *					Included maxscale/protocol/mysql.h
  *					with macros and MySQL commands with MYSQL_ prefix
  *					avoiding any conflict with the standard ones
  *					in mysql.h
@@ -88,7 +88,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 #include <maxscale/modutil.h>
 

server/modules/routing/readwritesplit/rwsplit_internal.h

@@ -30,7 +30,7 @@ extern "C" {
 /* This needs to be removed along with dependency on it - see the 
  * rwsplit_tmp_table_multi functions
  */
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
     
 /*
  * The following are implemented in rwsplit_mysql.c

server/modules/routing/readwritesplit/rwsplit_mysql.c

@@ -29,12 +29,12 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>
 
 #if defined(SS_DEBUG)
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #endif
 
 #define RWSPLIT_TRACE_MSG_LEN 1000

server/modules/routing/schemarouter/schemarouter.c

@@ -28,7 +28,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include <pcre.h>

server/modules/routing/schemarouter/schemarouter.h

@@ -29,7 +29,7 @@
 
 #include <maxscale/dcb.h>
 #include <maxscale/hashtable.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <pcre2.h>
 /**
  * Bitmask values for the router session's initialization. These values are used

server/modules/routing/schemarouter/sharding_common.h

@@ -18,7 +18,7 @@
 #include <poll.h>
 #include <maxscale/buffer.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/hashtable.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>