Commit c7dd2f9a authored by Max Lv's avatar Max Lv

fix shadowsocks-libev

parent d01295b3
...@@ -34,17 +34,17 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd ...@@ -34,17 +34,17 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
#include $(CLEAR_VARS) include $(CLEAR_VARS)
#LOCAL_MODULE := shadowsocks LOCAL_MODULE := shadowsocks
#LOCAL_SRC_FILES := shadowsocks/local.c shadowsocks/encrypt.c LOCAL_SRC_FILES := shadowsocks/local.c shadowsocks/encrypt.c
#LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/libev/ -I$(LOCAL_PATH)/openssl/include -std=c99 LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/libev/ -I$(LOCAL_PATH)/openssl/include -std=c99
#LOCAL_STATIC_LIBRARIES := libev libcrypto LOCAL_STATIC_LIBRARIES := libev libcrypto
#LOCAL_LDLIBS := -llog LOCAL_LDLIBS := -llog
#include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
...@@ -68,9 +68,9 @@ LOCAL_LDLIBS := -ldl ...@@ -68,9 +68,9 @@ LOCAL_LDLIBS := -ldl
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
#subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \ subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
#crypto \ crypto \
#)) ))
#include $(subdirs) include $(subdirs)
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/limits.h> #include <linux/limits.h>
#include "local.h" #include "local.h"
#include "socks5.h"
#include "encrypt.h" #include "encrypt.h"
#include "android.h" #include "android.h"
...@@ -53,7 +54,6 @@ int create_and_bind(const char *port) { ...@@ -53,7 +54,6 @@ int create_and_bind(const char *port) {
memset(&hints, 0, sizeof(struct addrinfo)); 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 */ hints.ai_socktype = SOCK_STREAM; /* We want a TCP socket */
hints.ai_flags = AI_PASSIVE; /* All interfaces */
s = getaddrinfo("0.0.0.0", port, &hints, &result); s = getaddrinfo("0.0.0.0", port, &hints, &result);
if (s != 0) { if (s != 0) {
...@@ -93,58 +93,166 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) { ...@@ -93,58 +93,166 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) {
struct server_ctx *server_recv_ctx = (struct server_ctx *)w; struct server_ctx *server_recv_ctx = (struct server_ctx *)w;
struct server *server = server_recv_ctx->server; struct server *server = server_recv_ctx->server;
struct remote *remote = server->remote; struct remote *remote = server->remote;
if (remote == NULL) { if (remote == NULL) {
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
return; return;
} }
char *buf = remote->buf;
int *buf_len = &remote->buf_len;
if (server->stage != 5) {
buf = server->buf;
buf_len = &server->buf_len;
}
while (1) { while (1) {
ssize_t r = recv(server->fd, remote->buf, BUF_SIZE, 0); ssize_t r = recv(server->fd, buf, BUF_SIZE, 0);
if (r == 0) { if (r == 0) {
// connection closed // connection closed
remote->buf_len = 0; *buf_len = 0;
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
if (remote != NULL) { if (remote != NULL) {
ev_io_start(EV_A_ &remote->send_ctx->io); ev_io_start(EV_A_ &remote->send_ctx->io);
} }
return; return;
} else if(r < 0) { } else if(r < 0) {
perror("recv");
if (errno == EAGAIN) { if (errno == EAGAIN) {
// no data // no data
// continue to wait for recv // continue to wait for recv
break; break;
} else { } else {
perror("server recv");
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
close_and_free_remote(EV_A_ remote); close_and_free_remote(EV_A_ remote);
return; return;
} }
} }
// local socks5 server
if (server->stage == 5) {
encrypt(remote->buf, r); encrypt(remote->buf, r);
int w = send(remote->fd, remote->buf, r, MSG_NOSIGNAL); int w = send(remote->fd, remote->buf, r, 0);
if(w == -1) { if(w == -1) {
perror("send");
if (errno == EAGAIN) { if (errno == EAGAIN) {
// no data, wait for send // no data, wait for send
ev_io_stop(EV_A_ &server_recv_ctx->io); ev_io_stop(EV_A_ &server_recv_ctx->io);
ev_io_start(EV_A_ &remote->send_ctx->io); ev_io_start(EV_A_ &remote->send_ctx->io);
break; break;
} else { } else {
perror("send");
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
close_and_free_remote(EV_A_ remote); close_and_free_remote(EV_A_ remote);
return; return;
} }
} else if(w < r) { } else if(w < r) {
char *pt; char *pt = remote->buf;
for (pt = remote->buf; pt < pt + min(w, BUF_SIZE); pt++) { char *et = pt + min(w, BUF_SIZE);
while (pt < et) {
*pt = *(pt + w); *pt = *(pt + w);
pt++;
} }
remote->buf_len = r - w; remote->buf_len = r - w;
ev_io_stop(EV_A_ &server_recv_ctx->io); ev_io_stop(EV_A_ &server_recv_ctx->io);
ev_io_start(EV_A_ &remote->send_ctx->io); ev_io_start(EV_A_ &remote->send_ctx->io);
break; break;
}
} else if (server->stage == 0) {
struct method_select_response response;
response.ver = VERSION;
response.method = 0;
char *send_buf = (char *)&response;
send(server->fd, send_buf, sizeof(response), MSG_NOSIGNAL);
server->stage = 1;
return;
} else if (server->stage == 1) {
struct socks5_request *request = (struct socks5_request *)server->buf;
if (request->cmd != 1) {
LOGE("unsupported cmd: %d\n", request->cmd);
struct socks5_response response;
response.ver = VERSION;
response.rep = CMD_NOT_SUPPORTED;
response.rsv = 0;
response.atyp = 1;
char *send_buf = (char *)&response;
send(server->fd, send_buf, 4, MSG_NOSIGNAL);
close_and_free_server(EV_A_ server);
close_and_free_remote(EV_A_ remote);
return;
}
char addr_to_send[256];
unsigned char addr_len = 0;
addr_to_send[addr_len++] = request->atyp;
// get remote addr and port
if (request->atyp == 1) {
// IP V4
struct in_addr *in_addr;
in_addr = (struct in_addr *)(server->buf + 4);
char* addr_buf = inet_ntoa(*in_addr);
unsigned char name_len = strlen(addr_buf);
memcpy(addr_to_send + addr_len, addr_buf, name_len);
addr_len += name_len;
// get port
addr_to_send[addr_len++] = *(unsigned char *)(server->buf + 4 + 4);
addr_to_send[addr_len++] = *(unsigned char *)(server->buf + 4 + 4 + 1);
addr_to_send[addr_len] = 0;
} else if (request->atyp == 3) {
// Domain name
unsigned char name_len = *(unsigned char *)(server->buf + 4);
addr_to_send[addr_len++] = name_len;
memcpy(addr_to_send + addr_len, server->buf + 4 + 1, name_len);
addr_len += name_len;
// get port
addr_to_send[addr_len++] = *(unsigned char *)(server->buf + 4 + 1 + name_len);
addr_to_send[addr_len++] = *(unsigned char *)(server->buf + 4 + 1 + name_len + 1);
addr_to_send[addr_len] = 0;
} else {
LOGE("unsupported addrtype: %d\n", request->atyp);
close_and_free_server(EV_A_ server);
close_and_free_remote(EV_A_ remote);
return;
}
send_encrypt(remote->fd, addr_to_send, addr_len, 0);
// Fake reply
struct socks5_response response;
response.ver = VERSION;
response.rep = 0;
response.rsv = 0;
response.atyp = 1;
struct in_addr sin_addr;
inet_aton("0.0.0.0", &sin_addr);
memcpy(server->buf, &response, 4);
memcpy(server->buf + 4, &sin_addr, sizeof(struct in_addr));
*((unsigned short *)(server->buf + 4 + sizeof(struct in_addr)))
= (unsigned short) htons(atoi(_remote_port));
int reply_size = 4 + sizeof(struct in_addr) + sizeof(unsigned short);
int r = send(server->fd, server->buf, reply_size, MSG_NOSIGNAL);
if (r < reply_size) {
LOGE("header not complete sent\n");
close_and_free_remote(EV_A_ remote);
close_and_free_server(EV_A_ server);
return;
}
server->stage = 5;
} }
} }
} }
static void server_send_cb (EV_P_ ev_io *w, int revents) { static void server_send_cb (EV_P_ ev_io *w, int revents) {
struct server_ctx *server_send_ctx = (struct server_ctx *)w; struct server_ctx *server_send_ctx = (struct server_ctx *)w;
struct server *server = server_send_ctx->server; struct server *server = server_send_ctx->server;
...@@ -159,8 +267,8 @@ static void server_send_cb (EV_P_ ev_io *w, int revents) { ...@@ -159,8 +267,8 @@ static void server_send_cb (EV_P_ ev_io *w, int revents) {
ssize_t r = send(server->fd, server->buf, ssize_t r = send(server->fd, server->buf,
server->buf_len, 0); server->buf_len, 0);
if (r < 0) { if (r < 0) {
perror("send");
if (errno != EAGAIN) { if (errno != EAGAIN) {
perror("send");
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
close_and_free_remote(EV_A_ remote); close_and_free_remote(EV_A_ remote);
return; return;
...@@ -168,12 +276,12 @@ static void server_send_cb (EV_P_ ev_io *w, int revents) { ...@@ -168,12 +276,12 @@ static void server_send_cb (EV_P_ ev_io *w, int revents) {
return; return;
} }
if (r < server->buf_len) { if (r < server->buf_len) {
LOGD("r=%d\n", r);
LOGD("server->buf_len=%d\n", server->buf_len);
// partly sent, move memory, wait for the next time to send // partly sent, move memory, wait for the next time to send
char *pt; char *pt = server->buf;
for (pt = server->buf; pt < pt + min(r, BUF_SIZE); pt++) { char *et = pt + min(r, BUF_SIZE);
while (pt < et) {
*pt = *(pt + r); *pt = *(pt + r);
pt++;
} }
server->buf_len -= r; server->buf_len -= r;
return; return;
...@@ -191,6 +299,7 @@ static void server_send_cb (EV_P_ ev_io *w, int revents) { ...@@ -191,6 +299,7 @@ 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_recv_cb (EV_P_ ev_io *w, int revents) {
struct remote_ctx *remote_recv_ctx = (struct remote_ctx *)w; struct remote_ctx *remote_recv_ctx = (struct remote_ctx *)w;
struct remote *remote = remote_recv_ctx->remote; struct remote *remote = remote_recv_ctx->remote;
...@@ -201,7 +310,7 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) { ...@@ -201,7 +310,7 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) {
} }
while (1) { while (1) {
ssize_t r = recv(remote->fd, server->buf, BUF_SIZE, 0); ssize_t r = recv(remote->fd, server->buf, BUF_SIZE, 0);
/*LOGD("after recv: r=%d\n", r);*/
if (r == 0) { if (r == 0) {
// connection closed // connection closed
server->buf_len = 0; server->buf_len = 0;
...@@ -211,12 +320,12 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) { ...@@ -211,12 +320,12 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) {
} }
return; return;
} else if(r < 0) { } else if(r < 0) {
perror("recv");
if (errno == EAGAIN) { if (errno == EAGAIN) {
// no data // no data
// continue to wait for recv // continue to wait for recv
break; break;
} else { } else {
perror("remote recv");
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
close_and_free_remote(EV_A_ remote); close_and_free_remote(EV_A_ remote);
return; return;
...@@ -224,23 +333,24 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) { ...@@ -224,23 +333,24 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) {
} }
decrypt(server->buf, r); decrypt(server->buf, r);
int w = send(server->fd, server->buf, r, MSG_NOSIGNAL); int w = send(server->fd, server->buf, r, MSG_NOSIGNAL);
/*LOGD("after send: w=%d\n", w);*/
if(w == -1) { if(w == -1) {
perror("send");
if (errno == EAGAIN) { if (errno == EAGAIN) {
// no data, wait for send // no data, wait for send
ev_io_stop(EV_A_ &remote_recv_ctx->io); ev_io_stop(EV_A_ &remote_recv_ctx->io);
ev_io_start(EV_A_ &server->send_ctx->io); ev_io_start(EV_A_ &server->send_ctx->io);
break; break;
} else { } else {
perror("send");
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
close_and_free_remote(EV_A_ remote); close_and_free_remote(EV_A_ remote);
return; return;
} }
} else if(w < r) { } else if(w < r) {
char *pt; char *pt = server->buf;
for (pt = server->buf; pt < pt + min(w, BUF_SIZE); pt++) { char *et = pt + min(w, BUF_SIZE);
while (pt < et) {
*pt = *(pt + w); *pt = *(pt + w);
pt++;
} }
server->buf_len = r - w; server->buf_len = r - w;
ev_io_stop(EV_A_ &remote_recv_ctx->io); ev_io_stop(EV_A_ &remote_recv_ctx->io);
...@@ -249,11 +359,14 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) { ...@@ -249,11 +359,14 @@ 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 void remote_send_cb (EV_P_ ev_io *w, int revents) {
struct remote_ctx *remote_send_ctx = (struct remote_ctx *)w; struct remote_ctx *remote_send_ctx = (struct remote_ctx *)w;
struct remote *remote = remote_send_ctx->remote; struct remote *remote = remote_send_ctx->remote;
struct server *server = remote->server; struct server *server = remote->server;
if (!remote_send_ctx->connected) { if (!remote_send_ctx->connected) {
socklen_t len; socklen_t len;
struct sockaddr_storage addr; struct sockaddr_storage addr;
len = sizeof addr; len = sizeof addr;
...@@ -281,8 +394,8 @@ static void remote_send_cb (EV_P_ ev_io *w, int revents) { ...@@ -281,8 +394,8 @@ static void remote_send_cb (EV_P_ ev_io *w, int revents) {
ssize_t r = send(remote->fd, remote->buf, ssize_t r = send(remote->fd, remote->buf,
remote->buf_len, 0); remote->buf_len, 0);
if (r < 0) { if (r < 0) {
perror("send");
if (errno != EAGAIN) { if (errno != EAGAIN) {
perror("send");
// close and free // close and free
close_and_free_remote(EV_A_ remote); close_and_free_remote(EV_A_ remote);
close_and_free_server(EV_A_ server); close_and_free_server(EV_A_ server);
...@@ -292,9 +405,11 @@ static void remote_send_cb (EV_P_ ev_io *w, int revents) { ...@@ -292,9 +405,11 @@ static void remote_send_cb (EV_P_ ev_io *w, int revents) {
} }
if (r < remote->buf_len) { if (r < remote->buf_len) {
// partly sent, move memory, wait for the next time to send // partly sent, move memory, wait for the next time to send
char *pt; char *pt = remote->buf;
for (pt = remote->buf; pt < pt + min(r, BUF_SIZE); pt++) { char *et = pt + min(r, BUF_SIZE);
while (pt < et) {
*pt = *(pt + r); *pt = *(pt + r);
pt++;
} }
remote->buf_len -= r; remote->buf_len -= r;
return; return;
...@@ -358,6 +473,7 @@ struct server* new_server(int fd) { ...@@ -358,6 +473,7 @@ struct server* new_server(int fd) {
server->recv_ctx->connected = 0; server->recv_ctx->connected = 0;
server->send_ctx->server = server; server->send_ctx->server = server;
server->send_ctx->connected = 0; server->send_ctx->connected = 0;
server->stage = 0;
return server; return server;
} }
void free_server(struct server *server) { void free_server(struct server *server) {
...@@ -378,7 +494,6 @@ void close_and_free_server(EV_P_ struct server *server) { ...@@ -378,7 +494,6 @@ void close_and_free_server(EV_P_ struct server *server) {
free_server(server); free_server(server);
} }
} }
static void accept_cb (EV_P_ ev_io *w, int revents) static void accept_cb (EV_P_ ev_io *w, int revents)
{ {
struct listen_ctx *listener = (struct listen_ctx *)w; struct listen_ctx *listener = (struct listen_ctx *)w;
......
...@@ -13,6 +13,7 @@ struct listen_ctx { ...@@ -13,6 +13,7 @@ struct listen_ctx {
struct server { struct server {
int fd; int fd;
char buf[BUF_SIZE]; // server send from, remote recv into char buf[BUF_SIZE]; // server send from, remote recv into
char stage;
int buf_len; int buf_len;
struct server_ctx *recv_ctx; struct server_ctx *recv_ctx;
struct server_ctx *send_ctx; struct server_ctx *send_ctx;
......
No preview for this file type
No preview for this file type
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment