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

bump version

Browse Source
This commit is contained in:
Max Lv
2013-04-05 10:46:19 +08:00
parent 5e08c8f5d5
commit 70929b7bd4
6 changed files with 398 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -11,7 +11,7 @@ It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks)
created by [@clowwindy](https://github.com/clowwindy) maintained by
[@madeye](https://github.com/madeye).
Current version: 0.9 [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev)
Current version: 1.0 [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev)
Features
--------
autogen.sh
Regular → Executable
View File
config.h.in
+5
View File
@@ -230,6 +230,11 @@
# endif
#endif
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
configure
Vendored
+386 -355
View File
File diff suppressed because it is too large Load Diff
configure.ac
+1 -1
View File
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.67])
AC_INIT([shadowsocks], [0.9], [max.c.lv@gmail.com])
AC_INIT([shadowsocks], [1.0], [max.c.lv@gmail.com])
AC_CONFIG_SRCDIR([src/encrypt.c])
AC_CONFIG_HEADERS([config.h])
src/redir.c
+5 -7
View File
@@ -111,14 +111,11 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) {
return;
}
char *buf = remote->buf;
int *buf_len = &remote->buf_len;
ssize_t r = recv(server->fd, buf, BUF_SIZE, 0);
ssize_t r = recv(server->fd, remote->buf, BUF_SIZE, 0);
if (r == 0) {
// connection closed
*buf_len = 0;
remote->buf = 0;
close_and_free_server(EV_A_ server);
if (remote != NULL) {
ev_io_start(EV_A_ &remote->send_ctx->io);
@@ -292,8 +289,6 @@ static void remote_send_cb (EV_P_ ev_io *w, int revents) {
remote_send_ctx->connected = 1;
ev_io_stop(EV_A_ &remote_send_ctx->io);
ev_timer_stop(EV_A_ &remote_send_ctx->watcher);
ev_io_start(EV_A_ &server->recv_ctx->io);
ev_io_start(EV_A_ &remote->recv_ctx->io);
// send destaddr
char addr_to_send[256];
@@ -315,6 +310,9 @@ static void remote_send_cb (EV_P_ ev_io *w, int revents) {
close_and_free_server(EV_A_ server);
}
ev_io_start(EV_A_ &server->recv_ctx->io);
ev_io_start(EV_A_ &remote->recv_ctx->io);
return;
} else {
ERROR("getpeername");