Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-21 06:23:52 +00:00
Code Releases Activity

handle buffer correctly

Browse Source
This commit is contained in:
Max Lv
2013-04-04 09:41:00 +08:00
parent 161d48b850
commit bbd7ccc740
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+1 -1
View File
@@ -9,6 +9,6 @@ ss_local_LDADD = $(top_builddir)/libev/libev.la
ss_local_LDADD += $(top_builddir)/libasyncns/libasyncns.la
ss_server_LDADD = $(top_builddir)/libev/libev.la
ss_server_LDADD += $(top_builddir)/libasyncns/libasyncns.la
AM_CFLAGS = -O2 -Wall -fno-strict-aliasing
AM_CFLAGS = -g -O2 -Wall -fno-strict-aliasing
AM_CFLAGS += -I$(top_builddir)/libev
AM_CFLAGS += -I$(top_builddir)/libasyncns
src/server.c
+9 -2
View File
@@ -250,8 +250,8 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) {
// XXX: should handel buffer carefully
if (r > offset) {
remote->buf_len = r - offset;
memcpy(remote->buf, server->buf + offset, remote->buf_len);
server->buf_len = r - offset;
memcpy(server->buf, server->buf + offset, server->buf_len);
}
server->stage = 4;
@@ -370,6 +370,13 @@ static void server_resolve_cb(EV_P_ ev_timer *watcher, int revents) {
server->remote = remote;
remote->server = server;
// XXX: should handel buffer carefully
if (server->buf_len > 0) {
memcpy(remote->buf, server->buf, server->buf_len);
remote->buf_len = server->buf_len;
server->buf_len = 0;
}
// listen to remote connected event
ev_io_start(EV_A_ &remote->send_ctx->io);
ev_timer_start(EV_A_ &remote->send_ctx->watcher);