From 8818b9cbe0f25cc4ac0d887c7ba3ffa73da2d590 Mon Sep 17 00:00:00 2001 From: Shivani Bhardwaj Date: Thu, 13 Jun 2024 19:31:02 +0530 Subject: [PATCH] flow: remove unneeded args to fn --- src/flow-manager.c | 5 ++--- src/flow.c | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/flow-manager.c b/src/flow-manager.c index 8ea8be3a04..072a3cb74a 100644 --- a/src/flow-manager.c +++ b/src/flow-manager.c @@ -378,8 +378,7 @@ static void FlowManagerHashRowTimeout(FlowManagerTimeoutThread *td, Flow *f, SCT * \param td FM timeout thread instance * \param f head of the evicted list */ -static void FlowManagerHashRowClearEvictedList( - FlowManagerTimeoutThread *td, Flow *f, SCTime_t ts, FlowTimeoutCounters *counters) +static void FlowManagerHashRowClearEvictedList(FlowManagerTimeoutThread *td, Flow *f) { do { FLOWLOCK_WRLOCK(f); @@ -464,7 +463,7 @@ static uint32_t FlowTimeoutHash(FlowManagerTimeoutThread *td, SCTime_t ts, const FBLOCK_UNLOCK(fb); /* processed evicted list */ if (evicted) { - FlowManagerHashRowClearEvictedList(td, evicted, ts, counters); + FlowManagerHashRowClearEvictedList(td, evicted); } } else { rows_skipped++; diff --git a/src/flow.c b/src/flow.c index b43eae2088..e40a1ce7dd 100644 --- a/src/flow.c +++ b/src/flow.c @@ -334,7 +334,7 @@ static inline int FlowUpdateSeenFlag(const Packet *p) return 1; } -static inline void FlowUpdateTtlTS(Flow *f, Packet *p, uint8_t ttl) +static inline void FlowUpdateTtlTS(Flow *f, uint8_t ttl) { if (f->min_ttl_toserver == 0) { f->min_ttl_toserver = ttl; @@ -344,7 +344,7 @@ static inline void FlowUpdateTtlTS(Flow *f, Packet *p, uint8_t ttl) f->max_ttl_toserver = MAX(f->max_ttl_toserver, ttl); } -static inline void FlowUpdateTtlTC(Flow *f, Packet *p, uint8_t ttl) +static inline void FlowUpdateTtlTC(Flow *f, uint8_t ttl) { if (f->min_ttl_toclient == 0) { f->min_ttl_toclient = ttl; @@ -437,10 +437,10 @@ void FlowHandlePacketUpdate(Flow *f, Packet *p, ThreadVars *tv, DecodeThreadVars /* update flow's ttl fields if needed */ if (PacketIsIPv4(p)) { const IPV4Hdr *ip4h = PacketGetIPv4(p); - FlowUpdateTtlTS(f, p, IPV4_GET_RAW_IPTTL(ip4h)); + FlowUpdateTtlTS(f, IPV4_GET_RAW_IPTTL(ip4h)); } else if (PacketIsIPv6(p)) { const IPV6Hdr *ip6h = PacketGetIPv6(p); - FlowUpdateTtlTS(f, p, IPV6_GET_RAW_HLIM(ip6h)); + FlowUpdateTtlTS(f, IPV6_GET_RAW_HLIM(ip6h)); } } else { f->tosrcpktcnt++; @@ -461,10 +461,10 @@ void FlowHandlePacketUpdate(Flow *f, Packet *p, ThreadVars *tv, DecodeThreadVars /* update flow's ttl fields if needed */ if (PacketIsIPv4(p)) { const IPV4Hdr *ip4h = PacketGetIPv4(p); - FlowUpdateTtlTC(f, p, IPV4_GET_RAW_IPTTL(ip4h)); + FlowUpdateTtlTC(f, IPV4_GET_RAW_IPTTL(ip4h)); } else if (PacketIsIPv6(p)) { const IPV6Hdr *ip6h = PacketGetIPv6(p); - FlowUpdateTtlTC(f, p, IPV6_GET_RAW_HLIM(ip6h)); + FlowUpdateTtlTC(f, IPV6_GET_RAW_HLIM(ip6h)); } }