From 498ae0180bdacddd76e5e5f8b5a096fdb09e945b Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 12 Jun 2020 12:16:47 +0200 Subject: [PATCH] reject: minor optimization of reset entry code --- src/respond-reject.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/src/respond-reject.c b/src/respond-reject.c index 4d3308d6de..b3b37848b4 100644 --- a/src/respond-reject.c +++ b/src/respond-reject.c @@ -101,11 +101,8 @@ int RejectSendIPv4TCP(ThreadVars *tv, Packet *p, void *data) SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { int r = RejectSendLibnet11IPv4TCP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11IPv4TCP(tv, p, data, REJECT_DIR_DST) == 0) { - SCReturnInt(0); - } else { - SCReturnInt(r); - } + r |= RejectSendLibnet11IPv4TCP(tv, p, data, REJECT_DIR_DST); + SCReturnInt(r); } SCReturnInt(0); } @@ -120,13 +117,9 @@ int RejectSendIPv4ICMP(ThreadVars *tv, Packet *p, void *data) int r = RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_DST); SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { - int r; - r = RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_DST) == 0) { - SCReturnInt(0); - } else { - SCReturnInt(r); - } + int r = RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_SRC); + r |= RejectSendLibnet11IPv4ICMP(tv, p, data, REJECT_DIR_DST); + SCReturnInt(r); } SCReturnInt(0); } @@ -142,11 +135,8 @@ int RejectSendIPv6TCP(ThreadVars *tv, Packet *p, void *data) SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { int r = RejectSendLibnet11IPv6TCP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11IPv6TCP(tv, p, data, REJECT_DIR_DST) == 0) { - SCReturnInt(0); - } else { - SCReturnInt(r); - } + r |= RejectSendLibnet11IPv6TCP(tv, p, data, REJECT_DIR_DST); + SCReturnInt(r); } SCReturnInt(0); } @@ -162,11 +152,8 @@ int RejectSendIPv6ICMP(ThreadVars *tv, Packet *p, void *data) SCReturnInt(r); } else if(PACKET_TEST_ACTION(p, ACTION_REJECT_BOTH)) { int r = RejectSendLibnet11IPv6ICMP(tv, p, data, REJECT_DIR_SRC); - if (RejectSendLibnet11IPv6ICMP(tv, p, data, REJECT_DIR_DST) == 0) { - SCReturnInt(0); - } else { - SCReturnInt(r); - } + r |= RejectSendLibnet11IPv6ICMP(tv, p, data, REJECT_DIR_DST); + SCReturnInt(r); } SCReturnInt(0); } -- 2.47.2