index 6de35cbe55298dc53154dd2db5fb73f7b4498282..d672b36c9ee8468c13a8e2ed5487d9c1b3a96a84 100644 (file)
#include "sysdb.h"
#include "core/plugin.h"
#include "core/store.h"
-#include "utils/error.h"
+#include "core/error.h"
#include "utils/unixsock.h"
#include "liboconfig/utils.h"
size_t n, sdb_data_t *data,
sdb_object_t __attribute__((unused)) *user_data)
{
- char *hostname = NULL;
- sdb_time_t timestamp = 0;
-
- sdb_host_t host = SDB_HOST_INIT;
+ const char *hostname;
+ sdb_time_t timestamp;
int status;
assert((data[0].type == SDB_TYPE_STRING)
&& (data[1].type == SDB_TYPE_DATETIME));
- hostname = strdup(data[0].data.string);
+ hostname = data[0].data.string;
timestamp = data[1].data.datetime;
- host.host_name = hostname;
- host.host_last_update = timestamp;
-
- status = sdb_store_host(&host);
+ status = sdb_store_host(hostname, timestamp);
if (status < 0) {
sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
"store/update host '%s'.", hostname);
- free(hostname);
return -1;
}
else if (status > 0) /* value too old */
sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
"host '%s' (last update timestamp = %"PRIscTIME").",
hostname, timestamp);
- free(hostname);
return 0;
} /* sdb_livestatus_get_host */
size_t n, sdb_data_t *data,
sdb_object_t __attribute__((unused)) *user_data)
{
- char *hostname = NULL;
- char *svcname = NULL;
+ const char *hostname = NULL;
+ const char *svcname = NULL;
sdb_time_t timestamp = 0;
- sdb_service_t svc = SDB_SVC_INIT;
-
int status;
assert(n == 3);
&& (data[1].type == SDB_TYPE_STRING)
&& (data[2].type == SDB_TYPE_DATETIME));
- hostname = strdup(data[0].data.string);
- svcname = strdup(data[1].data.string);
+ hostname = data[0].data.string;
+ svcname = data[1].data.string;
timestamp = data[2].data.datetime;
- svc.hostname = hostname;
- svc.svc_name = svcname;
- svc.svc_last_update = timestamp;
-
- status = sdb_store_service(&svc);
+ status = sdb_store_service(hostname, svcname, timestamp);
if (status < 0) {
sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
"store/update service '%s / %s'.", hostname, svcname);
- free(hostname);
- free(svcname);
return -1;
}
else if (status > 0) /* value too old */
sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
"service '%s / %s' (last update timestamp = %"PRIscTIME").",
hostname, svcname, timestamp);
- free(hostname);
- free(svcname);
return 0;
} /* sdb_livestatus_get_svc */
return -1;
}
- user_data = sdb_object_create_wrapper(client,
+ user_data = sdb_object_create_wrapper("unixsock-client", client,
(void (*)(void *))sdb_unixsock_client_destroy);
if (! user_data) {
sdb_unixsock_client_destroy(client);