Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-29 20:43:44 +00:00
Code Releases Activity

Refine the handling of fragment request

Browse Source
This commit is contained in:
Max Lv
2019-10-12 08:18:45 +08:00
parent 73517220c3
commit 5da991a88c
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server.c
+18 -5
View File
@@ -74,6 +74,10 @@
#define MAX_FRAG 1
#endif
#ifndef FRAG_TIMEOUT
#define FRAG_TIMEOUT 0.5f
#endif
#ifdef USE_NFCONNTRACK_TOS
#ifndef MARK_MAX_PACKET
@@ -707,6 +711,11 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
// Only timer the watcher if a valid connection is established
ev_timer_again(EV_A_ & server->recv_ctx->watcher);
} else if (server->stage == STAGE_INIT && server->frag > 0) {
// reset the timer for fragment request
ev_timer_set(&server->recv_ctx->watcher, MAX_REQUEST_TIMEOUT, MAX_REQUEST_TIMEOUT);
ev_timer_again(EV_A_ & server->recv_ctx->watcher);
}
ssize_t r = recv(server->fd, buf->data, SOCKET_BUF_SIZE, 0);
@@ -744,12 +753,16 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
stop_server(EV_A_ server);
return;
} else if (err == CRYPTO_NEED_MORE) {
if (server->stage != STAGE_STREAM && server->frag > MAX_FRAG) {
report_addr(server->fd, "malicious fragmentation");
stop_server(EV_A_ server);
return;
if (server->stage != STAGE_STREAM) {
ev_timer_set(&server->recv_ctx->watcher, FRAG_TIMEOUT, FRAG_TIMEOUT);
ev_timer_again(EV_A_ & server->recv_ctx->watcher);
if (server->frag > MAX_FRAG) {
report_addr(server->fd, "malicious fragmentation");
stop_server(EV_A_ server);
return;
}
server->frag++;
}
server->frag++;
return;
}