Changeset 37daa37bbc546da8db4d76945b9c4b523e02d77b for src/noit_filters.c

Timestamp:

09/21/09 00:10:13 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1253491813 +0000

git-parent:

[d9fd356e6dcff42e03b313c5d8753a6dff82f36d]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1253491813 +0000

Message:

online configuration filters, refs #182

Files:

• src/noit_filters.c (modified) (7 diffs)

src/noit_filters.c

@@ -34 +34 @@
-
-#include "utils/noit_hash.h"
+#include "utils/noit_atomic.h"
-#include "noit_conf.h"
-#include "noit_check.h"
+#include "noit_conf_checks.h"
-#include "noit_filters.h"
-
-#include <pcre.h>
+#include <assert.h>
+#include <libxml/tree.h>
-
-static noit_hash_table *filtersets = NULL;
+static pthread_mutex_t filterset_lock;
+#define LOCKFS() pthread_mutex_lock(&filterset_lock)
+#define UNLOCKFS() pthread_mutex_unlock(&filterset_lock)
-
-typedef enum { NOIT_FILTER_ACCEPT, NOIT_FILTER_DENY } noit_ruletype_t;
@@ -57 +64 @@
-
-typedef struct {
+  noit_atomic32_t ref_cnt;
-  char *name;
-  filterrule_t *rules;
-} filterset_t;
-
-void
-noit_refresh_filtersets(noit_console_closure_t ncct,
-                        noit_conf_t_userdata_t *info) {
-  noit_filters_init();
-  nc_printf(ncct, "Reloaded %d filtersets.\n",
-            filtersets ? filtersets->size : 0);
-}
-
-#define FRF(r,a) do { \
@@ -87 +87 @@
-  filterset_t *fs = vp;
-  filterrule_t *r;
+  if(noit_atomic_dec32(&fs->ref_cnt) != 0) return;
+  noitL(noit_error, "Freeing filterset [%d]: %s\n", fs->ref_cnt, fs->name);
-  while(fs->rules) {
-    r = fs->rules->next;
@@ -96 +98 @@
-}
-void
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      continue;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-#define RULE_COMPILE(rname) do { \
-  if(noit_conf_get_stringbuf(rules[j], "@" #rname, buffer, sizeof(buffer))) { \
@@ -152 +148 @@
-} while(0)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  free(sets);
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -187 +199 @@
-  if(!filtersets || !filterset) return noit_true;
-
+  LOCKFS();
-  if(noit_hash_retrieve(filtersets, filterset, strlen(filterset), &vfs)) {
-    filterset_t *fs = (filterset_t *)vfs;
-    filterrule_t *r;
+    noit_atomic_inc32(&fs->ref_cnt);
+    UNLOCKFS();
-#define MATCHES(rname, value) noit_apply_filterrule(r->rname, r->rname##_e, value)
-    for(r = fs->rules; r; r = r->next) {
@@ -198 +213 @@
-        return (r->type == NOIT_FILTER_ACCEPT) ? noit_true : noit_false;
-    }
-
+
+
+
-  return noit_true;
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+