Uncrustify maxscale
See script directory for method. The script to run in the top level MaxScale directory is called maxscale-uncrustify.sh, which uses another script, list-src, from the same directory (so you need to set your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
@ -10,7 +10,7 @@
|
||||
* of this software will be governed by version 2 or later of the General
|
||||
* Public License.
|
||||
*/
|
||||
#pragma once
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* @file authenticator.h
|
||||
@ -35,7 +35,7 @@ MXS_BEGIN_DECLS
|
||||
*/
|
||||
typedef enum authenticator_capability
|
||||
{
|
||||
ACAP_TYPE_ASYNC = 0x000100000000/**< Supports asynchronous access */
|
||||
ACAP_TYPE_ASYNC = 0x000100000000 /**< Supports asynchronous access */
|
||||
} authenticator_capability_t;
|
||||
|
||||
/** Maximum number of authenticator options */
|
||||
@ -89,15 +89,15 @@ struct servlistener;
|
||||
*/
|
||||
typedef struct mxs_authenticator
|
||||
{
|
||||
void* (*initialize)(char **options);
|
||||
void* (*initialize)(char** options);
|
||||
void* (*create)(void* instance);
|
||||
bool (*extract)(struct dcb *, GWBUF *);
|
||||
bool (*connectssl)(struct dcb *);
|
||||
int (*authenticate)(struct dcb *);
|
||||
void (*free)(struct dcb *);
|
||||
void (*destroy)(void *);
|
||||
int (*loadusers)(struct servlistener *);
|
||||
void (*diagnostic)(struct dcb*, struct servlistener *);
|
||||
bool (* extract)(struct dcb*, GWBUF*);
|
||||
bool (* connectssl)(struct dcb*);
|
||||
int (* authenticate)(struct dcb*);
|
||||
void (* free)(struct dcb*);
|
||||
void (* destroy)(void*);
|
||||
int (* loadusers)(struct servlistener*);
|
||||
void (* diagnostic)(struct dcb*, struct servlistener*);
|
||||
|
||||
/**
|
||||
* @brief Return diagnostic information about the authenticator
|
||||
@ -111,32 +111,38 @@ typedef struct mxs_authenticator
|
||||
*
|
||||
* @see jansson.h
|
||||
*/
|
||||
json_t* (*diagnostic_json)(const struct servlistener *listener);
|
||||
json_t* (*diagnostic_json)(const struct servlistener* listener);
|
||||
|
||||
/** This entry point was added to avoid calling authenticator functions
|
||||
* directly when a COM_CHANGE_USER command is executed. */
|
||||
int (*reauthenticate)(struct dcb *, const char *user,
|
||||
uint8_t *token, size_t token_len, /**< Client auth token */
|
||||
uint8_t *scramble, size_t scramble_len, /**< Scramble sent by MaxScale to client */
|
||||
uint8_t *output, size_t output_len); /**< Hashed client password used by backend protocols */
|
||||
int (* reauthenticate)(struct dcb*,
|
||||
const char* user,
|
||||
uint8_t* token,
|
||||
size_t token_len, /**< Client auth token */
|
||||
uint8_t* scramble,
|
||||
size_t scramble_len, /**< Scramble sent by MaxScale to client
|
||||
* */
|
||||
uint8_t* output,
|
||||
size_t output_len); /**< Hashed client password used by backend
|
||||
* protocols */
|
||||
} MXS_AUTHENTICATOR;
|
||||
|
||||
/** Return values for extract and authenticate entry points */
|
||||
#define MXS_AUTH_SUCCEEDED 0 /**< Authentication was successful */
|
||||
#define MXS_AUTH_FAILED 1 /**< Authentication failed */
|
||||
#define MXS_AUTH_FAILED_DB 2 /**< Authentication failed, database not found */
|
||||
#define MXS_AUTH_FAILED_SSL 3 /**< SSL authentication failed */
|
||||
#define MXS_AUTH_INCOMPLETE 4 /**< Authentication is not yet complete */
|
||||
#define MXS_AUTH_SSL_INCOMPLETE 5 /**< SSL connection is not yet complete */
|
||||
#define MXS_AUTH_SSL_COMPLETE 6 /**< SSL connection complete or not required */
|
||||
#define MXS_AUTH_NO_SESSION 7
|
||||
#define MXS_AUTH_BAD_HANDSHAKE 8 /**< Malformed client packet */
|
||||
#define MXS_AUTH_FAILED_WRONG_PASSWORD 9 /**< Client provided wrong password */
|
||||
#define MXS_AUTH_SUCCEEDED 0/**< Authentication was successful */
|
||||
#define MXS_AUTH_FAILED 1/**< Authentication failed */
|
||||
#define MXS_AUTH_FAILED_DB 2/**< Authentication failed, database not found */
|
||||
#define MXS_AUTH_FAILED_SSL 3/**< SSL authentication failed */
|
||||
#define MXS_AUTH_INCOMPLETE 4/**< Authentication is not yet complete */
|
||||
#define MXS_AUTH_SSL_INCOMPLETE 5/**< SSL connection is not yet complete */
|
||||
#define MXS_AUTH_SSL_COMPLETE 6/**< SSL connection complete or not required */
|
||||
#define MXS_AUTH_NO_SESSION 7
|
||||
#define MXS_AUTH_BAD_HANDSHAKE 8/**< Malformed client packet */
|
||||
#define MXS_AUTH_FAILED_WRONG_PASSWORD 9/**< Client provided wrong password */
|
||||
|
||||
/** Return values for the loadusers entry point */
|
||||
#define MXS_AUTH_LOADUSERS_OK 0 /**< Users loaded successfully */
|
||||
#define MXS_AUTH_LOADUSERS_ERROR 1 /**< Temporary error, service is started */
|
||||
#define MXS_AUTH_LOADUSERS_FATAL 2 /**< Fatal error, service is not started */
|
||||
#define MXS_AUTH_LOADUSERS_OK 0 /**< Users loaded successfully */
|
||||
#define MXS_AUTH_LOADUSERS_ERROR 1 /**< Temporary error, service is started */
|
||||
#define MXS_AUTH_LOADUSERS_FATAL 2 /**< Fatal error, service is not started */
|
||||
|
||||
/**
|
||||
* Authentication states
|
||||
@ -151,35 +157,64 @@ typedef struct mxs_authenticator
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
MXS_AUTH_STATE_INIT, /**< Initial authentication state */
|
||||
MXS_AUTH_STATE_PENDING_CONNECT,/**< Connection creation is underway */
|
||||
MXS_AUTH_STATE_CONNECTED, /**< Network connection to server created */
|
||||
MXS_AUTH_STATE_MESSAGE_READ, /**< Read a authentication message from the server */
|
||||
MXS_AUTH_STATE_RESPONSE_SENT, /**< Responded to the read authentication message */
|
||||
MXS_AUTH_STATE_FAILED, /**< Authentication failed */
|
||||
MXS_AUTH_STATE_HANDSHAKE_FAILED, /**< Authentication failed immediately */
|
||||
MXS_AUTH_STATE_COMPLETE /**< Authentication is complete */
|
||||
MXS_AUTH_STATE_INIT, /**< Initial authentication state */
|
||||
MXS_AUTH_STATE_PENDING_CONNECT, /**< Connection creation is underway */
|
||||
MXS_AUTH_STATE_CONNECTED, /**< Network connection to server created */
|
||||
MXS_AUTH_STATE_MESSAGE_READ, /**< Read a authentication message from the server */
|
||||
MXS_AUTH_STATE_RESPONSE_SENT, /**< Responded to the read authentication message */
|
||||
MXS_AUTH_STATE_FAILED, /**< Authentication failed */
|
||||
MXS_AUTH_STATE_HANDSHAKE_FAILED,/**< Authentication failed immediately */
|
||||
MXS_AUTH_STATE_COMPLETE /**< Authentication is complete */
|
||||
} mxs_auth_state_t;
|
||||
|
||||
#define STRPROTOCOLSTATE(s) ((s) == MXS_AUTH_STATE_INIT ? "MXS_AUTH_STATE_INIT" : \
|
||||
((s) == MXS_AUTH_STATE_PENDING_CONNECT ? "MXS_AUTH_STATE_PENDING_CONNECT" : \
|
||||
((s) == MXS_AUTH_STATE_CONNECTED ? "MXS_AUTH_STATE_CONNECTED" : \
|
||||
((s) == MXS_AUTH_STATE_MESSAGE_READ ? "MXS_AUTH_STATE_MESSAGE_READ" : \
|
||||
((s) == MXS_AUTH_STATE_RESPONSE_SENT ? "MXS_AUTH_STATE_RESPONSE_SENT" : \
|
||||
((s) == MXS_AUTH_STATE_FAILED ? "MXS_AUTH_STATE_FAILED" : \
|
||||
((s) == MXS_AUTH_STATE_HANDSHAKE_FAILED ? "MXS_AUTH_STATE_HANDSHAKE_FAILED" : \
|
||||
((s) == MXS_AUTH_STATE_COMPLETE ? "MXS_AUTH_STATE_COMPLETE" : \
|
||||
"UNKNOWN AUTH STATE"))))))))
|
||||
#define STRPROTOCOLSTATE(s) \
|
||||
((s) == MXS_AUTH_STATE_INIT ? "MXS_AUTH_STATE_INIT" \
|
||||
: ((s) == MXS_AUTH_STATE_PENDING_CONNECT ? "MXS_AUTH_STATE_PENDING_CONNECT" \
|
||||
: ((s) \
|
||||
== MXS_AUTH_STATE_CONNECTED ? \
|
||||
"MXS_AUTH_STATE_CONNECTED" \
|
||||
: (( \
|
||||
s) \
|
||||
== \
|
||||
MXS_AUTH_STATE_MESSAGE_READ \
|
||||
? \
|
||||
"MXS_AUTH_STATE_MESSAGE_READ" \
|
||||
: (( \
|
||||
s) \
|
||||
== \
|
||||
MXS_AUTH_STATE_RESPONSE_SENT \
|
||||
? \
|
||||
"MXS_AUTH_STATE_RESPONSE_SENT" \
|
||||
: (( \
|
||||
s) \
|
||||
== \
|
||||
MXS_AUTH_STATE_FAILED \
|
||||
? \
|
||||
"MXS_AUTH_STATE_FAILED" \
|
||||
: (( \
|
||||
s) \
|
||||
== \
|
||||
MXS_AUTH_STATE_HANDSHAKE_FAILED \
|
||||
? \
|
||||
"MXS_AUTH_STATE_HANDSHAKE_FAILED" \
|
||||
: (( \
|
||||
s) \
|
||||
== \
|
||||
MXS_AUTH_STATE_COMPLETE \
|
||||
? \
|
||||
"MXS_AUTH_STATE_COMPLETE" \
|
||||
: \
|
||||
"UNKNOWN AUTH STATE"))))))))
|
||||
|
||||
/**
|
||||
* The MXS_AUTHENTICATOR version data. The following should be updated whenever
|
||||
* the MXS_AUTHENTICATOR structure is changed. See the rules defined in modinfo.h
|
||||
* that define how these numbers should change.
|
||||
*/
|
||||
#define MXS_AUTHENTICATOR_VERSION {2, 1, 0}
|
||||
#define MXS_AUTHENTICATOR_VERSION {2, 1, 0}
|
||||
|
||||
|
||||
bool authenticator_init(void **instance, const char *authenticator, const char *options);
|
||||
const char* get_default_authenticator(const char *protocol);
|
||||
bool authenticator_init(void** instance, const char* authenticator, const char* options);
|
||||
const char* get_default_authenticator(const char* protocol);
|
||||
|
||||
MXS_END_DECLS
|
||||
|
||||
Reference in New Issue
Block a user