Archives/SSLproxy
2
0
Fork 0
mirror of https://github.com/sonertari/SSLproxy synced 2024-11-16 06:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
722c2f59d2
SSLproxy/src/pxythr.c

361 lines
13 KiB
C
Raw Normal View History

Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
/*-
* SSLsplit - transparent SSL/TLS interception
* https://www.roe.ch/SSLsplit
*
Update version to 0.8.3 and copyright year to 2021
2021-02-10 21:22:40 +00:00
* Copyright (c) 2017-2021, Soner Tari <sonertari@gmail.com>.
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "pxythr.h"
#include "log.h"
#include "pxyconn.h"
Use the new inline max() function instead of MAX() macro function in sslproxy Do not pass pxy_thr_print_children() or bufferevent_getfd() to MAX() or util_max() macro functions as params, or else they are called twice. Since MAX() macro call duplicates params, do not call it nested either, or else we get very long macro expansions.
2020-05-06 21:02:41 +00:00
#include "util.h"
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
#include <assert.h>
Refactor and rename assign/attach conn to thr functions And fix comments.
2020-05-04 09:16:03 +00:00
/*
* Attach a connection to its thread.
* This function cannot fail.
*/
void
pxy_thr_attach(pxy_conn_ctx_t *ctx)
{
assert(ctx != NULL);
// A thr should have already been assigned
assert(ctx->thr != NULL);
log_finest("Adding conn");
// Always keep thr load and conns list in sync
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
ctx->thr->load++;
Refactor and rename assign/attach conn to thr functions And fix comments.
2020-05-04 09:16:03 +00:00
ctx->next = ctx->thr->conns;
ctx->thr->conns = ctx;
if (ctx->next)
ctx->next->prev = ctx;
}
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
/*
* Detach a connection from a thread by index.
* This function cannot fail.
*/
void
pxy_thr_detach(pxy_conn_ctx_t *ctx)
{
assert(ctx != NULL);
assert(ctx->children == NULL);
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
// If this function is called, the thr conns list cannot be empty
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
assert(ctx->thr->conns != NULL);
log_finest("Removing conn");
// We increment thr load in pxy_conn_init() only (for parent conns)
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
ctx->thr->load--;
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
Convert linked lists to doubly linked lists, so keep track of previous node The only time we go over the linked list is to check idle or expired connections, or to print debug info. Otherwise, mostly what we need is to add and remove list nodes. Removing a list node becomes a very simple task if we keep track of the previous node too. So now we also keep record of prev node, and update prev node as we add and remove nodes. All three linked lists we use benefit from this data structure improvement, making it very fast to remove a list node. Another benefit of this change is that we don't need to identify conns with their id numbers or child conns with their src fds. So now we directly delete them, without needing to check their ids or fds.
2020-05-02 21:27:00 +00:00
if (ctx->prev) {
ctx->prev->next = ctx->next;
} else {
ctx->thr->conns = ctx->next;
}
if (ctx->next)
ctx->next->prev = ctx->prev;
#ifdef DEBUG_PROXY
Decouple thrmgr and conn handling thr on error too Also add/fix comments, fix debug logs and mistakes.
2020-05-03 09:17:49 +00:00
// We may get multiple conns with the same fd combinations, so fds cannot uniquely identify a conn; hence the need for unique ids.
Convert linked lists to doubly linked lists, so keep track of previous node The only time we go over the linked list is to check idle or expired connections, or to print debug info. Otherwise, mostly what we need is to add and remove list nodes. Removing a list node becomes a very simple task if we keep track of the previous node too. So now we also keep record of prev node, and update prev node as we add and remove nodes. All three linked lists we use benefit from this data structure improvement, making it very fast to remove a list node. Another benefit of this change is that we don't need to identify conns with their id numbers or child conns with their src fds. So now we directly delete them, without needing to check their ids or fds.
2020-05-02 21:27:00 +00:00
if (ctx->thr->conns) {
if (ctx->id == ctx->thr->conns->id) {
Decouple thrmgr and conn handling thr on error too Also add/fix comments, fix debug logs and mistakes.
2020-05-03 09:17:49 +00:00
// This should never happen
Convert linked lists to doubly linked lists, so keep track of previous node The only time we go over the linked list is to check idle or expired connections, or to print debug info. Otherwise, mostly what we need is to add and remove list nodes. Removing a list node becomes a very simple task if we keep track of the previous node too. So now we also keep record of prev node, and update prev node as we add and remove nodes. All three linked lists we use benefit from this data structure improvement, making it very fast to remove a list node. Another benefit of this change is that we don't need to identify conns with their id numbers or child conns with their src fds. So now we directly delete them, without needing to check their ids or fds.
2020-05-02 21:27:00 +00:00
log_fine("Found conn in thr conns, first");
assert(0);
} else {
pxy_conn_ctx_t *current = ctx->thr->conns->next;
pxy_conn_ctx_t *previous = ctx->thr->conns;
while (current != NULL && previous != NULL) {
if (ctx->id == current->id) {
Decouple thrmgr and conn handling thr on error too Also add/fix comments, fix debug logs and mistakes.
2020-05-03 09:17:49 +00:00
// This should never happen
Convert linked lists to doubly linked lists, so keep track of previous node The only time we go over the linked list is to check idle or expired connections, or to print debug info. Otherwise, mostly what we need is to add and remove list nodes. Removing a list node becomes a very simple task if we keep track of the previous node too. So now we also keep record of prev node, and update prev node as we add and remove nodes. All three linked lists we use benefit from this data structure improvement, making it very fast to remove a list node. Another benefit of this change is that we don't need to identify conns with their id numbers or child conns with their src fds. So now we directly delete them, without needing to check their ids or fds.
2020-05-02 21:27:00 +00:00
log_fine("Found conn in thr conns");
assert(0);
}
previous = current;
current = current->next;
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
Convert linked lists to doubly linked lists, so keep track of previous node The only time we go over the linked list is to check idle or expired connections, or to print debug info. Otherwise, mostly what we need is to add and remove list nodes. Removing a list node becomes a very simple task if we keep track of the previous node too. So now we also keep record of prev node, and update prev node as we add and remove nodes. All three linked lists we use benefit from this data structure improvement, making it very fast to remove a list node. Another benefit of this change is that we don't need to identify conns with their id numbers or child conns with their src fds. So now we directly delete them, without needing to check their ids or fds.
2020-05-02 21:27:00 +00:00
log_finest("Cannot find conn in thr conns");
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
Convert linked lists to doubly linked lists, so keep track of previous node The only time we go over the linked list is to check idle or expired connections, or to print debug info. Otherwise, mostly what we need is to add and remove list nodes. Removing a list node becomes a very simple task if we keep track of the previous node too. So now we also keep record of prev node, and update prev node as we add and remove nodes. All three linked lists we use benefit from this data structure improvement, making it very fast to remove a list node. Another benefit of this change is that we don't need to identify conns with their id numbers or child conns with their src fds. So now we directly delete them, without needing to check their ids or fds.
2020-05-02 21:27:00 +00:00
} else {
log_finest("Cannot find conn in thr conns, empty");
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
Convert linked lists to doubly linked lists, so keep track of previous node The only time we go over the linked list is to check idle or expired connections, or to print debug info. Otherwise, mostly what we need is to add and remove list nodes. Removing a list node becomes a very simple task if we keep track of the previous node too. So now we also keep record of prev node, and update prev node as we add and remove nodes. All three linked lists we use benefit from this data structure improvement, making it very fast to remove a list node. Another benefit of this change is that we don't need to identify conns with their id numbers or child conns with their src fds. So now we directly delete them, without needing to check their ids or fds.
2020-05-02 21:27:00 +00:00
#endif /* DEBUG_PROXY */
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
static void
pxy_thr_get_expired_conns(pxy_thr_ctx_t *tctx, pxy_conn_ctx_t **expired_conns)
{
*expired_conns = NULL;
if (tctx->conns) {
time_t now = time(NULL);
pxy_conn_ctx_t *ctx = tctx->conns;
while (ctx) {
time_t elapsed_time = now - ctx->atime;
if (elapsed_time > (time_t)tctx->thrmgr->global->conn_idle_timeout) {
ctx->next_expired = *expired_conns;
*expired_conns = ctx;
}
ctx = ctx->next;
}
if (tctx->thrmgr->global->statslog) {
ctx = *expired_conns;
while (ctx) {
Disable conn ids unless debugging We don't need parent or child ids unless debugging. IDLE and EXPIRED conn logs do not need to report ids either. Ids are useful only in detailed debug logs.
2020-05-07 22:11:50 +00:00
time_t atime = now - ctx->atime;
time_t ctime = now - ctx->ctime;
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
#ifndef WITHOUT_USERAUTH
Disable conn ids unless debugging We don't need parent or child ids unless debugging. IDLE and EXPIRED conn logs do not need to report ids either. Ids are useful only in detailed debug logs.
2020-05-07 22:11:50 +00:00
log_finest_main_va("thr=%d, id=%llu, fd=%d, child_fd=%d, dst=%d, srvdst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, ce=%d cc=%d, at=%lld ct=%lld, src_addr=%s:%s, dst_addr=%s:%s, user=%s, valid=%d",
tctx->id, ctx->id, ctx->fd, ctx->child_fd, ctx->dst_fd, ctx->srvdst_fd, ctx->child_src_fd, ctx->child_dst_fd,
ctx->src.closed, ctx->dst.closed, ctx->srvdst.closed, ctx->children ? ctx->children->src.closed : 0, ctx->children ? ctx->children->dst.closed : 0,
ctx->children ? 1:0, ctx->child_count, (long long)atime, (long long)ctime,
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
STRORDASH(ctx->srchost_str), STRORDASH(ctx->srcport_str), STRORDASH(ctx->dsthost_str), STRORDASH(ctx->dstport_str),
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
STRORDASH(ctx->user), ctx->protoctx->is_valid);
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
#else /* WITHOUT_USERAUTH */
log_finest_main_va("thr=%d, id=%llu, fd=%d, child_fd=%d, dst=%d, srvdst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, ce=%d cc=%d, at=%lld ct=%lld, src_addr=%s:%s, dst_addr=%s:%s, valid=%d",
tctx->id, ctx->id, ctx->fd, ctx->child_fd, ctx->dst_fd, ctx->srvdst_fd, ctx->child_src_fd, ctx->child_dst_fd,
ctx->src.closed, ctx->dst.closed, ctx->srvdst.closed, ctx->children ? ctx->children->src.closed : 0, ctx->children ? ctx->children->dst.closed : 0,
ctx->children ? 1:0, ctx->child_count, (long long)atime, (long long)ctime,
STRORDASH(ctx->srchost_str), STRORDASH(ctx->srcport_str), STRORDASH(ctx->dsthost_str), STRORDASH(ctx->dstport_str), ctx->protoctx->is_valid);
#endif /* WITHOUT_USERAUTH */
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
char *msg;
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
if (asprintf(&msg, "EXPIRED: atime=%lld, ctime=%lld, src_addr=%s:%s, dst_addr=%s:%s, "
#ifndef WITHOUT_USERAUTH
"user=%s, "
#endif /* !WITHOUT_USERAUTH */
"valid=%d\n",
Disable conn ids unless debugging We don't need parent or child ids unless debugging. IDLE and EXPIRED conn logs do not need to report ids either. Ids are useful only in detailed debug logs.
2020-05-07 22:11:50 +00:00
(long long)atime, (long long)ctime,
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
STRORDASH(ctx->srchost_str), STRORDASH(ctx->srcport_str), STRORDASH(ctx->dsthost_str), STRORDASH(ctx->dstport_str),
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
#ifndef WITHOUT_USERAUTH
STRORDASH(ctx->user),
#endif /* !WITHOUT_USERAUTH */
ctx->protoctx->is_valid) < 0) {
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
break;
}
if (log_conn(msg) == -1) {
log_err_level_printf(LOG_WARNING, "Expired conn logging failed\n");
}
free(msg);
ctx = ctx->next_expired;
}
}
}
}
static evutil_socket_t
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
pxy_thr_print_children(pxy_conn_child_ctx_t *ctx)
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
{
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
evutil_socket_t max_fd = 0;
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
while (ctx) {
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
// No need to log child stats
log_finest_main_va("CHILD CONN: thr=%d, id=%llu, cid=%d, src=%d, dst=%d, c=%d-%d",
Add unique child id, set to the children count of parent conn This is necessary to uniquely identify child conns. The src fd of child conns was possibly not unique. We use this id in debug logs only. Also relocate the update code related with this id.
2020-05-07 10:45:13 +00:00
ctx->conn->thr->id, ctx->conn->id, ctx->id, ctx->fd, ctx->dst_fd, ctx->src.closed, ctx->dst.closed);
Use the new inline max() function instead of MAX() macro function in sslproxy Do not pass pxy_thr_print_children() or bufferevent_getfd() to MAX() or util_max() macro functions as params, or else they are called twice. Since MAX() macro call duplicates params, do not call it nested either, or else we get very long macro expansions.
2020-05-06 21:02:41 +00:00
max_fd = max(max_fd, max(ctx->fd, ctx->dst_fd));
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
ctx = ctx->next;
}
return max_fd;
}
static void
pxy_thr_print_info(pxy_thr_ctx_t *tctx)
{
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
log_finest_main_va("thr=%d, load=%zu", tctx->id, tctx->load);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
evutil_socket_t max_fd = 0;
time_t max_atime = 0;
time_t max_ctime = 0;
char *smsg = NULL;
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
if (tctx->conns) {
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
time_t now = time(NULL);
pxy_conn_ctx_t *ctx = tctx->conns;
while (ctx) {
time_t atime = now - ctx->atime;
time_t ctime = now - ctx->ctime;
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
#ifndef WITHOUT_USERAUTH
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
log_finest_main_va("PARENT CONN: thr=%d, id=%llu, fd=%d, child_fd=%d, dst=%d, srvdst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, ce=%d cc=%d, at=%lld ct=%lld, src_addr=%s:%s, dst_addr=%s:%s, user=%s, valid=%d",
tctx->id, ctx->id, ctx->fd, ctx->child_fd, ctx->dst_fd, ctx->srvdst_fd, ctx->child_src_fd, ctx->child_dst_fd,
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
ctx->src.closed, ctx->dst.closed, ctx->srvdst.closed, ctx->children ? ctx->children->src.closed : 0, ctx->children ? ctx->children->dst.closed : 0,
ctx->children ? 1:0, ctx->child_count, (long long)atime, (long long)ctime,
STRORDASH(ctx->srchost_str), STRORDASH(ctx->srcport_str), STRORDASH(ctx->dsthost_str), STRORDASH(ctx->dstport_str),
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
STRORDASH(ctx->user), ctx->protoctx->is_valid);
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
#else /* WITHOUT_USERAUTH */
log_finest_main_va("PARENT CONN: thr=%d, id=%llu, fd=%d, child_fd=%d, dst=%d, srvdst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, ce=%d cc=%d, at=%lld ct=%lld, src_addr=%s:%s, dst_addr=%s:%s, valid=%d",
tctx->id, ctx->id, ctx->fd, ctx->child_fd, ctx->dst_fd, ctx->srvdst_fd, ctx->child_src_fd, ctx->child_dst_fd,
ctx->src.closed, ctx->dst.closed, ctx->srvdst.closed, ctx->children ? ctx->children->src.closed : 0, ctx->children ? ctx->children->dst.closed : 0,
ctx->children ? 1:0, ctx->child_count, (long long)atime, (long long)ctime,
STRORDASH(ctx->srchost_str), STRORDASH(ctx->srcport_str), STRORDASH(ctx->dsthost_str), STRORDASH(ctx->dstport_str),
ctx->protoctx->is_valid);
#endif /* WITHOUT_USERAUTH */
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
// @attention Report idle connections only, i.e. the conns which have been idle since the last time we checked for expired conns
if (atime >= (time_t)tctx->thrmgr->global->expired_conn_check_period) {
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
if (asprintf(&smsg, "IDLE: atime=%lld, ctime=%lld, src_addr=%s:%s, dst_addr=%s:%s, "
#ifndef WITHOUT_USERAUTH
"user=%s, "
#endif /* !WITHOUT_USERAUTH */
"valid=%d\n",
Disable conn ids unless debugging We don't need parent or child ids unless debugging. IDLE and EXPIRED conn logs do not need to report ids either. Ids are useful only in detailed debug logs.
2020-05-07 22:11:50 +00:00
(long long)atime, (long long)ctime,
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
STRORDASH(ctx->srchost_str), STRORDASH(ctx->srcport_str), STRORDASH(ctx->dsthost_str), STRORDASH(ctx->dstport_str),
Add WITHOUT_USERAUTH switch
2020-08-25 20:32:32 +00:00
#ifndef WITHOUT_USERAUTH
STRORDASH(ctx->user),
#endif /* !WITHOUT_USERAUTH */
ctx->protoctx->is_valid) < 0) {
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
return;
}
if (log_conn(smsg) == -1) {
log_err_level_printf(LOG_WARNING, "Idle conn logging failed\n");
}
free(smsg);
smsg = NULL;
}
// child_src_fd and child_dst_fd fields are mostly for debugging purposes, used in debug printing parent conns.
// However, while an ssl child is closing, the children list may be empty, but child's ssl fd may be still open,
// hence we include those fields in this max comparisons too
Use the new inline max() function instead of MAX() macro function in sslproxy Do not pass pxy_thr_print_children() or bufferevent_getfd() to MAX() or util_max() macro functions as params, or else they are called twice. Since MAX() macro call duplicates params, do not call it nested either, or else we get very long macro expansions.
2020-05-06 21:02:41 +00:00
max_fd = max(max_fd, max(ctx->fd, max(ctx->dst_fd, max(ctx->srvdst_fd, max(ctx->child_fd, max(ctx->child_src_fd, ctx->child_dst_fd))))));
max_atime = util_max(max_atime, atime);
max_ctime = util_max(max_ctime, ctime);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
if (ctx->children) {
Use the new inline max() function instead of MAX() macro function in sslproxy Do not pass pxy_thr_print_children() or bufferevent_getfd() to MAX() or util_max() macro functions as params, or else they are called twice. Since MAX() macro call duplicates params, do not call it nested either, or else we get very long macro expansions.
2020-05-06 21:02:41 +00:00
// @attention Do not pass pxy_thr_print_children() to MAX() or util_max() macro functions as param, or else it is called twice
// Use the inline max() function instead
max_fd = max(max_fd, pxy_thr_print_children(ctx->children));
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
ctx = ctx->next;
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
}
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
log_finest_main_va("thr=%d, mld=%zu, mfd=%d, mat=%lld, mct=%lld, iib=%llu, iob=%llu, eib=%llu, eob=%llu, swm=%zu, uwm=%zu, to=%zu, err=%zu, si=%u",
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
tctx->id, tctx->max_load, tctx->max_fd, (long long)max_atime, (long long)max_ctime, tctx->intif_in_bytes, tctx->intif_out_bytes, tctx->extif_in_bytes, tctx->extif_out_bytes,
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
tctx->set_watermarks, tctx->unset_watermarks, tctx->timedout_conns, tctx->errors, tctx->stats_id);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
if (asprintf(&smsg, "STATS: thr=%d, mld=%zu, mfd=%d, mat=%lld, mct=%lld, iib=%llu, iob=%llu, eib=%llu, eob=%llu, swm=%zu, uwm=%zu, to=%zu, err=%zu, si=%u\n",
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
tctx->id, tctx->max_load, tctx->max_fd, (long long)max_atime, (long long)max_ctime, tctx->intif_in_bytes, tctx->intif_out_bytes, tctx->extif_in_bytes, tctx->extif_out_bytes,
Remove pending ssl conns list and in_thr_conns flag We have carried almost all conn init tasks from thrmgr to conn handling thread. So we immediately add the conn to the conn list of its thr, which renders both pending ssl conns list and in_thr_conns flag useless.
2020-05-03 18:05:12 +00:00
tctx->set_watermarks, tctx->unset_watermarks, tctx->timedout_conns, tctx->errors, tctx->stats_id) < 0) {
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
return;
}
if (log_stats(smsg) == -1) {
log_err_level_printf(LOG_WARNING, "Stats logging failed\n");
}
free(smsg);
tctx->stats_id++;
tctx->timedout_conns = 0;
tctx->errors = 0;
tctx->set_watermarks = 0;
tctx->unset_watermarks = 0;
tctx->intif_in_bytes = 0;
tctx->intif_out_bytes = 0;
tctx->extif_in_bytes = 0;
tctx->extif_out_bytes = 0;
// Reset these stats with the current values (do not reset to 0 directly, there may be active conns)
tctx->max_fd = max_fd;
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
tctx->max_load = tctx->load;
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
/*
* Recurring timer event to prevent the event loops from exiting when
* they run out of events.
*/
static void
pxy_thr_timer_cb(UNUSED evutil_socket_t fd, UNUSED short what, UNUSED void *arg)
{
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
pxy_thr_ctx_t *tctx = arg;
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
log_finest_main_va("thr=%d, load=%zu, to=%u", tctx->id, tctx->load, tctx->timeout_count);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
pxy_conn_ctx_t *expired = NULL;
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
pxy_thr_get_expired_conns(tctx, &expired);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
#ifdef DEBUG_PROXY
if (expired) {
time_t now = time(NULL);
#endif /* DEBUG_PROXY */
while (expired) {
pxy_conn_ctx_t *next = expired->next_expired;
log_fine_main_va("Delete timed out conn thr=%d, fd=%d, child_fd=%d, at=%lld ct=%lld",
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
expired->thr->id, expired->fd, expired->child_fd, (long long)(now - expired->atime), (long long)(now - expired->ctime));
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
// @attention Do not call the term function here, free the conn directly
pxy_conn_free(expired, 1);
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
tctx->timedout_conns++;
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
expired = next;
}
#ifdef DEBUG_PROXY
}
#endif /* DEBUG_PROXY */
// @attention Print thread info only if stats logging is enabled, if disabled debug logs are not printed either
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
if (tctx->thrmgr->global->statslog) {
tctx->timeout_count++;
if (tctx->timeout_count >= tctx->thrmgr->global->stats_period) {
tctx->timeout_count = 0;
pxy_thr_print_info(tctx);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
}
}
}
/*
* Thread entry point; runs the event loop of the event base.
* Does not exit until the libevent loop is broken explicitly.
*/
void *
pxy_thr(void *arg)
{
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
pxy_thr_ctx_t *tctx = arg;
struct timeval timer_delay = {tctx->thrmgr->global->expired_conn_check_period, 0};
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
struct event *ev;
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
ev = event_new(tctx->evbase, -1, EV_PERSIST, pxy_thr_timer_cb, tctx);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
if (!ev)
return NULL;
evtimer_add(ev, &timer_delay);
Fix a possible sync issue between thr load and conn children list on error Refactor and rename functions, struct fields, and vars Simplify if conditions and fix/improve logs Clean up
2020-05-05 07:33:47 +00:00
tctx->running = 1;
event_base_dispatch(tctx->evbase);
Decouple code for thrmgr and conn handling threads, so create pxythr.c/h
2020-05-02 14:56:40 +00:00
event_free(ev);
return NULL;
}
/* vim: set noet ft=c: */
Reference in New Issue Copy Permalink