X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=1fe45dfe11f58510cd5ec6a884dc48135130cc5b;hb=b0af45ebf920955095b9fdeaddbde0107c6e519f;hp=bb32157402d8c047a20326aab81e069a4073e5f1;hpb=69892731c1a337485c955f5c292d8cf7c179a162;p=sysdb.git

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index bb32157..1fe45df 100644
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -85,7 +85,7 @@ match_obj(sdb_store_matcher_t *m, sdb_store_base_t *obj);
 /* specific matchers */
 
 static int
-match_name(name_matcher_t *m, const char *name)
+match_obj_name(name_matcher_t *m, const char *name)
 {
 	assert(m);
 
@@ -101,16 +101,16 @@ match_name(name_matcher_t *m, const char *name)
 					/* matches */ 0, NULL, /* flags = */ 0))
 		return 0;
 	return 1;
-} /* match_name */
+} /* match_obj_name */
 
 static char *
-name_tostring(name_matcher_t *m, char *buf, size_t buflen)
+obj_name_tostring(name_matcher_t *m, char *buf, size_t buflen)
 {
 	snprintf(buf, buflen, "{ %s%s%s, %p }",
 			m->name ? "'" : "", m->name ? m->name : "NULL", m->name ? "'" : "",
 			m->name_re);
 	return buf;
-} /* name_tostring */
+} /* obj_name_tostring */
 
 static char *
 logical_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
@@ -148,6 +148,17 @@ unary_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 	return buf;
 } /* unary_tostring */
 
+static char *
+name_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+{
+	char name[buflen + 1];
+	assert(m->type == MATCHER_NAME);
+	snprintf(buf, buflen, "OBJ[%s]{ NAME%s }",
+			SDB_STORE_TYPE_TO_NAME(OBJ_M(m)->obj_type),
+			obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name)));
+	return buf;
+} /* name_tostring */
+
 static char *
 attr_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 {
@@ -160,48 +171,62 @@ attr_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 
 	assert(m->type == MATCHER_ATTR);
 	snprintf(buf, buflen, "ATTR{ NAME%s, VALUE%s }",
-			name_tostring(&OBJ_M(m)->name, name, sizeof(name)),
-			name_tostring(&ATTR_M(m)->value, value, sizeof(value)));
+			obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name)),
+			obj_name_tostring(&ATTR_M(m)->value, value, sizeof(value)));
 	return buf;
 } /* attr_tostring */
 
 static char *
-service_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+host_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
 {
 	char name[buflen + 1], attr[buflen + 1];
 
 	if (! m) {
-		snprintf(buf, buflen, "SERVICE{}");
+		snprintf(buf, buflen, "HOST{}");
 		return buf;
 	}
 
-	assert(m->type == MATCHER_SERVICE);
-	snprintf(buf, buflen, "SERVICE{ NAME%s, %s }",
-			name_tostring(&OBJ_M(m)->name, name, sizeof(name)),
-			attr_tostring(SDB_STORE_MATCHER(SERVICE_M(m)->attr),
+	assert(m->type == MATCHER_HOST);
+	snprintf(buf, buflen, "HOST{ NAME%s, %s }",
+			obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name)),
+			attr_tostring(SDB_STORE_MATCHER(HOST_M(m)->attr),
 				attr, sizeof(attr)));
 	return buf;
-} /* service_tostring */
+} /* host_tostring */
 
-static char *
-host_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen)
+static int
+match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 {
-	char name[buflen + 1], service[buflen + 1], attr[buflen + 1];
+	sdb_llist_iter_t *iter = NULL;
+	int status = 0;
 
-	if (! m) {
-		snprintf(buf, buflen, "HOST{}");
-		return buf;
+	assert(m && obj);
+
+	if (obj->type != SDB_HOST)
+		return 0;
+
+	switch (OBJ_M(m)->obj_type) {
+		case SDB_HOST:
+			return match_obj_name(&OBJ_M(m)->name, obj->super.name);
+			break;
+		case SDB_SERVICE:
+			iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->children);
+			break;
+		case SDB_ATTRIBUTE:
+			iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
+			break;
 	}
 
-	assert(m->type == MATCHER_HOST);
-	snprintf(buf, buflen, "HOST{ NAME%s, %s, %s }",
-			name_tostring(&OBJ_M(m)->name, name, sizeof(name)),
-			service_tostring(SDB_STORE_MATCHER(HOST_M(m)->service),
-				service, sizeof(service)),
-			attr_tostring(SDB_STORE_MATCHER(HOST_M(m)->attr),
-				attr, sizeof(attr)));
-	return buf;
-} /* host_tostring */
+	while (sdb_llist_iter_has_next(iter)) {
+		sdb_store_base_t *child = STORE_BASE(sdb_llist_iter_get_next(iter));
+		if (match_obj_name(&OBJ_M(m)->name, child->super.name)) {
+			status = 1;
+			break;
+		}
+	}
+	sdb_llist_iter_destroy(iter);
+	return status;
+} /* match_name */
 
 /* match attribute specific values;
  * always call this function through match_obj() */
@@ -219,74 +244,23 @@ match_attr(attr_matcher_t *m, sdb_store_base_t *obj)
 
 		if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0)
 			return 0;
-		return match_name(&m->value, buf);
+		return match_obj_name(&m->value, buf);
 	}
 } /* match_attr */
 
-/* match service specific values;
- * always call this function through match_obj() */
-static int
-match_service(service_matcher_t *m, sdb_store_base_t *obj)
-{
-	sdb_llist_iter_t *iter;
-
-	assert(m && obj);
-
-	if (obj->type != SDB_SERVICE)
-		return 0;
-
-	if (! m->attr)
-		return 1;
-
-	iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_store_base_t *attr = STORE_BASE(sdb_llist_iter_get_next(iter));
-
-		/* if any of the attributes matches we found a matching service */
-		if (match_obj(M(m->attr), attr)) {
-			sdb_llist_iter_destroy(iter);
-			return 1;
-		}
-	}
-	sdb_llist_iter_destroy(iter);
-	return 0;
-} /* match_service */
-
 /* match host specific values;
  * always call this function through match_obj() */
 static int
 match_host(host_matcher_t *m, sdb_store_base_t *obj)
 {
 	sdb_llist_iter_t *iter;
-	int status;
 
 	assert(m && obj);
 
 	if (obj->type != SDB_HOST)
 		return 0;
 
-	if (m->service) {
-		iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->children);
-		status = 0;
-	}
-	else {
-		iter = NULL;
-		status = 1;
-	}
-	while (sdb_llist_iter_has_next(iter)) {
-		sdb_store_base_t *service = STORE_BASE(sdb_llist_iter_get_next(iter));
-
-		/* found a matching service */
-		if (match_obj(M(m->service), service)) {
-			status = 1;
-			break;
-		}
-	}
-	sdb_llist_iter_destroy(iter);
-
-	if (! status)
-		return status;
-	else if (! m->attr)
+	if (! m->attr)
 		return 1;
 
 	iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes);
@@ -313,7 +287,7 @@ static matcher_cb matchers[] = {
 	match_logical,
 	match_logical,
 	match_unary,
-	match_obj,
+	match_name,
 	match_obj,
 	match_obj,
 };
@@ -324,8 +298,8 @@ static matcher_tostring_cb matchers_tostring[] = {
 	logical_tostring,
 	logical_tostring,
 	unary_tostring,
+	name_tostring,
 	attr_tostring,
-	service_tostring,
 	host_tostring,
 };
 
@@ -363,7 +337,7 @@ match_obj(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 
 	assert(m && obj);
 
-	status = match_name(&OBJ_M(m)->name, obj->super.name);
+	status = match_obj_name(&OBJ_M(m)->name, obj->super.name);
 	if (! status)
 		return status;
 
@@ -371,12 +345,12 @@ match_obj(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 		case MATCHER_ATTR:
 			return match_attr(ATTR_M(m), obj);
 			break;
-		case MATCHER_SERVICE:
-			return match_service(SERVICE_M(m), obj);
-			break;
 		case MATCHER_HOST:
 			return match_host(HOST_M(m), obj);
 			break;
+		default:
+			assert(m->type != m->type);
+			break;
 	}
 	return 0;
 } /* match_obj */
@@ -423,6 +397,7 @@ static int
 obj_matcher_init(sdb_object_t *obj, va_list ap)
 {
 	obj_matcher_t *m = OBJ_M(obj);
+	M(obj)->type = MATCHER_NAME;
 	return name_matcher_init(&m->name, ap);
 } /* obj_matcher_init */
 
@@ -439,11 +414,11 @@ attr_matcher_init(sdb_object_t *obj, va_list ap)
 	attr_matcher_t *attr = ATTR_M(obj);
 	int status;
 
-	M(obj)->type = MATCHER_ATTR;
-
 	status = obj_matcher_init(obj, ap);
 	if (! status)
 		status = name_matcher_init(&attr->value, ap);
+
+	M(obj)->type = MATCHER_ATTR;
 	return status;
 } /* attr_matcher_init */
 
@@ -456,52 +431,21 @@ attr_matcher_destroy(sdb_object_t *obj)
 	name_matcher_destroy(&attr->value);
 } /* attr_matcher_destroy */
 
-static int
-service_matcher_init(sdb_object_t *obj, va_list ap)
-{
-	attr_matcher_t *attr;
-	int status;
-
-	M(obj)->type = MATCHER_SERVICE;
-
-	status = obj_matcher_init(obj, ap);
-	if (status)
-		return status;
-
-	attr = va_arg(ap, attr_matcher_t *);
-
-	sdb_object_ref(SDB_OBJ(attr));
-	SERVICE_M(obj)->attr = attr;
-	return 0;
-} /* service_matcher_init */
-
-static void
-service_matcher_destroy(sdb_object_t *obj)
-{
-	obj_matcher_destroy(obj);
-	sdb_object_deref(SDB_OBJ(SERVICE_M(obj)->attr));
-} /* service_matcher_destroy */
-
 static int
 host_matcher_init(sdb_object_t *obj, va_list ap)
 {
-	service_matcher_t *service;
 	attr_matcher_t *attr;
 	int status;
 
-	M(obj)->type = MATCHER_HOST;
-
 	status = obj_matcher_init(obj, ap);
 	if (status)
 		return status;
 
-	service = va_arg(ap, service_matcher_t *);
 	attr = va_arg(ap, attr_matcher_t *);
-
-	sdb_object_ref(SDB_OBJ(service));
-	HOST_M(obj)->service = service;
 	sdb_object_ref(SDB_OBJ(attr));
 	HOST_M(obj)->attr = attr;
+
+	M(obj)->type = MATCHER_HOST;
 	return 0;
 } /* host_matcher_init */
 
@@ -509,7 +453,6 @@ static void
 host_matcher_destroy(sdb_object_t *obj)
 {
 	obj_matcher_destroy(obj);
-	sdb_object_deref(SDB_OBJ(HOST_M(obj)->service));
 	sdb_object_deref(SDB_OBJ(HOST_M(obj)->attr));
 } /* host_matcher_destroy */
 
@@ -561,18 +504,18 @@ uop_matcher_destroy(sdb_object_t *obj)
 		sdb_object_deref(SDB_OBJ(UOP_M(obj)->op));
 } /* uop_matcher_destroy */
 
+static sdb_type_t name_type = {
+	/* size = */ sizeof(obj_matcher_t),
+	/* init = */ obj_matcher_init,
+	/* destroy = */ obj_matcher_destroy,
+};
+
 static sdb_type_t attr_type = {
 	/* size = */ sizeof(attr_matcher_t),
 	/* init = */ attr_matcher_init,
 	/* destroy = */ attr_matcher_destroy,
 };
 
-static sdb_type_t service_type = {
-	/* size = */ sizeof(service_matcher_t),
-	/* init = */ service_matcher_init,
-	/* destroy = */ service_matcher_destroy,
-};
-
 static sdb_type_t host_type = {
 	/* size = */ sizeof(host_matcher_t),
 	/* init = */ host_matcher_init,
@@ -595,6 +538,25 @@ static sdb_type_t uop_type = {
  * public API
  */
 
+sdb_store_matcher_t *
+sdb_store_name_matcher(int type, const char *name, _Bool re)
+{
+	sdb_store_matcher_t *m;
+
+	if (re)
+		m = M(sdb_object_create("name-matcher", name_type,
+					NULL, name));
+	else
+		m = M(sdb_object_create("name-matcher", name_type,
+					name, NULL));
+
+	if (! m)
+		return NULL;
+
+	OBJ_M(m)->obj_type = type;
+	return m;
+} /* sdb_store_name_matcher */
+
 sdb_store_matcher_t *
 sdb_store_attr_matcher(const char *attr_name, const char *attr_name_re,
 		const char *attr_value, const char *attr_value_re)
@@ -603,29 +565,21 @@ sdb_store_attr_matcher(const char *attr_name, const char *attr_name_re,
 				attr_name, attr_name_re, attr_value, attr_value_re));
 } /* sdb_store_attr_matcher */
 
-sdb_store_matcher_t *
-sdb_store_service_matcher(const char *service_name, const char *service_name_re,
-		sdb_store_matcher_t *attr_matcher)
-{
-	return M(sdb_object_create("service-matcher", service_type,
-				service_name, service_name_re, attr_matcher));
-} /* sdb_store_service_matcher */
-
 sdb_store_matcher_t *
 sdb_store_host_matcher(const char *host_name, const char *host_name_re,
-		sdb_store_matcher_t *service_matcher,
 		sdb_store_matcher_t *attr_matcher)
 {
 	return M(sdb_object_create("host-matcher", host_type,
-				host_name, host_name_re, service_matcher, attr_matcher));
+				host_name, host_name_re, attr_matcher));
 } /* sdb_store_host_matcher */
 
 sdb_store_matcher_t *
 sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 		const char *op, const char *value)
 {
-	int typ = -1;
-	int inv = 0;
+	int type = -1;
+	_Bool inv = 0;
+	_Bool re = 0;
 
 	sdb_store_matcher_t *m = NULL;
 
@@ -633,11 +587,11 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 	const char *matcher_re = NULL;
 
 	if (! strcasecmp(obj_type, "host"))
-		typ = SDB_HOST;
+		type = SDB_HOST;
 	else if (! strcasecmp(obj_type, "service"))
-		typ = SDB_SERVICE;
+		type = SDB_SERVICE;
 	else if (! strcasecmp(obj_type, "attribute"))
-		typ = SDB_ATTRIBUTE;
+		type = SDB_ATTRIBUTE;
 
 	/* TODO: support other operators */
 	if (! strcasecmp(op, "=")) {
@@ -649,39 +603,31 @@ sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
 	}
 	else if (! strcasecmp(op, "=~")) {
 		matcher_re = value;
+		re = 1;
 	}
 	else if (! strcasecmp(op, "!~")) {
 		matcher_re = value;
 		inv = 1;
+		re = 1;
 	}
 	else
 		return NULL;
 
-	if (! strcasecmp(attr, "name")) {
-		/* accept */
-	}
-	else if (typ == SDB_ATTRIBUTE)
+	if (! strcasecmp(attr, "name"))
+		m = sdb_store_name_matcher(type, value, re);
+	else if (type == SDB_ATTRIBUTE) {
 		m = sdb_store_host_matcher(/* name = */ NULL, NULL,
-				/* service = */ NULL,
 				sdb_store_attr_matcher(attr, NULL, matcher, matcher_re));
-	else
-		return NULL;
 
-	if (m) {
-		/* accept the attribute value matcher */
+		/* pass ownership to the host matcher */
+		if (m)
+			sdb_object_deref(SDB_OBJ(HOST_M(m)->attr));
 	}
-	else if (typ == SDB_HOST)
-		m = sdb_store_host_matcher(matcher, matcher_re, NULL, NULL);
-	else if (typ == SDB_SERVICE)
-		m = sdb_store_host_matcher(/* name = */ NULL, NULL,
-				sdb_store_service_matcher(matcher, matcher_re, NULL),
-				/* attr = */ NULL);
-	else if (typ == SDB_ATTRIBUTE)
-		m = sdb_store_host_matcher(/* name = */ NULL, NULL,
-				/* service = */ NULL,
-				sdb_store_attr_matcher(matcher, matcher_re, NULL, NULL));
 
-	if (m && inv) {
+	if (! m)
+		return NULL;
+
+	if (inv) {
 		sdb_store_matcher_t *tmp;
 		tmp = sdb_store_inv_matcher(m);
 		/* pass ownership to the inverse matcher */