From e7727c3744bf1ec44d8cd74df6d8dd8bbd725ab8 Mon Sep 17 00:00:00 2001 From: Juliana Fajardini Date: Tue, 23 Aug 2022 10:35:18 -0300 Subject: [PATCH] decode: remove unused macros, replace w/ functions With the recent changes, these macros weren't being used anymore. Related to Bug #5458 --- src/decode.h | 8 -------- src/detect-engine-threshold.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/decode.h b/src/decode.h index 5f08c37ef5..b87366644a 100644 --- 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 2154eecc55..7684a7c7c9 100644 --- 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: