diff --git a/src/graph_ident.c b/src/graph_ident.c
index c3d4e54c54c17557fa0c688583b337efa14314d3..119571f172487170ad844f4445b6160615325e9b 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);
} /* }}} void ident_destroy */
/* ident_get_* methods {{{ */
-const char *ident_get_host (graph_ident_t *ident) /* {{{ */
+const char *ident_get_host (const graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
return (ident->host);
} /* }}} char *ident_get_host */
-const char *ident_get_plugin (graph_ident_t *ident) /* {{{ */
+const char *ident_get_plugin (const graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
return (ident->plugin);
} /* }}} char *ident_get_plugin */
-const char *ident_get_plugin_instance (graph_ident_t *ident) /* {{{ */
+const char *ident_get_plugin_instance (const graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
return (ident->plugin_instance);
} /* }}} char *ident_get_plugin_instance */
-const char *ident_get_type (graph_ident_t *ident) /* {{{ */
+const char *ident_get_type (const graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
return (ident->type);
} /* }}} char *ident_get_type */
-const char *ident_get_type_instance (graph_ident_t *ident) /* {{{ */
+const char *ident_get_type_instance (const graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
return (ident->type_instance);
} /* }}} char *ident_get_type_instance */
-const char *ident_get_field (graph_ident_t *ident, /* {{{ */
+const char *ident_get_field (const graph_ident_t *ident, /* {{{ */
graph_ident_field_t field)
{
if ((ident == NULL) || (field >= _GIF_LAST))
_Bool ident_matches (const graph_ident_t *selector, /* {{{ */
const graph_ident_t *ident)
{
- if ((selector == NULL) && (ident == NULL))
+#if C4_DEBUG
+ if ((selector == NULL) || (ident == NULL))
return (0);
- else if (selector == NULL)
- return (-1);
- else if (ident == NULL)
- return (1);
+#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 */
+#define ADD_FIELD(field) do { \
+ char json[1024]; \
+ json_escape_copy (json, ident->field, sizeof (json)); \
+ strlcat (buffer, json, sizeof (buffer)); \
+} while (0)
+
char *ident_to_json (const graph_ident_t *ident) /* {{{ */
{
char buffer[4096];
buffer[0] = 0;
strlcat (buffer, "{\"host\":\"", sizeof (buffer));
- strlcat (buffer, ident->host, sizeof (buffer));
+ ADD_FIELD (host);
strlcat (buffer, "\",\"plugin\":\"", sizeof (buffer));
- strlcat (buffer, ident->plugin, sizeof (buffer));
+ ADD_FIELD (plugin);
strlcat (buffer, "\",\"plugin_instance\":\"", sizeof (buffer));
- strlcat (buffer, ident->plugin_instance, sizeof (buffer));
+ ADD_FIELD (plugin_instance);
strlcat (buffer, "\",\"type\":\"", sizeof (buffer));
- strlcat (buffer, ident->type, sizeof (buffer));
+ ADD_FIELD (type);
strlcat (buffer, "\",\"type_instance\":\"", sizeof (buffer));
- strlcat (buffer, ident->type_instance, sizeof (buffer));
+ ADD_FIELD (type_instance);
strlcat (buffer, "\"}", sizeof (buffer));
return (strdup (buffer));
} /* }}} char *ident_to_json */
+#undef ADD_FIELD
+
time_t ident_get_mtime (const graph_ident_t *ident) /* {{{ */
{
char *file;