diff options
| -rw-r--r-- | flow.h | 11 | ||||
| -rw-r--r-- | flow_table.h | 2 | ||||
| -rw-r--r-- | tcp.c | 7 |
3 files changed, 15 insertions, 5 deletions
@@ -177,6 +177,17 @@ static_assert(sizeof(flow_sidx_t) <= sizeof(uint32_t), #define FLOW_SIDX_NONE ((flow_sidx_t){ .flow = FLOW_MAX }) /** + * flow_sidx_valid() - Test if a sidx is valid + * @sidx: sidx value + * + * Return: true if @sidx refers to a valid flow & side + */ +static inline bool flow_sidx_valid(flow_sidx_t sidx) +{ + return sidx.flow < FLOW_MAX; +} + +/** * flow_sidx_eq() - Test if two sidx values are equal * @a, @b: sidx values * diff --git a/flow_table.h b/flow_table.h index 1b16349..226ddbd 100644 --- a/flow_table.h +++ b/flow_table.h @@ -73,7 +73,7 @@ static inline unsigned flow_idx(const struct flow_common *f) */ static inline union flow *flow_at_sidx(flow_sidx_t sidx) { - if (sidx.flow >= FLOW_MAX) + if (!flow_sidx_valid(sidx)) return NULL; return FLOW(sidx.flow); } @@ -880,8 +880,7 @@ static inline unsigned tcp_hash_probe(const struct ctx *c, flow_sidx_t sidx = FLOW_SIDX(conn, TAPSIDE(conn)); /* Linear probing */ - while (!flow_sidx_eq(tc_hash[b], FLOW_SIDX_NONE) && - !flow_sidx_eq(tc_hash[b], sidx)) + while (flow_sidx_valid(tc_hash[b]) && !flow_sidx_eq(tc_hash[b], sidx)) b = mod_sub(b, 1, TCP_HASH_TABLE_SIZE); return b; @@ -909,9 +908,9 @@ static void tcp_hash_remove(const struct ctx *c, const struct tcp_tap_conn *conn) { unsigned b = tcp_hash_probe(c, conn), s; - union flow *flow = flow_at_sidx(tc_hash[b]); + union flow *flow; - if (!flow) + if (!flow_sidx_valid(tc_hash[b])) return; /* Redundant remove */ flow_dbg(conn, "hash table remove: sock %i, bucket: %u", conn->sock, b); |