third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-05-31 15:49:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

finalise UDP support for sslh-ev

Browse Source
This commit is contained in:
yrutschle 2021-11-11 21:16:37 +01:00
parent 207d482189
commit 0a23ca133e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sslh-ev.c
View File

@ -150,9 +150,6 @@ void main_loop(struct listen_endpoint listen_sockets[], int num_addr_listen)
watchers_init(&ev_info.watchers, listen_sockets, num_addr_listen); watchers_init(&ev_info.watchers, listen_sockets, num_addr_listen);
ev_set_userdata(EV_A_ &ev_info); ev_set_userdata(EV_A_ &ev_info);
/* TODO: udp timeouts */
ev_run(EV_A_ 0); ev_run(EV_A_ 0);
} }

14
udp-listener.c
View File

@ -40,7 +40,16 @@ static int udp_timeout(struct connection* cnx)
* it. At the same time, keep track of the closest, next timeout. Only do the * it. At the same time, keep track of the closest, next timeout. Only do the
* search through connections if that timeout actually happened. If the * search through connections if that timeout actually happened. If the
* connection that would have timed out has had activity, it doesn't matter: we * connection that would have timed out has had activity, it doesn't matter: we
* go through connections to find the next timeout, which was needed anyway. */ * go through connections to find the next timeout, which was needed anyway.
*
* This gets called every time a UDP packet is received from the outside, i.e.
* every time we might need to free up resources. If no packets come in, we
* don't time out anything, as we don't need the resources.
*
* TODO: use a better algorithm to avoid going through all connections each
* time.
*
* */
void udp_timeouts(struct loop_info* fd_info) void udp_timeouts(struct loop_info* fd_info)
{ {
time_t now = time(NULL); time_t now = time(NULL);
@ -140,6 +149,8 @@ int udp_c2s_forward(int sockfd, struct loop_info* fd_info)
} }
out = socket(proto->saddr->ai_family, SOCK_DGRAM, 0); out = socket(proto->saddr->ai_family, SOCK_DGRAM, 0);
res = set_nonblock(out);
CHECK_RES_RETURN(res, "udp:socket:nonblock", -1);
struct connection* cnx = collection_alloc_cnx_from_fd(collection, out); struct connection* cnx = collection_alloc_cnx_from_fd(collection, out);
if (!cnx) return -1; if (!cnx) return -1;
target = out; target = out;
@ -169,6 +180,7 @@ void udp_s2c_forward(struct connection* cnx)
int res; int res;
res = recvfrom(sockfd, data, sizeof(data), 0, NULL, NULL); res = recvfrom(sockfd, data, sizeof(data), 0, NULL, NULL);
if ((res == -1) && ((errno == EAGAIN) || (errno == EWOULDBLOCK))) return;
CHECK_RES_DIE(res, "udp_listener/recvfrom"); CHECK_RES_DIE(res, "udp_listener/recvfrom");
res = sendto(cnx->local_endpoint, data, res, 0, res = sendto(cnx->local_endpoint, data, res, 0,
&cnx->client_addr, cnx->addrlen); &cnx->client_addr, cnx->addrlen);