X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=e8a693ce0c268b228bab54e29614a49447517e6e;hb=43ad58582d8be53eae16e9c2eb8601add8af0350;hp=024733fc7350cf33cbc20673b5e09c4ccfe17a12;hpb=e18aab9dcee484fb99dfc8c93c159a3e47d45930;p=sysdb.git

diff --git a/src/core/store.c b/src/core/store.c
index 024733f..e8a693c 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -27,7 +27,8 @@
 
 #include "sysdb.h"
 #include "core/store.h"
-#include "utils/error.h"
+#include "core/error.h"
+#include "core/plugin.h"
 #include "utils/llist.h"
 
 #include <assert.h>
@@ -40,17 +41,6 @@
 
 #include <pthread.h>
 
-/*
- * private data types
- */
-
-/* type used for looking up named objects */
-typedef struct {
-	sdb_object_t parent;
-	const char *obj_name;
-} sdb_store_lookup_obj_t;
-#define SDB_STORE_LOOKUP_OBJ_INIT { SDB_OBJECT_INIT, NULL }
-
 /*
  * private variables
  */
@@ -58,43 +48,13 @@ typedef struct {
 static sdb_llist_t *host_list = NULL;
 static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
 
-/*
- * private helper functions
- */
-
-static int
-sdb_store_obj_cmp_by_name(const sdb_object_t *a, const sdb_object_t *b)
-{
-	const sdb_store_obj_t *h1 = (const sdb_store_obj_t *)a;
-	const sdb_store_obj_t *h2 = (const sdb_store_obj_t *)b;
-
-	assert(h1 && h2);
-	return strcasecmp(h1->name, h2->name);
-} /* sdb_store_obj_cmp_by_name */
-
-static int
-sdb_cmp_store_obj_with_name(const sdb_object_t *a, const sdb_object_t *b)
-{
-	const sdb_store_obj_t *obj = (const sdb_store_obj_t *)a;
-	const sdb_store_lookup_obj_t *lookup = (const sdb_store_lookup_obj_t *)b;
-
-	assert(obj && lookup);
-	return strcasecmp(obj->name, lookup->obj_name);
-} /* sdb_cmp_store_obj_with_name */
-
 /*
  * public types
  */
 
 static int
-sdb_host_init(sdb_object_t *obj, va_list ap)
+sdb_host_init(sdb_object_t *obj, va_list __attribute__((unused)) ap)
 {
-	const char *name = va_arg(ap, const char *);
-
-	SDB_HOST(obj)->_name = strdup(name);
-	if (! SDB_HOST(obj)->_name)
-		return -1;
-
 	SDB_HOST(obj)->_last_update = sdb_gettime();
 	/* ignore errors -> last_update will be updated later */
 
@@ -112,9 +72,6 @@ sdb_host_destroy(sdb_object_t *obj)
 {
 	assert(obj);
 
-	if (SDB_HOST(obj)->_name)
-		free(SDB_HOST(obj)->_name);
-
 	if (SDB_HOST(obj)->attributes)
 		sdb_llist_destroy(SDB_HOST(obj)->attributes);
 	if (SDB_HOST(obj)->services)
@@ -127,7 +84,7 @@ sdb_host_do_clone(const sdb_object_t *obj)
 	const sdb_host_t *host = (const sdb_host_t *)obj;
 	sdb_host_t *new;
 
-	new = sdb_host_create(host->_name);
+	new = SDB_HOST(sdb_object_create(obj->name, sdb_host_type));
 	if (! new)
 		return NULL;
 
@@ -158,14 +115,11 @@ static int
 sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
 	const char *hostname = va_arg(ap, const char *);
-	const char *name = va_arg(ap, const char *);
 	const char *value = va_arg(ap, const char *);
 
 	SDB_ATTR(obj)->hostname = strdup(hostname);
-	SDB_ATTR(obj)->_name = strdup(name);
 	SDB_ATTR(obj)->attr_value = strdup(value);
-	if ((! SDB_ATTR(obj)->hostname)
-			|| (! SDB_ATTR(obj)->_name) || (! SDB_ATTR(obj)->attr_value))
+	if ((! SDB_ATTR(obj)->hostname) || (! SDB_ATTR(obj)->attr_value))
 		return -1;
 
 	SDB_ATTR(obj)->_last_update = sdb_gettime();
@@ -179,8 +133,6 @@ sdb_attr_destroy(sdb_object_t *obj)
 
 	if (SDB_ATTR(obj)->hostname)
 		free(SDB_ATTR(obj)->hostname);
-	if (SDB_ATTR(obj)->_name)
-		free(SDB_ATTR(obj)->_name);
 	if (SDB_ATTR(obj)->attr_value)
 		free(SDB_ATTR(obj)->attr_value);
 } /* sdb_attr_destroy */
@@ -191,8 +143,8 @@ sdb_attr_clone(const sdb_object_t *obj)
 	const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
 	sdb_attribute_t *new;
 
-	new = sdb_attribute_create(attr->hostname,
-			attr->_name, attr->attr_value);
+	new = SDB_ATTR(sdb_object_create(obj->name, sdb_attribute_type,
+				attr->hostname, attr->attr_value));
 	if (! new)
 		return NULL;
 
@@ -204,11 +156,9 @@ static int
 sdb_svc_init(sdb_object_t *obj, va_list ap)
 {
 	const char *hostname = va_arg(ap, const char *);
-	const char *name = va_arg(ap, const char *);
 
 	SDB_SVC(obj)->hostname = strdup(hostname);
-	SDB_SVC(obj)->_name = strdup(name);
-	if ((! SDB_SVC(obj)->hostname) || (! SDB_SVC(obj)->_name))
+	if (! SDB_SVC(obj)->hostname)
 		return -1;
 
 	SDB_SVC(obj)->_last_update = sdb_gettime();
@@ -223,8 +173,6 @@ sdb_svc_destroy(sdb_object_t *obj)
 
 	if (SDB_SVC(obj)->hostname)
 		free(SDB_SVC(obj)->hostname);
-	if (SDB_SVC(obj)->_name)
-		free(SDB_SVC(obj)->_name);
 } /* sdb_svc_destroy */
 
 static sdb_object_t *
@@ -233,7 +181,8 @@ sdb_svc_clone(const sdb_object_t *obj)
 	const sdb_service_t *svc = (const sdb_service_t *)obj;
 	sdb_service_t *new;
 
-	new = sdb_service_create(svc->hostname, svc->_name);
+	new = SDB_SVC(sdb_object_create(obj->name, sdb_service_type,
+				svc->hostname));
 	if (! new)
 		return NULL;
 
@@ -269,33 +218,24 @@ const sdb_type_t sdb_service_type = {
  * public API
  */
 
-sdb_host_t *
-sdb_host_create(const char *name)
-{
-	sdb_object_t *obj;
-
-	if (! name)
-		return NULL;
-
-	obj = sdb_object_create(sdb_host_type, name);
-	if (! obj)
-		return NULL;
-	return SDB_HOST(obj);
-} /* sdb_host_create */
-
 int
-sdb_store_host(const sdb_host_t *host)
+sdb_store_host(const char *name, sdb_time_t last_update)
 {
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
-	sdb_time_t last_update;
-
 	sdb_host_t *old;
+
+	char *cname;
 	int status = 0;
 
-	if ((! host) || (! host->_name))
+	if (! name)
+		return -1;
+
+	cname = sdb_plugin_cname(strdup(name));
+	if (! cname) {
+		sdb_log(SDB_LOG_ERR, "store: strdup failed");
 		return -1;
+	}
 
-	last_update = host->_last_update;
+	last_update = last_update;
 	if (last_update <= 0)
 		last_update = sdb_gettime();
 
@@ -308,15 +248,13 @@ sdb_store_host(const sdb_host_t *host)
 		}
 	}
 
-	lookup.obj_name = host->_name;
-	old = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
+	old = SDB_HOST(sdb_llist_search_by_name(host_list, cname));
 
 	if (old) {
 		if (old->_last_update > last_update) {
 			sdb_log(SDB_LOG_DEBUG, "store: Cannot update host '%s' - "
 					"value too old (%"PRIscTIME" < %"PRIscTIME")",
-					host->_name, last_update, old->_last_update);
+					cname, last_update, old->_last_update);
 			/* don't report an error; the host may be updated by multiple
 			 * backends */
 			status = 1;
@@ -326,7 +264,7 @@ sdb_store_host(const sdb_host_t *host)
 		}
 	}
 	else {
-		sdb_host_t *new = SDB_HOST(sdb_object_clone(SDB_CONST_OBJ(host)));
+		sdb_host_t *new = SDB_HOST(sdb_object_create(name, sdb_host_type));
 		if (! new) {
 			char errbuf[1024];
 			sdb_log(SDB_LOG_ERR, "store: Failed to clone host object: %s",
@@ -335,11 +273,14 @@ sdb_store_host(const sdb_host_t *host)
 			return -1;
 		}
 
+		free(SDB_OBJ(new)->name);
+		SDB_OBJ(new)->name = cname;
+
 		if (! new->attributes) {
 			if (! (new->attributes = sdb_llist_create())) {
 				char errbuf[1024];
 				sdb_log(SDB_LOG_ERR, "store: Failed to initialize "
-						"host object '%s': %s", host->_name,
+						"host object '%s': %s", SDB_OBJ(new)->name,
 						sdb_strerror(errno, errbuf, sizeof(errbuf)));
 				sdb_object_deref(SDB_OBJ(new));
 				pthread_rwlock_unlock(&host_lock);
@@ -351,7 +292,7 @@ sdb_store_host(const sdb_host_t *host)
 			if (! (new->services = sdb_llist_create())) {
 				char errbuf[1024];
 				sdb_log(SDB_LOG_ERR, "store: Failed to initialize "
-						"host object '%s': %s", host->_name,
+						"host object '%s': %s", SDB_OBJ(new)->name,
 						sdb_strerror(errno, errbuf, sizeof(errbuf)));
 				sdb_object_deref(SDB_OBJ(new));
 				pthread_rwlock_unlock(&host_lock);
@@ -360,7 +301,7 @@ sdb_store_host(const sdb_host_t *host)
 		}
 
 		status = sdb_llist_insert_sorted(host_list, SDB_OBJ(new),
-				sdb_store_obj_cmp_by_name);
+				sdb_object_cmp_by_name);
 
 		/* pass control to the list or destroy in case of an error */
 		sdb_object_deref(SDB_OBJ(new));
@@ -370,55 +311,30 @@ sdb_store_host(const sdb_host_t *host)
 	return status;
 } /* sdb_store_host */
 
-const sdb_host_t *
-sdb_store_get_host(const char *name)
+_Bool
+sdb_store_has_host(const char *name)
 {
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
 	sdb_host_t *host;
 
 	if (! name)
 		return NULL;
 
-	lookup.obj_name = name;
-	host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
-	if (! host)
-		return NULL;
-	return host;
-} /* sdb_store_get_host */
-
-sdb_attribute_t *
-sdb_attribute_create(const char *hostname,
-		const char *name, const char *value)
-{
-	sdb_object_t *obj;
-
-	if ((! hostname) || (! name) || (! value))
-		return NULL;
-
-	obj = sdb_object_create(sdb_attribute_type, hostname, name, value);
-	if (! obj)
-		return NULL;
-	return SDB_ATTR(obj);
-} /* sdb_attribute_create */
+	host = SDB_HOST(sdb_llist_search_by_name(host_list, name));
+	return host != NULL;
+} /* sdb_store_has_host */
 
 int
-sdb_store_attribute(const sdb_attribute_t *attr)
+sdb_store_attribute(const char *hostname, const char *key, const char *value,
+		sdb_time_t last_update)
 {
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
 	sdb_host_t *host;
-
 	sdb_attribute_t *old;
 
-	sdb_time_t last_update;
-
 	int status = 0;
 
-	if (! attr)
+	if ((! hostname) || (! key))
 		return -1;
 
-	last_update = attr->_last_update;
 	if (last_update <= 0)
 		last_update = sdb_gettime();
 
@@ -427,26 +343,18 @@ sdb_store_attribute(const sdb_attribute_t *attr)
 
 	pthread_rwlock_wrlock(&host_lock);
 
-	lookup.obj_name = attr->hostname;
-	host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
+	host = SDB_HOST(sdb_llist_search_by_name(host_list, hostname));
 	if (! host) {
 		pthread_rwlock_unlock(&host_lock);
 		return -1;
 	}
 
-	lookup.obj_name = attr->_name;
-	old = SDB_ATTR(sdb_llist_search(host->attributes,
-				(const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
+	old = SDB_ATTR(sdb_llist_search_by_name(host->attributes, key));
 	if (old) {
 		if (old->_last_update > last_update) {
 			sdb_log(SDB_LOG_DEBUG, "store: Cannot update attribute "
 					"'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
-					attr->hostname, attr->_name, last_update,
-					old->_last_update);
+					hostname, key, last_update, old->_last_update);
 			status = 1;
 		}
 		else {
@@ -454,7 +362,8 @@ sdb_store_attribute(const sdb_attribute_t *attr)
 		}
 	}
 	else {
-		sdb_attribute_t *new = SDB_ATTR(sdb_object_clone(SDB_CONST_OBJ(attr)));
+		sdb_attribute_t *new = SDB_ATTR(sdb_object_create(key,
+					sdb_attribute_type, hostname, value));
 		if (! new) {
 			char errbuf[1024];
 			sdb_log(SDB_LOG_ERR, "store: Failed to clone attribute "
@@ -464,7 +373,7 @@ sdb_store_attribute(const sdb_attribute_t *attr)
 		}
 
 		status = sdb_llist_insert_sorted(host->attributes, SDB_OBJ(new),
-				sdb_store_obj_cmp_by_name);
+				sdb_object_cmp_by_name);
 
 		/* pass control to the list or destroy in case of an error */
 		sdb_object_deref(SDB_OBJ(new));
@@ -474,28 +383,11 @@ sdb_store_attribute(const sdb_attribute_t *attr)
 	return status;
 } /* sdb_store_attribute */
 
-sdb_service_t *
-sdb_service_create(const char *hostname, const char *name)
-{
-	sdb_object_t *obj;
-
-	if ((! hostname) || (! name))
-		return NULL;
-
-	obj = sdb_object_create(sdb_service_type, hostname, name);
-	if (! obj)
-		return NULL;
-	return SDB_SVC(obj);
-} /* sdb_service_create */
-
 int
 sdb_store_service(const sdb_service_t *svc)
 {
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
 	sdb_host_t *host;
-
 	sdb_service_t *old;
-
 	sdb_time_t last_update;
 
 	int status = 0;
@@ -512,24 +404,19 @@ sdb_store_service(const sdb_service_t *svc)
 
 	pthread_rwlock_wrlock(&host_lock);
 
-	lookup.obj_name = svc->hostname;
-	host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
+	host = SDB_HOST(sdb_llist_search_by_name(host_list, svc->hostname));
 	if (! host) {
 		pthread_rwlock_unlock(&host_lock);
 		return -1;
 	}
 
-	lookup.obj_name = svc->_name;
-	old = SDB_SVC(sdb_llist_search(host->services, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
+	old = SDB_SVC(sdb_llist_search_by_name(host->services,
+				SDB_CONST_OBJ(svc)->name));
 	if (old) {
 		if (old->_last_update > last_update) {
 			sdb_log(SDB_LOG_DEBUG, "store: Cannot update service "
 					"'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
-					svc->hostname, svc->_name, last_update,
+					svc->hostname, SDB_CONST_OBJ(svc)->name, last_update,
 					old->_last_update);
 			status = 1;
 		}
@@ -548,7 +435,7 @@ sdb_store_service(const sdb_service_t *svc)
 		}
 
 		status = sdb_llist_insert_sorted(host->services, SDB_OBJ(new),
-				sdb_store_obj_cmp_by_name);
+				sdb_object_cmp_by_name);
 
 		/* pass control to the list or destroy in case of an error */
 		sdb_object_deref(SDB_OBJ(new));
@@ -558,25 +445,6 @@ sdb_store_service(const sdb_service_t *svc)
 	return status;
 } /* sdb_store_service */
 
-const sdb_service_t *
-sdb_store_get_service(const sdb_host_t *host, const char *name)
-{
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
-	sdb_service_t *svc;
-
-	if ((! host) || (! name))
-		return NULL;
-
-	lookup.obj_name = name;
-	svc = SDB_SVC(sdb_llist_search(host->services,
-				(const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
-	if (! svc)
-		return NULL;
-	return svc;
-} /* sdb_store_get_service */
-
 int
 sdb_store_dump(FILE *fh)
 {
@@ -608,7 +476,7 @@ sdb_store_dump(FILE *fh)
 		time_str[sizeof(time_str) - 1] = '\0';
 
 		fprintf(fh, "Host '%s' (last updated: %s):\n",
-				host->_name, time_str);
+				SDB_OBJ(host)->name, time_str);
 
 		attr_iter = sdb_llist_get_iter(host->attributes);
 		if (! attr_iter) {
@@ -628,7 +496,7 @@ sdb_store_dump(FILE *fh)
 			time_str[sizeof(time_str) - 1] = '\0';
 
 			fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
-					attr->_name, attr->attr_value, time_str);
+					SDB_OBJ(attr)->name, attr->attr_value, time_str);
 		}
 
 		sdb_llist_iter_destroy(attr_iter);
@@ -651,7 +519,7 @@ sdb_store_dump(FILE *fh)
 			time_str[sizeof(time_str) - 1] = '\0';
 
 			fprintf(fh, "\tService '%s' (last updated: %s)\n",
-					svc->_name, time_str);
+					SDB_OBJ(svc)->name, time_str);
 		}
 
 		sdb_llist_iter_destroy(svc_iter);