Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-24 00:54:02 +00:00
Code Releases Activity

refine buffer handler

Browse Source
This commit is contained in:
Max Lv
2014-05-11 15:22:54 +08:00
parent cc9e1244b6
commit 935c2b4875
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/local.c
+5 -2
View File
@@ -136,7 +136,7 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
struct remote *remote = server->remote;
char *buf;
if (remote == NULL || !remote->send_ctx->connected)
if (remote == NULL)
{
buf = server->buf;
}
@@ -174,6 +174,8 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
// local socks5 server
if (server->stage == 5)
{
if (remote == NULL) FATAL("remote should not be null.");
// insert shadowsocks header
if (!remote->direct)
{
@@ -182,9 +184,10 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
char *tmp = malloc(r + server->addr_len);
memcpy(tmp, server->addr_to_send, server->addr_len);
memcpy(tmp + server->addr_len, buf, r);
memcpy(tmp + server->addr_len, remote->buf, r);
r += server->addr_len;
// deallocate
free(remote->buf);
remote->buf = tmp;