Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-26 18:53:41 +00:00
Code Releases Activity

acl works now

Browse Source
This commit is contained in:
Max Lv
2014-05-08 10:56:00 +08:00
parent 96916815f9
commit 7205456a62
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/local.c
+12 -4
View File
@@ -188,13 +188,14 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
if (!remote->direct)
{
char *tmp = malloc(r + server->addr_len);
memcpy(tmp, server->addr_to_send, server->addr_len);
memcpy(tmp + server->addr_len, buf, r);
r += server->addr_len;
remote->buf = tmp;
remote->buf_idx = 0;
remote->buf_len = r;
free(remote->buf);
remote->buf = tmp;
remote->buf = ss_encrypt(BUF_SIZE, remote->buf, &r, server->e_ctx);
if (remote->buf == NULL)
@@ -205,6 +206,13 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
return;
}
}
else
{
memcpy(remote->buf, buf, r);
}
remote->buf_idx = 0;
remote->buf_len = r;
if (!remote->send_ctx->connected)
{
@@ -844,7 +852,7 @@ static struct remote* connect_to_remote(struct listen_ctx *listener,
int index = rand() % listener->remote_num;
if (verbose)
{
LOGD("connect to %s:%s", listener->remote_addr[index].host,
LOGD("connect to server: %s:%s", listener->remote_addr[index].host,
listener->remote_addr[index].port);
}
int err;