Ticket #176: filter.patch

.c

@@ -45 +45 @@
     char *buf;
     nad_cache_t cache;
     nad_t nad;
-    int i, nfilters, filter, from, to, what, error;
+    int i, nfilters, filter, from, to, what, error, logit;
     acl_t list_tail, acl;
 
     log_debug(ZONE, "loading filter");
@@ -102 +102 @@
         to = nad_find_attr(nad, filter, -1, "to", NULL);
         what = nad_find_attr(nad, filter, -1, "what", NULL);
         error = nad_find_attr(nad, filter, -1, "error", NULL);
+        logit = nad_find_attr(nad, filter, -1, "logit", NULL);
 
         acl = (acl_t) calloc(1, sizeof(struct acl_s));
 
@@ -138 +139 @@
                 }
             }
         }
+        if(logit > 0) acl->logit = 1;
 
         if(list_tail != NULL) {
            list_tail->next = acl;
@@ -150 +152 @@
            list_tail = acl;
         }
         
-        log_debug(ZONE, "added %s rule: from=%s, to=%s, what=%s, error=%d", (acl->error?"deny":"allow"), acl->from, acl->to, acl->what, acl->error);
+        log_debug(ZONE, "added %s rule: from=%s, to=%s, what=%s, error=%d, logit=%s", (acl->error?"deny":"allow"), acl->from, acl->to, acl->what, acl->error, (acl->logit?"yes":"no"));
 
         nfilters++;
 
@@ -196 +198 @@
         if( to != NULL && acl->to != NULL && fnmatch(acl->to, to, 0) != 0 ) continue;
         if( acl->what != NULL && nad_find_elem_path(nad, 0, -1, acl->what) < 0 ) continue;      /* match packet type */
         log_debug(ZONE, "matched packet %s->%s vs rule (%s %s->%s)", from, to, acl->what, acl->from, acl->to);
+        if (acl->logit) log_write(r->log, LOG_NOTICE, "filter: %s packet from=%s to=%s vs rule (from=%s to=%s what=%s)",(acl->error?"deny":"allow"), from, to, acl->from, acl->to, acl->what);
         error = acl->error;
         break;
     }