diff --git a/src/graph_ident.c b/src/graph_ident.c
index 36e066d15dc85792fed5a54d470459beeb63fe91..e7d193266e4d38622ff6ad35a659102cb605be50 100644 (file)
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
+/**
+ * collection4 - graph_ident.c
+ * Copyright (C) 2010 Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
+ * Authors:
+ * Florian octo Forster <ff at octo.it>
+ **/
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include "graph_ident.h"
#include "common.h"
#include "filesystem.h"
+#include "utils_cgi.h"
#include <fcgiapp.h>
#include <fcgi_stdio.h>
static _Bool part_matches (const char *selector, /* {{{ */
const char *part)
{
+#if C4_DEBUG
if ((selector == NULL) && (part == NULL))
return (1);
+#endif
if (selector == NULL) /* && (part != NULL) */
return (0);
_Bool ident_matches (const graph_ident_t *selector, /* {{{ */
const graph_ident_t *ident)
{
+#if C4_DEBUG
if ((selector == NULL) || (ident == NULL))
return (0);
+#endif
if (!part_matches (selector->host, ident->host))
return (0);
return (1);
} /* }}} _Bool ident_matches */
+_Bool ident_intersect (const graph_ident_t *s0, /* {{{ */
+ const graph_ident_t *s1)
+{
+#define INTERSECT_PART(p) do { \
+ if (!IS_ANY (s0->p) && !IS_ALL (s0->p) \
+ && !IS_ANY (s1->p) && !IS_ALL (s1->p) \
+ && (strcmp (s0->p, s1->p) != 0)) \
+ return (0); \
+} while (0)
+
+ INTERSECT_PART (host);
+ INTERSECT_PART (plugin);
+ INTERSECT_PART (plugin_instance);
+ INTERSECT_PART (type);
+ INTERSECT_PART (type_instance);
+
+#undef INTERSECT_PART
+
+ return (1);
+} /* }}} _Bool ident_intersect */
+
char *ident_to_string (const graph_ident_t *ident) /* {{{ */
{
char buffer[PATH_MAX];
return (strdup (buffer));
} /* }}} char *ident_to_file */
-char *ident_to_json (const graph_ident_t *ident) /* {{{ */
+int ident_to_json (const graph_ident_t *ident, /* {{{ */
+ yajl_gen handler)
{
- char buffer[4096];
+ yajl_gen_status status;
- buffer[0] = 0;
+ if ((ident == NULL) || (handler == NULL))
+ return (EINVAL);
- strlcat (buffer, "{\"host\":\"", sizeof (buffer));
- strlcat (buffer, ident->host, sizeof (buffer));
- strlcat (buffer, "\",\"plugin\":\"", sizeof (buffer));
- strlcat (buffer, ident->plugin, sizeof (buffer));
- strlcat (buffer, "\",\"plugin_instance\":\"", sizeof (buffer));
- strlcat (buffer, ident->plugin_instance, sizeof (buffer));
- strlcat (buffer, "\",\"type\":\"", sizeof (buffer));
- strlcat (buffer, ident->type, sizeof (buffer));
- strlcat (buffer, "\",\"type_instance\":\"", sizeof (buffer));
- strlcat (buffer, ident->type_instance, sizeof (buffer));
- strlcat (buffer, "\"}", sizeof (buffer));
+#define ADD_STRING(str) do { \
+ status = yajl_gen_string (handler, \
+ (unsigned char *) (str), \
+ (unsigned int) strlen (str)); \
+ if (status != yajl_gen_status_ok) \
+ return ((int) status); \
+} while (0)
- return (strdup (buffer));
+ yajl_gen_map_open (handler);
+ ADD_STRING ("host");
+ ADD_STRING (ident->host);
+ ADD_STRING ("plugin");
+ ADD_STRING (ident->plugin);
+ ADD_STRING ("plugin_instance");
+ ADD_STRING (ident->plugin_instance);
+ ADD_STRING ("type");
+ ADD_STRING (ident->type);
+ ADD_STRING ("type_instance");
+ ADD_STRING (ident->type_instance);
+ yajl_gen_map_close (handler);
+
+#undef ADD_FIELD
+
+ return (0);
} /* }}} char *ident_to_json */
+int ident_describe (const graph_ident_t *ident, /* {{{ */
+ const graph_ident_t *selector,
+ char *buffer, size_t buffer_size)
+{
+ if ((ident == NULL) || (selector == NULL)
+ || (buffer == NULL) || (buffer_size < 2))
+ return (EINVAL);
+
+ buffer[0] = 0;
+
+#define CHECK_FIELD(field) do { \
+ if (strcasecmp (selector->field, ident->field) != 0) \
+ { \
+ if (buffer[0] != 0) \
+ strlcat (buffer, "/", buffer_size); \
+ strlcat (buffer, ident->field, buffer_size); \
+ } \
+} while (0)
+
+ CHECK_FIELD (host);
+ CHECK_FIELD (plugin);
+ CHECK_FIELD (plugin_instance);
+ CHECK_FIELD (type);
+ CHECK_FIELD (type_instance);
+
+#undef CHECK_FIELD
+
+ if (buffer[0] == 0)
+ strlcat (buffer, "default", buffer_size);
+
+ return (0);
+} /* }}} int ident_describe */
+
time_t ident_get_mtime (const graph_ident_t *ident) /* {{{ */
{
char *file;