reject: optimize and simplify run test

diff --git a/src/action-globals.h b/src/action-globals.h
index aa46bd293d1b7eb255c3ce6a5b165264c37e1b5f..fc9a3275f064c2f8f2ac930b841f91d5f3d90615 100644 (file)
--- a/src/action-globals.h
+++ b/src/action-globals.h
@@ -33,4 +33,6 @@
 #define ACTION_REJECT_BOTH  0x10
 #define ACTION_PASS         0x20
 
+#define ACTION_REJECT_ANY   (ACTION_REJECT|ACTION_REJECT_DST|ACTION_REJECT_BOTH)
+
 #endif /* __ACTION_GLOBALS_H__ */

diff --git a/src/respond-reject.c b/src/respond-reject.c
index d32a197c555f14b40a77e9cb56cca7e4ac974346..8212396a9d1abec5b11a8f00cc77e96a34118755 100644 (file)
--- a/src/respond-reject.c
+++ b/src/respond-reject.c
@@ -58,9 +58,7 @@ void TmModuleRespondRejectRegister (void)
 static TmEcode RespondRejectFunc(ThreadVars *tv, Packet *p, void *data)
 {
     /* ACTION_REJECT defaults to rejecting the SRC */
-    if (!(PACKET_TEST_ACTION(p, ACTION_REJECT)) &&
-        !(PACKET_TEST_ACTION(p, ACTION_REJECT_DST)) &&
-        !(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH))) {
+    if (likely(PACKET_TEST_ACTION(p, ACTION_REJECT_ANY) == 0)) {
         return TM_ECODE_OK;
     }