decode: remove unused macros, replace w/ functions

With the recent changes, these macros weren't being used anymore.

Related to
Bug #5458

diff --git a/src/decode.h b/src/decode.h
index 5f08c37ef51b6f604e8d8753528668f71301db50..b87366644ad493bba96825c88d5920c821f87dd4 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -912,14 +912,6 @@ static inline void PacketSetAction(Packet *p, const uint8_t a)
 
 #define PACKET_ACCEPT(p) PACKET_SET_ACTION(p, ACTION_ACCEPT)
 
-#define PACKET_REJECT(p) PACKET_SET_ACTION(p, (ACTION_REJECT|ACTION_DROP))
-
-#define PACKET_REJECT_DST(p) PACKET_SET_ACTION(p, (ACTION_REJECT_DST|ACTION_DROP))
-
-#define PACKET_REJECT_BOTH(p) PACKET_SET_ACTION(p, (ACTION_REJECT_BOTH|ACTION_DROP))
-
-#define PACKET_PASS(p) PACKET_SET_ACTION(p, ACTION_PASS)
-
 #define PACKET_TEST_ACTION(p, a) (p)->action &(a)
 
 #define PACKET_UPDATE_ACTION(p, a) (p)->action |= (a)

diff --git a/src/detect-engine-threshold.c b/src/detect-engine-threshold.c
index 2154eecc552737cddd67ee5442911fd2242e2222..7684a7c7c9d9f176cb4f3465eb991e0211a0f409 100644 (file)
--- a/src/detect-engine-threshold.c
+++ b/src/detect-engine-threshold.c
@@ -308,7 +308,7 @@ static inline void RateFilterSetAction(Packet *p, PacketAlert *pa, uint8_t new_a
             pa->flags |= PACKET_ALERT_RATE_FILTER_MODIFIED;
             break;
         case TH_ACTION_PASS:
-            PACKET_PASS(p);
+            PacketPass(p);
             pa->flags |= PACKET_ALERT_RATE_FILTER_MODIFIED;
             break;
         default: