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

Fix ccrfilter parameters

Browse Source 
The filter used the value of `count` for the `time` parameter.

The `options` parameter used the old-style parsing of the options and the
`match` and `exclude` parameters didn't use config_copy_string.
This commit is contained in:
Markus Mäkelä
2017-01-20 18:32:03 +02:00
parent 03402a86ed
commit 50f594fa4e
1 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,14 @@ typedef struct
time_t last_modification; /*< Time of the last data modifying operation */ time_t last_modification; /*< Time of the last data modifying operation */
} CCR_SESSION; } CCR_SESSION;
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", REG_ICASE},
{"case", 0},
{"extended", REG_EXTENDED},
{NULL}
};
/** /**
* The module entry point routine. It is this routine that * The module entry point routine. It is this routine that
* must populate the structure that is referred to as the * must populate the structure that is referred to as the
@ -136,6 +144,13 @@ MXS_MODULE* MXS_CREATE_MODULE()
{"time", MXS_MODULE_PARAM_COUNT, CCR_DEFAULT_TIME}, {"time", MXS_MODULE_PARAM_COUNT, CCR_DEFAULT_TIME},
{"match", MXS_MODULE_PARAM_STRING}, {"match", MXS_MODULE_PARAM_STRING},
{"ignore", MXS_MODULE_PARAM_STRING}, {"ignore", MXS_MODULE_PARAM_STRING},
{
"options",
MXS_MODULE_PARAM_ENUM,
"ignorecase",
MXS_MODULE_OPT_NONE,
option_values
},
{MXS_END_MODULE_PARAMS} {MXS_END_MODULE_PARAMS}
} }
}; };
@ -156,46 +171,19 @@ MXS_MODULE* MXS_CREATE_MODULE()
static MXS_FILTER * static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params) createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
{ {
CCR_INSTANCE *my_instance; CCR_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(CCR_INSTANCE));
int i;
int cflags = REG_ICASE;
if ((my_instance = MXS_CALLOC(1, sizeof(CCR_INSTANCE))) != NULL) if (my_instance)
{ {
my_instance->count = config_get_integer(params, "count"); my_instance->count = config_get_integer(params, "count");
my_instance->time = config_get_integer(params, "count"); my_instance->time = config_get_integer(params, "time");
my_instance->stats.n_add_count = 0; my_instance->stats.n_add_count = 0;
my_instance->stats.n_add_time = 0; my_instance->stats.n_add_time = 0;
my_instance->stats.n_modified = 0; my_instance->stats.n_modified = 0;
my_instance->match = NULL;
my_instance->nomatch = NULL;
if (options) int cflags = config_get_enum(params, "options", option_values);
{
for (i = 0; options[i]; i++)
{
if (!strcasecmp(options[i], "ignorecase"))
{
cflags |= REG_ICASE;
}
else if (!strcasecmp(options[i], "case"))
{
cflags &= ~REG_ICASE;
}
else if (!strcasecmp(options[i], "extended"))
{
cflags |= REG_EXTENDED;
}
else
{
MXS_ERROR("unsupported option '%s'.", options[i]);
}
}
}
const char *match = config_get_string(params, "match"); if ((my_instance->match = config_copy_string(params, "match")))
if (*match && (my_instance->match = MXS_STRDUP(match)))
{ {
if (regcomp(&my_instance->re, my_instance->match, cflags)) if (regcomp(&my_instance->re, my_instance->match, cflags))
{ {
@ -203,9 +191,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
} }
} }
const char *ignore = config_get_string(params, "ignore"); if ((my_instance->nomatch = config_copy_string(params, "ignore")))
if (*ignore && (my_instance->nomatch = MXS_STRDUP(ignore)))
{ {
if (regcomp(&my_instance->nore, my_instance->nomatch, cflags)) if (regcomp(&my_instance->nore, my_instance->nomatch, cflags))
{ {
@ -228,7 +214,6 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
static MXS_FILTER_SESSION * static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, MXS_SESSION *session) newSession(MXS_FILTER *instance, MXS_SESSION *session)
{ {
CCR_INSTANCE *my_instance = (CCR_INSTANCE *)instance;
CCR_SESSION *my_session = MXS_MALLOC(sizeof(CCR_SESSION)); CCR_SESSION *my_session = MXS_MALLOC(sizeof(CCR_SESSION));
if (my_session) if (my_session)
@ -376,7 +361,6 @@ static void
diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb) diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
{ {
CCR_INSTANCE *my_instance = (CCR_INSTANCE *)instance; CCR_INSTANCE *my_instance = (CCR_INSTANCE *)instance;
CCR_SESSION *my_session = (CCR_SESSION *)fsession;
dcb_printf(dcb, "Configuration:\n\tCount: %d\n", my_instance->count); dcb_printf(dcb, "Configuration:\n\tCount: %d\n", my_instance->count);
dcb_printf(dcb, "\tTime: %d seconds\n", my_instance->time); dcb_printf(dcb, "\tTime: %d seconds\n", my_instance->time);