![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ac0f2e8c794c61c36a9d0aa34cff47deb2a9c939..ed585914cd38bee517d0dddfd84e47bfcbb6b980 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
*/
static int
-attr_cmp(sdb_host_t *host, sdb_store_cond_t *cond,
+attr_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond,
sdb_store_matcher_t *filter)
{
sdb_attribute_t *attr;
sdb_data_t value = SDB_DATA_INIT;
int status;
+ if (obj->type != SDB_HOST)
+ return INT_MAX;
+
if (sdb_store_expr_eval(ATTR_C(cond)->expr, &value))
return INT_MAX;
- attr = attr_get(host, ATTR_C(cond)->name, filter);
+ attr = attr_get(HOST(obj), ATTR_C(cond)->name, filter);
if (! attr)
status = INT_MAX;
else if (attr->value.type != value.type)
} /* match_string */
static int
-match_logical(sdb_store_matcher_t *m, sdb_host_t *host,
+match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
int status;
assert((m->type == MATCHER_AND) || (m->type == MATCHER_OR));
assert(OP_M(m)->left && OP_M(m)->right);
- status = sdb_store_matcher_matches(OP_M(m)->left, STORE_OBJ(host),
- filter);
+ status = sdb_store_matcher_matches(OP_M(m)->left, obj, filter);
/* lazy evaluation */
if ((! status) && (m->type == MATCHER_AND))
else if (status && (m->type == MATCHER_OR))
return status;
- return sdb_store_matcher_matches(OP_M(m)->right, STORE_OBJ(host), filter);
+ return sdb_store_matcher_matches(OP_M(m)->right, obj, filter);
} /* match_logical */
static int
-match_unary(sdb_store_matcher_t *m, sdb_host_t *host,
+match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
assert(m->type == MATCHER_NOT);
assert(UOP_M(m)->op);
- return !sdb_store_matcher_matches(UOP_M(m)->op, STORE_OBJ(host), filter);
+ return !sdb_store_matcher_matches(UOP_M(m)->op, obj, filter);
} /* match_unary */
static int
-match_name(sdb_store_matcher_t *m, sdb_host_t *host,
+match_name(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
sdb_avltree_iter_t *iter = NULL;
assert(m->type == MATCHER_NAME);
+ if (obj->type == NAME_M(m)->obj_type)
+ return match_string(&NAME_M(m)->name, SDB_OBJ(obj)->name);
+ else if (obj->type != SDB_HOST)
+ return 0;
+
switch (NAME_M(m)->obj_type) {
- case SDB_HOST:
- return match_string(&NAME_M(m)->name, SDB_OBJ(host)->name);
- break;
case SDB_SERVICE:
- iter = sdb_avltree_get_iter(host->services);
+ iter = sdb_avltree_get_iter(HOST(obj)->services);
break;
case SDB_ATTRIBUTE:
- iter = sdb_avltree_get_iter(host->attributes);
+ iter = sdb_avltree_get_iter(HOST(obj)->attributes);
break;
}
} /* match_name */
static int
-match_attr(sdb_store_matcher_t *m, sdb_host_t *host,
+match_attr(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
sdb_attribute_t *attr;
assert(m->type == MATCHER_ATTR);
assert(ATTR_M(m)->name);
- attr = attr_get(host, ATTR_M(m)->name, filter);
+ if (obj->type != SDB_HOST)
+ return 0;
+
+ attr = attr_get(HOST(obj), ATTR_M(m)->name, filter);
if (attr) {
char buf[sdb_data_strlen(&attr->value) + 1];
if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0)
} /* match_attr */
static int
-match_lt(sdb_store_matcher_t *m, sdb_host_t *host,
+match_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
int status;
assert(m->type == MATCHER_LT);
- status = COND_M(m)->cond->cmp(host, COND_M(m)->cond, filter);
+ status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
return (status != INT_MAX) && (status < 0);
} /* match_lt */
static int
-match_le(sdb_store_matcher_t *m, sdb_host_t *host,
+match_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
int status;
assert(m->type == MATCHER_LE);
- status = COND_M(m)->cond->cmp(host, COND_M(m)->cond, filter);
+ status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
return (status != INT_MAX) && (status <= 0);
} /* match_le */
static int
-match_eq(sdb_store_matcher_t *m, sdb_host_t *host,
+match_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
int status;
assert(m->type == MATCHER_EQ);
- status = COND_M(m)->cond->cmp(host, COND_M(m)->cond, filter);
+ status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
return (status != INT_MAX) && (! status);
} /* match_eq */
static int
-match_ge(sdb_store_matcher_t *m, sdb_host_t *host,
+match_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
int status;
assert(m->type == MATCHER_GE);
- status = COND_M(m)->cond->cmp(host, COND_M(m)->cond, filter);
+ status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
return (status != INT_MAX) && (status >= 0);
} /* match_ge */
static int
-match_gt(sdb_store_matcher_t *m, sdb_host_t *host,
+match_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
int status;
assert(m->type == MATCHER_GT);
- status = COND_M(m)->cond->cmp(host, COND_M(m)->cond, filter);
+ status = COND_M(m)->cond->cmp(obj, COND_M(m)->cond, filter);
return (status != INT_MAX) && (status > 0);
} /* match_gt */
static int
-match_isnull(sdb_store_matcher_t *m, sdb_host_t *host,
+match_isnull(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
assert(m->type == MATCHER_ISNULL);
- return attr_get(host, ISNULL_M(m)->attr_name, filter) == NULL;
+ if (obj->type != SDB_HOST)
+ return 0;
+ return attr_get(HOST(obj), ISNULL_M(m)->attr_name, filter) == NULL;
} /* match_isnull */
-typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_host_t *,
+typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_obj_t *,
sdb_store_matcher_t *);
/* this array needs to be indexable by the matcher types;
sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj,
sdb_store_matcher_t *filter)
{
- if (obj->type != SDB_HOST)
- return 0;
-
if (filter && (! sdb_store_matcher_matches(filter, obj, NULL)))
return 0;
if ((m->type < 0) || ((size_t)m->type >= SDB_STATIC_ARRAY_LEN(matchers)))
return 0;
- return matchers[m->type](m, HOST(obj), filter);
+ return matchers[m->type](m, obj, filter);
} /* sdb_store_matcher_matches */
char *