Manually merge Pablo's IPFW action patch.

src/source-ipfw.c

@@ -456,19 +456,14 @@ TmEcode IPFWSetVerdict(ThreadVars *tv, IPFWThreadVars *ptv, Packet *p) {
     IPFWpoll.fd=ipfw_sock;
     IPFWpoll.events= POLLWRNORM;
 
-    /* What to do with the packet? */
+    if (p->action & ACTION_REJECT || p->action & ACTION_REJECT_BOTH ||
-    switch (p->action) {
+        p->action & ACTION_REJECT_DST || p->action & ACTION_DROP) {
-        case ACTION_ALERT:
+        verdict = IPFW_DROP;
-        case ACTION_PASS:
+    } else if (p->action & ACTION_ALERT || p->action & ACTION_ALERT) {
-            verdict = IPFW_ACCEPT;
+        verdict = IPFW_ACCEPT;
-            break;
+    } else {
-        case ACTION_REJECT:
+        /* a verdict we don't know about, drop to be sure */
-        case ACTION_REJECT_DST:
+        verdict = IPFW_DROP;
-        case ACTION_REJECT_BOTH:
-        case ACTION_DROP:
-        default:
-            /* a verdict we don't know about, drop to be sure */
-            verdict = IPFW_DROP;
     }
 
     if (verdict == IPFW_ACCEPT) {