Archives
/
SSLproxy
mirror of https://github.com/sonertari/SSLproxy
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring to remove mctx

Browse Source
pull/13/head
Soner Tari 7 years ago
parent 133584361f
commit 09e1c858b9
6 changed files with 573 additions and 598 deletions
Show Stats Download Patch File Download Diff File

4
privsep.c
Unescape Escape View File

@ -246,7 +246,7 @@ privsep_server_opensock_child(proxyspec_t *spec)
fd = socket(spec->child_src_addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
if (fd == -1) {
log_err_printf("Error from socket() fd2: %s (%i)\n",
log_err_printf("Error from socket() child_fd: %s (%i)\n",
strerror(errno), errno);
evutil_closesocket(fd);
return -1;
@ -270,7 +270,7 @@ privsep_server_opensock_child(proxyspec_t *spec)
rv = evutil_make_listen_socket_reuseable(fd);
if (rv == -1) {
log_err_printf("Error from setsockopt(SO_REUSABLE) fd2: %s\n",
log_err_printf("Error from setsockopt(SO_REUSABLE) child_fd: %s\n",
strerror(errno));
evutil_closesocket(fd);
return -1;

2
proxy.c
Unescape Escape View File

@ -108,7 +108,7 @@ proxy_listener_errorcb(struct evconnlistener *listener, UNUSED void *ctx)
{
proxy_conn_meta_ctx_t *mctx = ctx;
log_dbg_level_printf(LOG_DBG_MODE_FINE, ">############################# proxy_listener_errorcb: ERROR, fd2=%d\n", mctx ? mctx->child_fd : -1);
log_dbg_level_printf(LOG_DBG_MODE_FINE, ">############################# proxy_listener_errorcb: ERROR, fd=%d, child_fd=%d\n", mctx ? mctx->fd : -1, mctx ? mctx->child_fd : -1);
struct event_base *evbase = evconnlistener_get_base(listener);
int err = EVUTIL_SOCKET_ERROR();
log_err_printf("Error %d on listener: %s\n", err,

1181
pxyconn.c
View File

File diff suppressed because it is too large Load Diff

5
pxyconn.h
Unescape Escape View File

@ -157,10 +157,7 @@ void pxy_conn_setup(evutil_socket_t, struct sockaddr *, int,
pxy_thrmgr_ctx_t *, proxyspec_t *, opts_t *,
evutil_socket_t)
NONNULL(2,4,5,6);
void
pxy_conn_setup_child(evutil_socket_t, proxy_conn_meta_ctx_t *) NONNULL(2);
void
pxy_conn_free_all(proxy_conn_meta_ctx_t *);
void pxy_conn_free(pxy_conn_ctx_t *ctx) NONNULL(1);
#endif /* !PXYCONN_H */

203
pxythrmgr.c
Unescape Escape View File

@ -47,19 +47,101 @@
#define THR_TIMER_TIMEOUT 10
#define THR_TIMER_PRINT_INFO_TIMEOUT 1*THR_TIMER_TIMEOUT
#define CONN_EXPIRE_TIME 30
#define CONN_EXPIRE_TIME 120
static void
pxy_thrmgr_get_thr_expired_conns(pxy_thr_ctx_t *ctx, proxy_conn_meta_ctx_t **expired_conns)
{
*expired_conns = NULL;
time_t now = time(NULL);
proxy_conn_meta_ctx_t *mctx = ctx->mctx_list;
while (mctx) {
unsigned long elapsed_time = now - mctx->access_time;
if (elapsed_time > CONN_EXPIRE_TIME) {
mctx->next_expired = *expired_conns;
*expired_conns = mctx;
}
mctx = mctx->next;
}
mctx = *expired_conns;
if (mctx) {
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_get_thr_expired_conns: ----------------------------- Expired conns: thr=%d\n", ctx->thridx);
while (mctx) {
proxy_conn_meta_ctx_t *next = mctx->next_expired;
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_get_expired_conns: thr=%d, fd=%d, child_fd=%d, time=%lld\n",
mctx->thr->thridx, mctx->fd, mctx->child_fd, (long int) now - mctx->access_time);
mctx = next;
}
}
}
static void
pxy_thrmgr_print_child(pxy_conn_child_ctx_t *child_ctx, int count)
{
assert(child_ctx != NULL);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> .......... pxy_thrmgr_print_child: thr=%d, cont=%d, src=%d, dst=%d, c=%d-%d, ci=%d\n",
child_ctx->mctx->thr->thridx, count, child_ctx->src_fd, child_ctx->dst_fd, child_ctx->src.closed, child_ctx->dst.closed, child_ctx->idx);
if (child_ctx->next) {
pxy_thrmgr_print_child(child_ctx->next, count);
}
}
static void
pxy_thrmgr_print_thr_info(pxy_thr_ctx_t *ctx)
{
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: thr=%d, load=%lu\n", ctx->thridx, ctx->load);
if (ctx->mctx_list) {
time_t now = time(NULL);
proxy_conn_meta_ctx_t *mctx = ctx->mctx_list;
int count = 0;
while (mctx) {
char *host, *port;
if (mctx->addrlen == 0 || (sys_sockaddr_str((struct sockaddr *)&mctx->addr, mctx->addrlen, &host, &port) != 0)) {
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: Cannot get host:port: thr=%d, cont=%d, fd=%d, child_fd=%d\n", ctx->thridx, count, mctx->fd, mctx->child_fd);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: thr=%d, cont=%d, fd=%d, child_fd=%d, src=%d, dst=%d, srv_dst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, pe=%d ce=%d tcc=%d, time=%lld\n",
ctx->thridx, count, mctx->fd, mctx->child_fd, mctx->src_fd, mctx->dst_fd, mctx->srv_dst_fd, mctx->child_src_fd, mctx->child_dst_fd,
mctx->src_closed, mctx->dst_closed, mctx->srv_dst_closed, mctx->child_src_closed, mctx->child_dst_closed, mctx->parent ? 1:0, mctx->children ? 1:0, mctx->child_count,(long int) now - mctx->access_time);
} else {
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: thr=%d, cont=%d, fd=%d, child_fd=%d, src=%d, dst=%d, srv_dst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, pe=%d ce=%d tcc=%d, time=%lld, addr=%s:%s\n",
ctx->thridx, count, mctx->fd, mctx->child_fd, mctx->src_fd, mctx->dst_fd, mctx->srv_dst_fd, mctx->child_src_fd, mctx->child_dst_fd,
mctx->src_closed, mctx->dst_closed, mctx->srv_dst_closed, mctx->child_src_closed, mctx->child_dst_closed, mctx->parent ? 1:0, mctx->children ? 1:0, mctx->child_count, (long int) now - mctx->access_time, host ? host : "?", port ? port : "?");
free(host);
free(port);
}
if (mctx->children) {
pxy_thrmgr_print_child(mctx->children, count);
}
count++;
mctx = mctx->next;
}
}
log_dbg_level_printf(LOG_DBG_MODE_FINE, ">>> pxy_thrmgr_print_thr_info: EXIT\n");
}
/*
* Dummy recurring timer event to prevent the event loops from exiting when
* Recurring timer event to prevent the event loops from exiting when
* they run out of events.
*/
static void
pxy_thrmgr_timer_cb(UNUSED evutil_socket_t fd, UNUSED short what,
UNUSED void *arg)
{
/* do nothing */
pxy_thr_ctx_t *ctx = arg;
if (ctx->timer_cb_running) {
return;
}
ctx->timer_cb_running = 1;
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! pxy_thrmgr_timer_cb <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< THREAD TIMER thr=%d, load=%lu, to=%u\n", ctx->thridx, ctx->load, ctx->timeout_count);
proxy_conn_meta_ctx_t *expired = NULL;
pxy_thrmgr_get_thr_expired_conns(ctx, &expired);
@ -69,9 +151,9 @@ pxy_thrmgr_timer_cb(UNUSED evutil_socket_t fd, UNUSED short what,
while (expired) {
proxy_conn_meta_ctx_t *next = expired->next_expired;
log_dbg_level_printf(LOG_DBG_MODE_FINE, ">>>>> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! pxy_thrmgr_timer_cb: DELETE thr=%d, fd=%d, fd2=%d, time=%lld <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< TIMED OUT\n",
log_dbg_level_printf(LOG_DBG_MODE_FINE, ">>>>> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! pxy_thrmgr_timer_cb: DELETE thr=%d, fd=%d, child_fd=%d, time=%lld <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< TIMED OUT\n",
expired->thr->thridx, expired->fd, expired->child_fd, (long int) now - expired->access_time);
pxy_conn_free_all(expired);
pxy_conn_free(expired->parent);
expired = next;
}
@ -82,6 +164,8 @@ pxy_thrmgr_timer_cb(UNUSED evutil_socket_t fd, UNUSED short what,
ctx->timeout_count = 0;
pxy_thrmgr_print_thr_info(ctx);
}
ctx->timer_cb_running = 0;
}
/*
@ -254,7 +338,7 @@ pxy_thrmgr_remove_mctx(proxy_conn_meta_ctx_t *node, proxy_conn_meta_ctx_t **head
{
assert(node != NULL);
assert(*head != NULL);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_remove_node: DELETING, fd=%d, fd2=%d\n", node->fd, node->child_fd);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_remove_mctx: DELETING, fd=%d, child_fd=%d\n", node->fd, node->child_fd);
// @attention We may get multiple conns with the same fd combinations, so they cannot uniquely define a conn; hence the need for uuids.
if (uuid_compare(node->uuid, (*head)->uuid, NULL) == 0) {
@ -330,7 +414,7 @@ void
pxy_thrmgr_attach_child(proxy_conn_meta_ctx_t *mctx)
{
pthread_mutex_lock(&mctx->thrmgr->mutex);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_attach_child: ENTER\n");
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_attach_child\n");
mctx->thr->load++;
pthread_mutex_unlock(&mctx->thrmgr->mutex);
}
@ -344,7 +428,7 @@ pxy_thrmgr_detach(proxy_conn_meta_ctx_t *mctx)
{
pthread_mutex_lock(&mctx->thrmgr->mutex);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_detach: BEFORE pxy_thrmgr_remove_node\n");
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_detach: BEFORE pxy_thrmgr_remove_mctx\n");
pxy_thrmgr_print_thr_info(mctx->thr);
mctx->thr->load--;
@ -352,11 +436,11 @@ pxy_thrmgr_detach(proxy_conn_meta_ctx_t *mctx)
if (!mctx->children) {
pxy_thrmgr_remove_mctx(mctx, &mctx->thr->mctx_list);
} else {
log_dbg_level_printf(LOG_DBG_MODE_FINER, ">>>>> pxy_thrmgr_detach: parent ctx has an active child, will not remove from the list, fd=%d, fd2=%d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
log_dbg_level_printf(LOG_DBG_MODE_FINER, ">>>>> pxy_thrmgr_detach: parent has an active child, will not remove from the list, fd=%d, child_fd=%d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
mctx->fd, mctx->child_fd);
}
log_dbg_level_printf(LOG_DBG_MODE_FINER, ">>>>> pxy_thrmgr_detach: AFTER pxy_thrmgr_remove_node\n");
log_dbg_level_printf(LOG_DBG_MODE_FINER, ">>>>> pxy_thrmgr_detach: AFTER pxy_thrmgr_remove_mctx\n");
pxy_thrmgr_print_thr_info(mctx->thr);
pthread_mutex_unlock(&mctx->thrmgr->mutex);
@ -366,106 +450,9 @@ void
pxy_thrmgr_detach_child(proxy_conn_meta_ctx_t *mctx)
{
pthread_mutex_lock(&mctx->thrmgr->mutex);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_detach_child: BEFORE pxy_thrmgr_remove_node\n");
pxy_thrmgr_print_thr_info(mctx->thr);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>>>> pxy_thrmgr_detach_child\n");
mctx->thr->load--;
if (!mctx->parent && !mctx->children) {
pxy_thrmgr_remove_mctx(mctx, &mctx->thr->mctx_list);
} else {
if (mctx->parent) {
log_dbg_level_printf(LOG_DBG_MODE_FINER, ">>>>> pxy_thrmgr_detach_child: child ctx has an active parent, will not remove from the list, fd=%d, fd2=%d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
mctx->fd, mctx->child_fd);
} else if (mctx->children) {
log_dbg_level_printf(LOG_DBG_MODE_FINER, ">>>>> pxy_thrmgr_detach_child: conn has 1+ active child, will not remove from the list, fd=%d, fd2=%d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
mctx->fd, mctx->child_fd);
}
}
log_dbg_level_printf(LOG_DBG_MODE_FINER, ">>>>> pxy_thrmgr_detach_child: AFTER pxy_thrmgr_remove_node\n");
pxy_thrmgr_print_thr_info(mctx->thr);
pthread_mutex_unlock(&mctx->thrmgr->mutex);
}
static void
pxy_thrmgr_print_child(pxy_conn_child_ctx_t *child_ctx, int count)
{
assert(child_ctx != NULL);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> .......... pxy_thrmgr_print_child: thr=%d, cont=%d, src=%d, dst=%d, c=%d-%d, ci=%d\n",
child_ctx->mctx->thr->thridx, count, child_ctx->src_fd, child_ctx->dst_fd, child_ctx->src.closed, child_ctx->dst.closed, child_ctx->idx);
if (child_ctx->next) {
pxy_thrmgr_print_child(child_ctx->next, count);
}
}
void
pxy_thrmgr_print_thr_info(pxy_thr_ctx_t *ctx)
{
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: thr=%d, load=%lu\n", ctx->thridx, ctx->load);
if (ctx->mctx_list) {
time_t now = time(NULL);
proxy_conn_meta_ctx_t *mctx = ctx->mctx_list;
int count = 0;
while (mctx) {
char *host, *port;
if (mctx->addrlen == 0 || (sys_sockaddr_str((struct sockaddr *)&mctx->addr, mctx->addrlen, &host, &port) != 0)) {
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: Cannot get host:port: thr=%d, cont=%d, fd=%d, fd2=%d\n", ctx->thridx, count, mctx->fd, mctx->child_fd);
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: thr=%d, cont=%d, fd=%d, fd2=%d, src=%d, dst=%d, srv_dst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, pe=%d ce=%d tcc=%d, time=%lld\n",
ctx->thridx, count, mctx->fd, mctx->child_fd, mctx->src_fd, mctx->dst_fd, mctx->srv_dst_fd, mctx->child_src_fd, mctx->child_dst_fd,
mctx->src_closed, mctx->dst_closed, mctx->srv_dst_closed, mctx->child_src_closed, mctx->child_dst_closed, mctx->parent ? 1:0, mctx->children ? 1:0, mctx->child_count,(long int) now - mctx->access_time);
} else {
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_print_thr_info: thr=%d, cont=%d, fd=%d, fd2=%d, src=%d, dst=%d, srv_dst=%d, child_src=%d, child_dst=%d, p=%d-%d-%d c=%d-%d, pe=%d ce=%d tcc=%d, time=%lld, addr=%s:%s\n",
ctx->thridx, count, mctx->fd, mctx->child_fd, mctx->src_fd, mctx->dst_fd, mctx->srv_dst_fd, mctx->child_src_fd, mctx->child_dst_fd,
mctx->src_closed, mctx->dst_closed, mctx->srv_dst_closed, mctx->child_src_closed, mctx->child_dst_closed, mctx->parent ? 1:0, mctx->children ? 1:0, mctx->child_count, (long int) now - mctx->access_time, host ? host : "?", port ? port : "?");
free(host);
free(port);
}
if (mctx->children) {
pxy_thrmgr_print_child(mctx->children, count);
}
count++;
mctx = mctx->next;
}
}
log_dbg_level_printf(LOG_DBG_MODE_FINE, ">>> pxy_thrmgr_print_thr_info: EXIT\n");
}
void
pxy_thrmgr_get_thr_expired_conns(pxy_thr_ctx_t *ctx, proxy_conn_meta_ctx_t **expired_conns)
{
*expired_conns = NULL;
time_t now = time(NULL);
proxy_conn_meta_ctx_t *mctx = ctx->mctx_list;
while (mctx) {
unsigned long elapsed_time = now - mctx->access_time;
if (elapsed_time > CONN_EXPIRE_TIME) {
mctx->next_expired = *expired_conns;
*expired_conns = mctx;
}
mctx = mctx->next;
}
mctx = *expired_conns;
if (mctx) {
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_get_thr_expired_conns: ----------------------------- Expired conns: thr=%d\n", ctx->thridx);
while (mctx) {
proxy_conn_meta_ctx_t *next = mctx->next_expired;
log_dbg_level_printf(LOG_DBG_MODE_FINEST, ">>> pxy_thrmgr_get_expired_conns: thr=%d, fd=%d, fd2=%d, time=%lld\n",
mctx->thr->thridx, mctx->fd, mctx->child_fd, (long int) now - mctx->access_time);
mctx = next;
}
}
}
/* vim: set noet ft=c: */

4
pxythrmgr.h
Unescape Escape View File

@ -47,6 +47,7 @@ typedef struct pxy_thr_ctx {
struct event_base *evbase;
struct evdns_base *dnsbase;
int running;
int timer_cb_running;
unsigned int timeout_count;
proxy_conn_meta_ctx_t *mctx_list;
} pxy_thr_ctx_t;
@ -67,9 +68,6 @@ void pxy_thrmgr_attach_child(proxy_conn_meta_ctx_t *) NONNULL(1);
void pxy_thrmgr_detach(proxy_conn_meta_ctx_t *) NONNULL(1);
void pxy_thrmgr_detach_child(proxy_conn_meta_ctx_t *) NONNULL(1);
void pxy_thrmgr_print_thr_info(pxy_thr_ctx_t *ctx);
void pxy_thrmgr_get_thr_expired_conns(pxy_thr_ctx_t *ctx, proxy_conn_meta_ctx_t **expired_conns);
#endif /* !PXYTHRMGR_H */
/* vim: set noet ft=c: */

Write Preview
Loading…
Cancel
Save