third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-13 07:37:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove redundant paramters

Browse Source
This commit is contained in:
yrutschle 2021-04-02 16:02:23 +02:00
parent e7a5bbc4e1
commit 7a88a50c32
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sslh-select.c
View File

@ -326,11 +326,11 @@ static void probing_read_process(cnx_collection* collection,
/* Process a connection that is active in read */ /* Process a connection that is active in read */
static void cnx_read_process(cnx_collection* collection, static void cnx_read_process(struct select_info* fd_info,
struct connection* cnx, int fd)
int fd,
struct select_info* fd_info)
{ {
cnx_collection* collection = fd_info->collection;
struct connection* cnx = collection_get_cnx_from_fd(collection, fd);
/* Determine active queue (0 or 1): if fd is that of q[1], active_q = 1, /* Determine active queue (0 or 1): if fd is that of q[1], active_q = 1,
* otherwise it's 0 */ * otherwise it's 0 */
int active_q = (cnx->q[1].fd == fd); int active_q = (cnx->q[1].fd == fd);
@ -452,15 +452,14 @@ void main_loop(struct listen_endpoint listen_sockets[], int num_addr_listen)
} }
/* Check all sockets for timeouts */ /* Check all sockets for timeouts */
/* TODO: refactor to use a list of probing connections to avoid linear
* search through all connections */
for (i = 0; i < collection_get_length(fd_info.collection); i++) { for (i = 0; i < collection_get_length(fd_info.collection); i++) {
struct connection* cnx = collection_get_cnx_from_index(fd_info.collection, i); struct connection* cnx = collection_get_cnx_from_index(fd_info.collection, i);
for (j = 0; j < 2; j++) { if ((cnx->state == ST_PROBING) && (cnx->probe_timeout < time(NULL))) {
if (/*is_fd_active(cnx->q[j].fd, &readfds) || */ if (cfg.verbose)
((cnx->state == ST_PROBING) && (cnx->probe_timeout < time(NULL)))) { fprintf(stderr, "timeout slot %d\n", i);
if (cfg.verbose) cnx_read_process(&fd_info, cnx->q[0].fd);
fprintf(stderr, "processing read fd%d slot %d\n", j, i);
cnx_read_process(fd_info.collection, cnx, i, &fd_info);
}
} }
} }
@ -473,7 +472,7 @@ void main_loop(struct listen_endpoint listen_sockets[], int num_addr_listen)
dump_connection(cnx); dump_connection(cnx);
} }
cnx_read_process(fd_info.collection, cnx, i, &fd_info); cnx_read_process(&fd_info, i);
} }
} }