X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_ident.c;h=119571f172487170ad844f4445b6160615325e9b;hb=9c05288ca37caedfe895ce83dbaee2ea4dd375d7;hp=be3cbfd0268e5573c0518f77cc47ab888e49a3b7;hpb=b988bcc13c655299bc3796cccaa583f62704e759;p=collection4.git

diff --git a/src/graph_ident.c b/src/graph_ident.c
index be3cbfd..119571f 100644
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
@@ -34,6 +34,7 @@
 #include "graph_ident.h"
 #include "common.h"
 #include "filesystem.h"
+#include "utils_cgi.h"
 
 #include <fcgiapp.h>
 #include <fcgi_stdio.h>
@@ -93,8 +94,10 @@ static char *part_copy_with_selector (const char *selector, /* {{{ */
 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);
@@ -400,8 +403,10 @@ int ident_compare (const graph_ident_t *i0, /* {{{ */
 _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);
@@ -421,6 +426,27 @@ _Bool ident_matches (const graph_ident_t *selector, /* {{{ */
   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];
@@ -476,6 +502,12 @@ char *ident_to_file (const graph_ident_t *ident) /* {{{ */
   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];
@@ -483,20 +515,22 @@ char *ident_to_json (const graph_ident_t *ident) /* {{{ */
   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;