Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop clients from proxy_worker, not proxy_conn #27

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Drop clients from proxy_worker, not proxy_conn #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
838af26
Drop clients from proxy_worker, not proxy_conn
cottsay Jan 7, 2025
245bef0
Merge branch 'main' into cottsay/drop-during-auth
cottsay Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/proxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@ static int proxy_worker_accept(struct proxy_worker *pw,
*/
static int proxy_worker_authorize(struct proxy_worker *pw);

/*!
* @brief Begins an orderly shutdown of any active connections
*
* @param[in,out] pw Target proxy client worker instance
*/
static void proxy_worker_drop(struct proxy_worker *pw);

/*!
* @brief Frees data allocated by ::proxy_worker_init
*
Expand Down Expand Up @@ -296,6 +303,16 @@ static int proxy_worker_authorize(struct proxy_worker *pw)
return 0;
}

static void proxy_worker_drop(struct proxy_worker *pw)
{
mutex_lock_shared(&pw->mutex);

if (pw->conn_client != NULL)
conn_drop(pw->conn_client);

mutex_unlock_shared(&pw->mutex);
}

static void proxy_worker_free(struct proxy_worker *pw)
{
worker_free(&pw->worker);
Expand Down Expand Up @@ -894,7 +911,7 @@ void proxy_drop(struct proxy_handle *ph)
proxy_log(ph, LOG_LEVEL_DEBUG, "Dropping all clients...\n");

for (i = 0; i < priv->num_clients; i++)
proxy_conn_drop(&priv->clients[i]);
proxy_worker_drop(&priv->client_workers[i]);
}

void proxy_shutdown(struct proxy_handle *ph)
Expand Down
Loading