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

Clean config.h some more

Browse Source 
Moved some typedefs to router.h and server.h, changed a few
constants to these enums. Renamed some types in config.h to
remove "Gateway".

There are still some functions in the public header which are
only used in core, but they seem to fit the theme of public functions
so were not moved.
This commit is contained in:
Esa Korhonen
2017-01-24 16:34:48 +02:00
parent b923589222
commit 7d51864402
49 changed files with 178 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/filter/cache/cachefilter.cc vendored
View File

@ -218,7 +218,7 @@ CacheFilter::~CacheFilter()
}
// static
CacheFilter* CacheFilter::create(const char* zName, char** pzOptions, CONFIG_PARAMETER* ppParams)
CacheFilter* CacheFilter::create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams)
{
CacheFilter* pFilter = new CacheFilter;
@ -278,7 +278,7 @@ uint64_t CacheFilter::getCapabilities()
}
// static
bool CacheFilter::process_params(char **pzOptions, CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config)
bool CacheFilter::process_params(char **pzOptions, MXS_CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config)
{
bool error = false;
@ -309,7 +309,7 @@ bool CacheFilter::process_params(char **pzOptions, CONFIG_PARAMETER *ppParams, C
config.rules = config_copy_string(ppParams, "rules");
const CONFIG_PARAMETER *pParam = config_get_param(ppParams, "storage_options");
const MXS_CONFIG_PARAMETER *pParam = config_get_param(ppParams, "storage_options");
if (pParam)
{

4
server/modules/filter/cache/cachefilter.hh vendored
View File

@ -22,7 +22,7 @@ class CacheFilter : public maxscale::Filter<CacheFilter, CacheFilterSession>
public:
~CacheFilter();
static CacheFilter* create(const char* zName, char** pzOptions, CONFIG_PARAMETER* ppParams);
static CacheFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
Cache& cache()
{
@ -47,7 +47,7 @@ private:
CacheFilter(const CacheFilter&);
CacheFilter& operator = (const CacheFilter&);
static bool process_params(char **pzOptions, CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config);
static bool process_params(char **pzOptions, MXS_CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config);
private:
CACHE_CONFIG m_config;

4
server/modules/filter/ccrfilter/ccrfilter.c
View File

@ -49,7 +49,7 @@
* @endverbatim
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -169,7 +169,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
CCR_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(CCR_INSTANCE));

4
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -95,7 +95,7 @@ int dbfw_yyparse(void*);
/*
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -1547,7 +1547,7 @@ bool replace_rules(FW_INSTANCE* instance)
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
FW_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(FW_INSTANCE));

4
server/modules/filter/hintfilter/hintfilter.c
View File

@ -26,7 +26,7 @@
*
*/
static MXS_FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER *createInstance(const char* name, char **options, MXS_CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -91,7 +91,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
HINT_INSTANCE *my_instance;

4
server/modules/filter/insertstream/insertstream.c
View File

@ -30,7 +30,7 @@
* @file datastream.c - Streaming of bulk inserts
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER*params);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER*params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -155,7 +155,7 @@ static const char load_data_template[] = "LOAD DATA LOCAL INFILE 'maxscale.data'
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
DS_INSTANCE *my_instance;

4
server/modules/filter/luafilter/luafilter.c
View File

@ -55,7 +55,7 @@
/*
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -200,7 +200,7 @@ typedef struct
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
LUA_INSTANCE *my_instance;

2
server/modules/filter/masking/maskingfilter.cc
View File

@ -114,7 +114,7 @@ MaskingFilter::~MaskingFilter()
}
// static
MaskingFilter* MaskingFilter::create(const char* zName, char** pzOptions, CONFIG_PARAMETER* pParams)
MaskingFilter* MaskingFilter::create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* pParams)
{
MaskingFilter* pFilter = NULL;

2
server/modules/filter/masking/maskingfilter.hh
View File

@ -29,7 +29,7 @@ public:
typedef MaskingFilterConfig Config;
~MaskingFilter();
static MaskingFilter* create(const char* zName, char** pzOptions, CONFIG_PARAMETER* ppParams);
static MaskingFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
MaskingFilterSession* newSession(MXS_SESSION* pSession);

6
server/modules/filter/masking/maskingfilterconfig.cc
View File

@ -77,21 +77,21 @@ const char* MaskingFilterConfig::warn_type_mismatch_default = config_value_never
//static
MaskingFilterConfig::large_payload_t
MaskingFilterConfig::get_large_payload(const CONFIG_PARAMETER* pParams)
MaskingFilterConfig::get_large_payload(const MXS_CONFIG_PARAMETER* pParams)
{
int value = config_get_enum(pParams, large_payload_name, large_payload_values);
return static_cast<large_payload_t>(value);
}
//static
std::string MaskingFilterConfig::get_rules(const CONFIG_PARAMETER* pParams)
std::string MaskingFilterConfig::get_rules(const MXS_CONFIG_PARAMETER* pParams)
{
return config_get_string(pParams, rules_name);
}
//static
MaskingFilterConfig::warn_type_mismatch_t
MaskingFilterConfig::get_warn_type_mismatch(const CONFIG_PARAMETER* pParams)
MaskingFilterConfig::get_warn_type_mismatch(const MXS_CONFIG_PARAMETER* pParams)
{
int value = config_get_enum(pParams, warn_type_mismatch_name, warn_type_mismatch_values);
return static_cast<warn_type_mismatch_t>(value);

8
server/modules/filter/masking/maskingfilterconfig.hh
View File

@ -42,7 +42,7 @@ public:
static const MXS_ENUM_VALUE warn_type_mismatch_values[];
static const char* warn_type_mismatch_default;
MaskingFilterConfig(const char* zName, const CONFIG_PARAMETER* pParams)
MaskingFilterConfig(const char* zName, const MXS_CONFIG_PARAMETER* pParams)
: m_name(zName)
, m_large_payload(get_large_payload(pParams))
, m_rules(get_rules(pParams))
@ -84,9 +84,9 @@ public:
m_warn_type_mismatch = w;
}
static large_payload_t get_large_payload(const CONFIG_PARAMETER* pParams);
static std::string get_rules(const CONFIG_PARAMETER* pParams);
static warn_type_mismatch_t get_warn_type_mismatch(const CONFIG_PARAMETER* pParams);
static large_payload_t get_large_payload(const MXS_CONFIG_PARAMETER* pParams);
static std::string get_rules(const MXS_CONFIG_PARAMETER* pParams);
static warn_type_mismatch_t get_warn_type_mismatch(const MXS_CONFIG_PARAMETER* pParams);
private:
std::string m_name;

6
server/modules/filter/maxrows/maxrows.c
View File

@ -46,7 +46,7 @@
#include <maxscale/debug.h>
#include "maxrows.h"
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *sdata);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *sdata);
@ -171,7 +171,7 @@ static int handle_expecting_nothing(MAXROWS_SESSION_DATA *csdata);
static int handle_expecting_response(MAXROWS_SESSION_DATA *csdata);
static int handle_rows(MAXROWS_SESSION_DATA *csdata);
static int handle_ignoring_response(MAXROWS_SESSION_DATA *csdata);
static bool process_params(char **options, CONFIG_PARAMETER *params, MAXROWS_CONFIG* config);
static bool process_params(char **options, MXS_CONFIG_PARAMETER *params, MAXROWS_CONFIG* config);
static int send_upstream(MAXROWS_SESSION_DATA *csdata);
static int send_ok_upstream(MAXROWS_SESSION_DATA *csdata);
@ -188,7 +188,7 @@ static int send_ok_upstream(MAXROWS_SESSION_DATA *csdata);
*
* @return The instance data for this new instance
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
MAXROWS_INSTANCE *cinstance = MXS_CALLOC(1, sizeof(MAXROWS_INSTANCE));

6
server/modules/filter/mqfilter/mqfilter.c
View File

@ -86,7 +86,7 @@ static int hktask_id = 0;
/*
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -519,7 +519,7 @@ char** parse_optstr(const char* str, const char* tok, int* szstore)
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
MQ_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(MQ_INSTANCE));
@ -574,7 +574,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
MXS_ABORT_IF_NULL(my_instance->obj_trg);
}
CONFIG_PARAMETER *p = config_get_param(params, "logging_source_user");
MXS_CONFIG_PARAMETER *p = config_get_param(params, "logging_source_user");
if (p && my_instance->src_trg)
{

4
server/modules/filter/namedserverfilter/namedserverfilter.c
View File

@ -43,7 +43,7 @@
* @endverbatim
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -164,7 +164,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE*)MXS_CALLOC(1, sizeof(REGEXHINT_INSTANCE));

4
server/modules/filter/qlafilter/qlafilter.c
View File

@ -75,7 +75,7 @@ enum log_options
/*
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -270,7 +270,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
QLA_INSTANCE *my_instance = (QLA_INSTANCE*) MXS_MALLOC(sizeof(QLA_INSTANCE));

4
server/modules/filter/regexfilter/regexfilter.c
View File

@ -42,7 +42,7 @@
* @endverbatim
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -180,7 +180,7 @@ void free_instance(REGEX_INSTANCE *instance)
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
REGEX_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(REGEX_INSTANCE));

4
server/modules/filter/tee/tee.c
View File

@ -99,7 +99,7 @@ static unsigned char required_packets[] =
/*
* The filter entry points
*/
static MXS_FILTER *createInstance(const char* name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char* name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -363,7 +363,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
TEE_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(TEE_INSTANCE));

4
server/modules/filter/testfilter/testfilter.c
View File

@ -30,7 +30,7 @@
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *params);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -117,7 +117,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
TEST_INSTANCE *my_instance;

4
server/modules/filter/topfilter/topfilter.c
View File

@ -50,7 +50,7 @@
/*
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -193,7 +193,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
TOPN_INSTANCE *my_instance = (TOPN_INSTANCE*)MXS_MALLOC(sizeof(TOPN_INSTANCE));

4
server/modules/filter/tpmfilter/tpmfilter.c
View File

@ -77,7 +77,7 @@ static const int default_sql_size = 4 * 1024;
/*
* The filter entry points
*/
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@ -196,7 +196,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
* @return The instance data for this new instance
*/
static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
{
TPM_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(TPM_INSTANCE));