Client removing part #2

We can do this, because connection won't
be removed while we have alvie response-request
pair.

fw/client.c

@@ -39,31 +39,29 @@
 static struct {
 	unsigned int	db_size;
 	const char	*db_path;
-	unsigned int	expires_time;
 } client_cfg __read_mostly;
 
 /**
  * Client tdb entry.
  *
  * @cli			- client descriptor;
  * @xff_addr		- peer IPv6 address from X-Forwarded-For;
- * @expires		- expiration time for the client descriptor after all;
- *			  connections are closed;
- * @lock		- lock for atomic change @expires and @users;
+ * @lock		- lock for atomic change @expired and @users;
  * @users		- reference counter.
  * 			  Expiration state will begind, when the counter reaches
  *			  zero;
  * @user_agent_len	- Length of @user_agent
  * @user_agent		- UA_CMP_LEN first characters of User-Agent
+ * @expired		- Expired when client dissconnected;
  */
 typedef struct {
 	TfwClient	cli;
 	TfwAddr		xff_addr;
-	long		expires;
 	spinlock_t	lock;
 	int		users;
 	unsigned long	user_agent_len;
 	char		user_agent[UA_CMP_LEN];
+	bool		expired;
 } TfwClientEntry;
 
 static TDB *client_db;
@@ -106,7 +104,8 @@ tfw_client_put(TfwClient *cli)
 
 	BUG_ON(!list_empty(&cli->conn_list));
 
-	ent->expires = tfw_current_timestamp() + client_cfg.expires_time;
+	/* Expire descriptor, prepare for removing. */
+	ent->expired = true;
 
 	spin_unlock(&ent->lock);
 
@@ -134,7 +133,6 @@ tfw_client_addr_eq(TdbRec *rec, void *data)
 	TfwClientEntry *ent = (TfwClientEntry *)rec->data;
 	TfwClient *cli = &ent->cli;
 	TfwClientEqCtx *ctx = (TfwClientEqCtx *)data;
-	long curr_time = tfw_current_timestamp();
 
 	if (memcmp_fast(&cli->addr.sin6_addr, &ctx->addr.sin6_addr,
 			sizeof(cli->addr.sin6_addr)))
@@ -156,14 +154,12 @@ tfw_client_addr_eq(TdbRec *rec, void *data)
 
 	spin_lock(&ent->lock);
 
-	if (curr_time > ent->expires) {
-		bzero_fast(&cli->class_prvt, sizeof(cli->class_prvt));
-		if (ctx->init)
-			ctx->init(cli);
+	/* Don't use expired descriptor. It must be evicted from database. */
+	if (ent->expired) {
+		spin_unlock(&ent->lock);
+		return false;
 	}
 
-	ent->expires = LONG_MAX;
-
 	++ent->users;
 	if (ent->users == 1)
 		TFW_INC_STAT_BH(clnt.online);
@@ -185,7 +181,6 @@ tfw_client_ent_init(TdbRec *rec, void *data)
 
 	spin_lock_init(&ent->lock);
 
-	ent->expires = LONG_MAX;
 	bzero_fast(&cli->class_prvt, sizeof(cli->class_prvt));
 	if (ctx->init)
 		ctx->init(cli);
@@ -294,14 +289,6 @@ tfw_client_for_each(int (*fn)(void *))
 	return tdb_entry_walk(client_db, fn);
 }
 
-void
-tfw_client_set_expires_time(unsigned int expires_time)
-{
-	if (client_cfg.expires_time < expires_time + 1) {
-		client_cfg.expires_time = expires_time + 1;
-	}
-}
-
 static int
 tfw_client_start(void)
 {
@@ -363,8 +350,6 @@ TfwMod tfw_client_mod = {
 int __init
 tfw_client_init(void)
 {
-	client_cfg.expires_time = 1;
-
 	tfw_mod_register(&tfw_client_mod);
 
 	return 0;

fw/client.h

@@ -2,7 +2,7 @@
  *		Tempesta FW
  *
  * Copyright (C) 2014 NatSys Lab. (info@natsys-lab.com).
- * Copyright (C) 2015-2022 Tempesta Technologies, Inc.
+ * Copyright (C) 2015-2024 Tempesta Technologies, Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -40,7 +40,6 @@ TfwClient *tfw_client_obtain(TfwAddr addr, TfwAddr *cli_addr,
 			     TfwStr *user_agent, void (*init)(void *));
 void tfw_client_put(TfwClient *cli);
 int tfw_client_for_each(int (*fn)(void *));
-void tfw_client_set_expires_time(unsigned int expires_time);
 void tfw_cli_conn_release(TfwCliConn *cli_conn);
 int tfw_cli_conn_send(TfwCliConn *cli_conn, TfwMsg *msg);
 int tfw_cli_conn_abort_all(void *data);

fw/t/unit/helpers.c

@@ -172,11 +172,6 @@ ss_stop(void)
 {
 }
 
-void
-tfw_client_set_expires_time(unsigned int expires_time)
-{
-}
-
 void
 tfw_client_put(TfwClient *cli)
 {

fw/vhost.c

@@ -2108,12 +2108,6 @@ __tfw_cfgop_frang_rsp_code_block(TfwCfgSpec *cs, TfwCfgEntry *ce,
 	    || frang_parse_ushort(ce->vals[ce->val_n - 1], &cb->tf))
 		return -EINVAL;
 
-	/*
-	 * We need the maximum time frame used by all the limiting logic
-	 * to keep limit accounting data during this time if the connection is
-	 * closed
-	 */
-	tfw_client_set_expires_time(cb->tf);
 	/* Update time frame value to reduce calculations in hot-path. */
 	cb->tf = (cb->tf * HZ) / FRANG_FREQ;