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

Refine buffer handling

Browse Source
This commit is contained in:
Max Lv
2015-11-30 15:03:04 +08:00
committed by Max Lv
parent f4fa30da5c
commit b0600a8784
29 changed files with 2616 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/redir.c
+56 -61
View File
@@ -72,8 +72,8 @@ static void server_send_cb(EV_P_ ev_io *w, int revents);
static void remote_recv_cb(EV_P_ ev_io *w, int revents);
static void remote_send_cb(EV_P_ ev_io *w, int revents);
static remote_t * new_remote(int fd, int timeout);
static server_t * new_server(int fd, int method);
static remote_t *new_remote(int fd, int timeout);
static server_t *new_server(int fd, int method);
static void free_remote(remote_t *remote);
static void close_and_free_remote(EV_P_ remote_t *remote);
@@ -88,7 +88,7 @@ static int auth = 0;
int getdestaddr(int fd, struct sockaddr_storage *destaddr)
{
socklen_t socklen = sizeof(*destaddr);
int error = 0;
int error = 0;
error = getsockopt(fd, SOL_IPV6, IP6T_SO_ORIGINAL_DST, destaddr, &socklen);
if (error) { // Didn't find a proper way to detect IP version.
@@ -116,7 +116,7 @@ int create_and_bind(const char *addr, const char *port)
int s, listen_sock;
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */
hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */
hints.ai_socktype = SOCK_STREAM; /* We want a TCP socket */
s = getaddrinfo(addr, port, &hints, &result);
@@ -161,8 +161,8 @@ int create_and_bind(const char *addr, const char *port)
static void server_recv_cb(EV_P_ ev_io *w, int revents)
{
server_ctx_t *server_recv_ctx = (server_ctx_t *)w;
server_t *server = server_recv_ctx->server;
remote_t *remote = server->remote;
server_t *server = server_recv_ctx->server;
remote_t *remote = server->remote;
ssize_t r = recv(server->fd, remote->buf->array, BUF_SIZE, 0);
@@ -216,19 +216,18 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
}
} else if (s < remote->buf->len) {
remote->buf->len -= s;
remote->buf->idx = s;
remote->buf->idx = s;
ev_io_stop(EV_A_ & server_recv_ctx->io);
ev_io_start(EV_A_ & remote->send_ctx->io);
return;
}
}
static void server_send_cb(EV_P_ ev_io *w, int revents)
{
server_ctx_t *server_send_ctx = (server_ctx_t *)w;
server_t *server = server_send_ctx->server;
remote_t *remote = server->remote;
server_t *server = server_send_ctx->server;
remote_t *remote = server->remote;
if (server->buf->len == 0) {
// close and free
close_and_free_remote(EV_A_ remote);
@@ -258,13 +257,12 @@ static void server_send_cb(EV_P_ ev_io *w, int revents)
ev_io_start(EV_A_ & remote->recv_ctx->io);
}
}
}
static void remote_timeout_cb(EV_P_ ev_timer *watcher, int revents)
{
remote_ctx_t *remote_ctx = (remote_ctx_t *)(((void *)watcher)
- sizeof(ev_io));
- sizeof(ev_io));
remote_t *remote = remote_ctx->remote;
server_t *server = remote->server;
@@ -277,8 +275,8 @@ static void remote_timeout_cb(EV_P_ ev_timer *watcher, int revents)
static void remote_recv_cb(EV_P_ ev_io *w, int revents)
{
remote_ctx_t *remote_recv_ctx = (remote_ctx_t *)w;
remote_t *remote = remote_recv_ctx->remote;
server_t *server = remote->server;
remote_t *remote = remote_recv_ctx->remote;
server_t *server = remote->server;
ssize_t r = recv(remote->fd, server->buf->array, BUF_SIZE, 0);
@@ -326,7 +324,7 @@ static void remote_recv_cb(EV_P_ ev_io *w, int revents)
}
} else if (s < server->buf->len) {
server->buf->len -= s;
server->buf->idx = s;
server->buf->idx = s;
ev_io_stop(EV_A_ & remote_recv_ctx->io);
ev_io_start(EV_A_ & server->send_ctx->io);
return;
@@ -336,14 +334,13 @@ static void remote_recv_cb(EV_P_ ev_io *w, int revents)
static void remote_send_cb(EV_P_ ev_io *w, int revents)
{
remote_ctx_t *remote_send_ctx = (remote_ctx_t *)w;
remote_t *remote = remote_send_ctx->remote;
server_t *server = remote->server;
remote_t *remote = remote_send_ctx->remote;
server_t *server = remote->server;
if (!remote_send_ctx->connected) {
struct sockaddr_storage addr;
socklen_t len = sizeof addr;
int r = getpeername(remote->fd, (struct sockaddr *)&addr, &len);
int r = getpeername(remote->fd, (struct sockaddr *)&addr, &len);
if (r == 0) {
remote_send_ctx->connected = 1;
ev_io_stop(EV_A_ & remote_send_ctx->io);
@@ -355,7 +352,7 @@ static void remote_send_cb(EV_P_ ev_io *w, int revents)
balloc(abuf, BUF_SIZE);
if (AF_INET6 == server->destaddr.ss_family) { // IPv6
abuf->array[abuf->len++] = 4; //Type 4 is IPv6 address
abuf->array[abuf->len++] = 4; // Type 4 is IPv6 address
size_t in6_addr_len = sizeof(struct in6_addr);
memcpy(abuf->array + abuf->len,
@@ -365,8 +362,8 @@ static void remote_send_cb(EV_P_ ev_io *w, int revents)
memcpy(abuf->array + abuf->len,
&(((struct sockaddr_in6 *)&(server->destaddr))->sin6_port),
2);
} else { //IPv4
abuf->array[abuf->len++] = 1; //Type 1 is IPv4 address
} else { // IPv4
abuf->array[abuf->len++] = 1; // Type 1 is IPv4 address
size_t in_addr_len = sizeof(struct in_addr);
memcpy(abuf->array + abuf->len,
@@ -444,30 +441,30 @@ static void remote_send_cb(EV_P_ ev_io *w, int revents)
ev_io_start(EV_A_ & server->recv_ctx->io);
}
}
}
}
static remote_t * new_remote(int fd, int timeout)
static remote_t *new_remote(int fd, int timeout)
{
remote_t *remote;
remote = malloc(sizeof(remote_t));
memset(remote, 0, sizeof(remote_t));
remote->recv_ctx = malloc(sizeof(remote_ctx_t));
remote->send_ctx = malloc(sizeof(remote_ctx_t));
remote->fd = fd;
remote->recv_ctx = malloc(sizeof(remote_ctx_t));
remote->send_ctx = malloc(sizeof(remote_ctx_t));
remote->buf = malloc(sizeof(buffer_t));
remote->fd = fd;
remote->recv_ctx->remote = remote;
remote->recv_ctx->connected = 0;
remote->send_ctx->remote = remote;
remote->send_ctx->connected = 0;
ev_io_init(&remote->recv_ctx->io, remote_recv_cb, fd, EV_READ);
ev_io_init(&remote->send_ctx->io, remote_send_cb, fd, EV_WRITE);
ev_timer_init(&remote->send_ctx->watcher, remote_timeout_cb,
min(MAX_CONNECT_TIMEOUT, timeout), 0);
remote->recv_ctx->remote = remote;
remote->recv_ctx->connected = 0;
remote->send_ctx->remote = remote;
remote->send_ctx->connected = 0;
remote->buf = malloc(sizeof(buffer_t));
balloc(remote->buf, BUF_SIZE);
return remote;
@@ -500,20 +497,20 @@ static void close_and_free_remote(EV_P_ remote_t *remote)
}
}
static server_t * new_server(int fd, int method)
static server_t *new_server(int fd, int method)
{
server_t *server;
server = malloc(sizeof(server_t));
server->recv_ctx = malloc(sizeof(server_ctx_t));
server->send_ctx = malloc(sizeof(server_ctx_t));
server->fd = fd;
ev_io_init(&server->recv_ctx->io, server_recv_cb, fd, EV_READ);
ev_io_init(&server->send_ctx->io, server_send_cb, fd, EV_WRITE);
server->recv_ctx->server = server;
server->recv_ctx = malloc(sizeof(server_ctx_t));
server->send_ctx = malloc(sizeof(server_ctx_t));
server->buf = malloc(sizeof(buffer_t));
server->fd = fd;
server->recv_ctx->server = server;
server->recv_ctx->connected = 0;
server->send_ctx->server = server;
server->send_ctx->server = server;
server->send_ctx->connected = 0;
if (method) {
server->e_ctx = malloc(sizeof(enc_ctx_t));
server->d_ctx = malloc(sizeof(enc_ctx_t));
@@ -524,7 +521,9 @@ static server_t * new_server(int fd, int method)
server->d_ctx = NULL;
}
server->buf = malloc(sizeof(buffer_t));
ev_io_init(&server->recv_ctx->io, server_recv_cb, fd, EV_READ);
ev_io_init(&server->send_ctx->io, server_send_cb, fd, EV_WRITE);
balloc(server->buf, BUF_SIZE);
return server;
@@ -589,7 +588,7 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif
int index = rand() % listener->remote_num;
int index = rand() % listener->remote_num;
struct sockaddr *remote_addr = listener->remote_addr[index];
int remotefd = socket(remote_addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
@@ -608,8 +607,8 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
server_t *server = new_server(serverfd, listener->method);
remote_t *remote = new_remote(remotefd, listener->timeout);
server->remote = remote;
remote->server = server;
server->remote = remote;
remote->server = server;
server->destaddr = destaddr;
connect(remotefd, remote_addr, get_sockaddr_len(remote_addr));
@@ -620,17 +619,16 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
int main(int argc, char **argv)
{
int i, c;
int pid_flags = 0;
char *user = NULL;
int pid_flags = 0;
char *user = NULL;
char *local_port = NULL;
char *local_addr = NULL;
char *password = NULL;
char *timeout = NULL;
char *method = NULL;
char *pid_path = NULL;
char *conf_path = NULL;
char *password = NULL;
char *timeout = NULL;
char *method = NULL;
char *pid_path = NULL;
char *conf_path = NULL;
int remote_num = 0;
ss_addr_t remote_addr[MAX_REMOTE_NUM];
@@ -638,11 +636,11 @@ int main(int argc, char **argv)
opterr = 0;
while ((c = getopt(argc, argv, "f:s:p:l:k:t:m:c:b:a:uUvA")) != -1) {
while ((c = getopt(argc, argv, "f:s:p:l:k:t:m:c:b:a:uUvA")) != -1)
switch (c) {
case 's':
if (remote_num < MAX_REMOTE_NUM) {
remote_addr[remote_num].host = optarg;
remote_addr[remote_num].host = optarg;
remote_addr[remote_num++].port = NULL;
}
break;
@@ -657,7 +655,7 @@ int main(int argc, char **argv)
break;
case 'f':
pid_flags = 1;
pid_path = optarg;
pid_path = optarg;
break;
case 't':
timeout = optarg;
@@ -687,7 +685,6 @@ int main(int argc, char **argv)
auth = 1;
break;
}
}
if (opterr) {
usage();
@@ -704,9 +701,8 @@ int main(int argc, char **argv)
jconf_t *conf = read_jconf(conf_path);
if (remote_num == 0) {
remote_num = conf->remote_num;
for (i = 0; i < remote_num; i++) {
for (i = 0; i < remote_num; i++)
remote_addr[i] = conf->remote_addr[i];
}
}
if (remote_port == NULL) {
remote_port = conf->remote_port;
@@ -764,7 +760,7 @@ int main(int argc, char **argv)
// Setup proxy context
listen_ctx_t listen_ctx;
listen_ctx.remote_num = remote_num;
listen_ctx.remote_num = remote_num;
listen_ctx.remote_addr = malloc(sizeof(struct sockaddr *) * remote_num);
for (int i = 0; i < remote_num; i++) {
char *host = remote_addr[i].host;
@@ -778,7 +774,7 @@ int main(int argc, char **argv)
listen_ctx.remote_addr[i] = (struct sockaddr *)storage;
}
listen_ctx.timeout = atoi(timeout);
listen_ctx.method = m;
listen_ctx.method = m;
struct ev_loop *loop = EV_DEFAULT;
@@ -822,4 +818,3 @@ int main(int argc, char **argv)
return 0;
}