X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmatch_regex.c;h=1defc18026241e6580e777b6ec8324c84c1411b7;hb=1bb1667d220d07f25c584a41be7f3dfcbc1ad04b;hp=1fca88986331e1c4d30257e7e0e7d73dfb9dc7a2;hpb=108068f268cad453e5d3b54e288917409db1e467;p=collectd.git diff --git a/src/match_regex.c b/src/match_regex.c index 1fca8898..1defc180 100644 --- a/src/match_regex.c +++ b/src/match_regex.c @@ -58,6 +58,7 @@ struct mr_match_s mr_regex_t *plugin_instance; mr_regex_t *type; mr_regex_t *type_instance; + _Bool invert; }; /* @@ -195,6 +196,8 @@ static int mr_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ return (-ENOMEM); } memset (m, 0, sizeof (*m)); + + m->invert = 0; status = 0; for (i = 0; i < ci->children_num; i++) @@ -212,6 +215,8 @@ static int mr_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ status = mr_config_add_regex (&m->type, child); else if (strcasecmp ("TypeInstance", child->key) == 0) status = mr_config_add_regex (&m->type_instance, child); + else if (strcasecmp ("Invert", child->key) == 0) + status = cf_util_get_boolean(child, &m->invert); else { log_err ("The `%s' configuration option is not understood and " @@ -263,26 +268,34 @@ static int mr_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */ void **user_data) { mr_match_t *m; + int match_value = FC_MATCH_MATCHES; + int nomatch_value = FC_MATCH_NO_MATCH; if ((user_data == NULL) || (*user_data == NULL)) return (-1); m = *user_data; + if (m->invert) + { + match_value = FC_MATCH_NO_MATCH; + nomatch_value = FC_MATCH_MATCHES; + } + if (mr_match_regexen (m->host, vl->host) == FC_MATCH_NO_MATCH) - return (FC_MATCH_NO_MATCH); + return (nomatch_value); if (mr_match_regexen (m->plugin, vl->plugin) == FC_MATCH_NO_MATCH) - return (FC_MATCH_NO_MATCH); + return (nomatch_value); if (mr_match_regexen (m->plugin_instance, vl->plugin_instance) == FC_MATCH_NO_MATCH) - return (FC_MATCH_NO_MATCH); + return (nomatch_value); if (mr_match_regexen (m->type, vl->type) == FC_MATCH_NO_MATCH) - return (FC_MATCH_NO_MATCH); + return (nomatch_value); if (mr_match_regexen (m->type_instance, vl->type_instance) == FC_MATCH_NO_MATCH) - return (FC_MATCH_NO_MATCH); + return (nomatch_value); - return (FC_MATCH_MATCHES); + return (match_value); } /* }}} int mr_match */ void module_register (void)