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

Revert "Fix server buffer #1245"

Browse Source 
This reverts commit 9716eede20.
This commit is contained in:
Max Lv
2017-02-13 19:03:28 +08:00
parent 9716eede20
commit 2a9b9c7358
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server.c
+2 -4
View File
@@ -549,17 +549,15 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
remote_t *remote = NULL;
buffer_t *buf = server->buf;
size_t len = server->buf->len;
if (server->stage == STAGE_STREAM) {
remote = server->remote;
buf = remote->buf;
len = 0;
ev_timer_again(EV_A_ & server->recv_ctx->watcher);
}
ssize_t r = recv(server->fd, buf->data + len, BUF_SIZE - len, 0);
ssize_t r = recv(server->fd, buf->data, BUF_SIZE, 0);
if (r == 0) {
// connection closed
@@ -583,7 +581,7 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
}
tx += r;
buf->len += r;
buf->len = r;
int err = crypto->decrypt(buf, server->d_ctx, BUF_SIZE);