aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

format/clang: Apply clang-format

Browse Source 
Issue: 5718
pull/8430/head
Jeff Lucovsky 3 years ago committed by Victor Julien
parent c15d511064
commit 7702ad410e
1 changed files with 103 additions and 99 deletions
Show Stats Download Patch File Download Diff File

202
src/flow-util.h
Unescape Escape View File

@ -27,52 +27,54 @@
#include "flow.h" #include "flow.h"
#include "stream-tcp-private.h" #include "stream-tcp-private.h"
#define COPY_TIMESTAMP(src,dst) ((dst)->tv_sec = (src)->tv_sec, (dst)->tv_usec = (src)->tv_usec) #define COPY_TIMESTAMP(src, dst) ((dst)->tv_sec = (src)->tv_sec, (dst)->tv_usec = (src)->tv_usec)
#define RESET_COUNTERS(f) do { \ #define RESET_COUNTERS(f) \
(f)->todstpktcnt = 0; \ do { \
(f)->tosrcpktcnt = 0; \ (f)->todstpktcnt = 0; \
(f)->todstbytecnt = 0; \ (f)->tosrcpktcnt = 0; \
(f)->tosrcbytecnt = 0; \ (f)->todstbytecnt = 0; \
(f)->tosrcbytecnt = 0; \
} while (0) } while (0)
#define FLOW_INITIALIZE(f) do { \ #define FLOW_INITIALIZE(f) \
(f)->sp = 0; \ do { \
(f)->dp = 0; \ (f)->sp = 0; \
(f)->proto = 0; \ (f)->dp = 0; \
(f)->livedev = NULL; \ (f)->proto = 0; \
(f)->timeout_at = 0; \ (f)->livedev = NULL; \
(f)->timeout_policy = 0; \ (f)->timeout_at = 0; \
(f)->vlan_idx = 0; \ (f)->timeout_policy = 0; \
(f)->next = NULL; \ (f)->vlan_idx = 0; \
(f)->flow_state = 0; \ (f)->next = NULL; \
(f)->use_cnt = 0; \ (f)->flow_state = 0; \
(f)->tenant_id = 0; \ (f)->use_cnt = 0; \
(f)->parent_id = 0; \ (f)->tenant_id = 0; \
(f)->probing_parser_toserver_alproto_masks = 0; \ (f)->parent_id = 0; \
(f)->probing_parser_toclient_alproto_masks = 0; \ (f)->probing_parser_toserver_alproto_masks = 0; \
(f)->flags = 0; \ (f)->probing_parser_toclient_alproto_masks = 0; \
(f)->file_flags = 0; \ (f)->flags = 0; \
(f)->protodetect_dp = 0; \ (f)->file_flags = 0; \
(f)->lastts.tv_sec = 0; \ (f)->protodetect_dp = 0; \
(f)->lastts.tv_usec = 0; \ (f)->lastts.tv_sec = 0; \
FLOWLOCK_INIT((f)); \ (f)->lastts.tv_usec = 0; \
(f)->protoctx = NULL; \ FLOWLOCK_INIT((f)); \
(f)->flow_end_flags = 0; \ (f)->protoctx = NULL; \
(f)->alproto = 0; \ (f)->flow_end_flags = 0; \
(f)->alproto_ts = 0; \ (f)->alproto = 0; \
(f)->alproto_tc = 0; \ (f)->alproto_ts = 0; \
(f)->alproto_orig = 0; \ (f)->alproto_tc = 0; \
(f)->alproto_expect = 0; \ (f)->alproto_orig = 0; \
(f)->de_ctx_version = 0; \ (f)->alproto_expect = 0; \
(f)->thread_id[0] = 0; \ (f)->de_ctx_version = 0; \
(f)->thread_id[1] = 0; \ (f)->thread_id[0] = 0; \
(f)->alparser = NULL; \ (f)->thread_id[1] = 0; \
(f)->alstate = NULL; \ (f)->alparser = NULL; \
(f)->sgh_toserver = NULL; \ (f)->alstate = NULL; \
(f)->sgh_toclient = NULL; \ (f)->sgh_toserver = NULL; \
(f)->flowvar = NULL; \ (f)->sgh_toclient = NULL; \
RESET_COUNTERS((f)); \ (f)->flowvar = NULL; \
RESET_COUNTERS((f)); \
} while (0) } while (0)
/** \brief macro to recycle a flow before it goes into the spare queue for reuse. /** \brief macro to recycle a flow before it goes into the spare queue for reuse.
@ -80,59 +82,61 @@
* Note that the lnext, lprev, hnext fields are untouched, those are * Note that the lnext, lprev, hnext fields are untouched, those are
* managed by the queueing code. Same goes for fb (FlowBucket ptr) field. * managed by the queueing code. Same goes for fb (FlowBucket ptr) field.
*/ */
#define FLOW_RECYCLE(f) do { \ #define FLOW_RECYCLE(f) \
FlowCleanupAppLayer((f)); \ do { \
(f)->sp = 0; \ FlowCleanupAppLayer((f)); \
(f)->dp = 0; \ (f)->sp = 0; \
(f)->proto = 0; \ (f)->dp = 0; \
(f)->livedev = NULL; \ (f)->proto = 0; \
(f)->vlan_idx = 0; \ (f)->livedev = NULL; \
(f)->ffr = 0; \ (f)->vlan_idx = 0; \
(f)->next = NULL; \ (f)->ffr = 0; \
(f)->timeout_at = 0; \ (f)->next = NULL; \
(f)->timeout_policy = 0; \ (f)->timeout_at = 0; \
(f)->flow_state = 0; \ (f)->timeout_policy = 0; \
(f)->use_cnt = 0; \ (f)->flow_state = 0; \
(f)->tenant_id = 0; \ (f)->use_cnt = 0; \
(f)->parent_id = 0; \ (f)->tenant_id = 0; \
(f)->probing_parser_toserver_alproto_masks = 0; \ (f)->parent_id = 0; \
(f)->probing_parser_toclient_alproto_masks = 0; \ (f)->probing_parser_toserver_alproto_masks = 0; \
(f)->flags = 0; \ (f)->probing_parser_toclient_alproto_masks = 0; \
(f)->file_flags = 0; \ (f)->flags = 0; \
(f)->protodetect_dp = 0; \ (f)->file_flags = 0; \
(f)->lastts.tv_sec = 0; \ (f)->protodetect_dp = 0; \
(f)->lastts.tv_usec = 0; \ (f)->lastts.tv_sec = 0; \
(f)->protoctx = NULL; \ (f)->lastts.tv_usec = 0; \
(f)->flow_end_flags = 0; \ (f)->protoctx = NULL; \
(f)->alparser = NULL; \ (f)->flow_end_flags = 0; \
(f)->alstate = NULL; \ (f)->alparser = NULL; \
(f)->alproto = 0; \ (f)->alstate = NULL; \
(f)->alproto_ts = 0; \ (f)->alproto = 0; \
(f)->alproto_tc = 0; \ (f)->alproto_ts = 0; \
(f)->alproto_orig = 0; \ (f)->alproto_tc = 0; \
(f)->alproto_expect = 0; \ (f)->alproto_orig = 0; \
(f)->de_ctx_version = 0; \ (f)->alproto_expect = 0; \
(f)->thread_id[0] = 0; \ (f)->de_ctx_version = 0; \
(f)->thread_id[1] = 0; \ (f)->thread_id[0] = 0; \
(f)->sgh_toserver = NULL; \ (f)->thread_id[1] = 0; \
(f)->sgh_toclient = NULL; \ (f)->sgh_toserver = NULL; \
GenericVarFree((f)->flowvar); \ (f)->sgh_toclient = NULL; \
(f)->flowvar = NULL; \ GenericVarFree((f)->flowvar); \
if (MacSetFlowStorageEnabled()) { \ (f)->flowvar = NULL; \
MacSet *ms = FlowGetStorageById((f), MacSetGetFlowStorageID()); \ if (MacSetFlowStorageEnabled()) { \
if (ms != NULL) { \ MacSet *ms = FlowGetStorageById((f), MacSetGetFlowStorageID()); \
MacSetReset(ms); \ if (ms != NULL) { \
} \ MacSetReset(ms); \
} \ } \
RESET_COUNTERS((f)); \ } \
} while(0) RESET_COUNTERS((f)); \
} while (0)
#define FLOW_DESTROY(f) do { \ #define FLOW_DESTROY(f) \
FlowCleanupAppLayer((f)); \ do { \
\ FlowCleanupAppLayer((f)); \
FLOWLOCK_DESTROY((f)); \ \
GenericVarFree((f)->flowvar); \ FLOWLOCK_DESTROY((f)); \
} while(0) GenericVarFree((f)->flowvar); \
} while (0)
/** \brief check if a memory alloc would fit in the memcap /** \brief check if a memory alloc would fit in the memcap
* *
@ -141,8 +145,9 @@
* \retval 1 it fits * \retval 1 it fits
* \retval 0 no fit * \retval 0 no fit
*/ */
#define FLOW_CHECK_MEMCAP(size) \ #define FLOW_CHECK_MEMCAP(size) \
((((uint64_t)SC_ATOMIC_GET(flow_memuse) + (uint64_t)(size)) <= SC_ATOMIC_GET(flow_config.memcap))) ((((uint64_t)SC_ATOMIC_GET(flow_memuse) + (uint64_t)(size)) <= \
SC_ATOMIC_GET(flow_config.memcap)))
Flow *FlowAlloc(void); Flow *FlowAlloc(void);
Flow *FlowAllocDirect(void); Flow *FlowAllocDirect(void);
@ -174,4 +179,3 @@ static inline void FlowEndCountersUpdate(ThreadVars *tv, FlowEndCounters *fec, F
void FlowEndCountersRegister(ThreadVars *t, FlowEndCounters *fec); void FlowEndCountersRegister(ThreadVars *t, FlowEndCounters *fec);
#endif /* __FLOW_UTIL_H__ */ #endif /* __FLOW_UTIL_H__ */

Write Preview
Loading…
Cancel
Save