fix shadowsocks-libev
This commit is contained in:
+11
-11
@@ -34,17 +34,17 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
#include $(CLEAR_VARS)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
#LOCAL_MODULE := shadowsocks
|
||||
#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_MODULE := shadowsocks
|
||||
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_STATIC_LIBRARIES := libev libcrypto
|
||||
LOCAL_STATIC_LIBRARIES := libev libcrypto
|
||||
|
||||
#LOCAL_LDLIBS := -llog
|
||||
LOCAL_LDLIBS := -llog
|
||||
|
||||
#include $(BUILD_EXECUTABLE)
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
@@ -68,9 +68,9 @@ LOCAL_LDLIBS := -ldl
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
#subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
|
||||
#crypto \
|
||||
#))
|
||||
subdirs := $(addprefix $(LOCAL_PATH)/openssl/,$(addsuffix /Android.mk, \
|
||||
crypto \
|
||||
))
|
||||
|
||||
#include $(subdirs)
|
||||
include $(subdirs)
|
||||
|
||||
|
||||
+415
-300
@@ -19,6 +19,7 @@
|
||||
#include <linux/limits.h>
|
||||
|
||||
#include "local.h"
|
||||
#include "socks5.h"
|
||||
#include "encrypt.h"
|
||||
#include "android.h"
|
||||
|
||||
@@ -53,7 +54,6 @@ int create_and_bind(const char *port) {
|
||||
memset(&hints, 0, sizeof(struct addrinfo));
|
||||
hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */
|
||||
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);
|
||||
if (s != 0) {
|
||||
@@ -90,330 +90,445 @@ int create_and_bind(const char *port) {
|
||||
}
|
||||
|
||||
static void server_recv_cb (EV_P_ ev_io *w, int revents) {
|
||||
struct server_ctx *server_recv_ctx = (struct server_ctx *)w;
|
||||
struct server *server = server_recv_ctx->server;
|
||||
struct remote *remote = server->remote;
|
||||
struct server_ctx *server_recv_ctx = (struct server_ctx *)w;
|
||||
struct server *server = server_recv_ctx->server;
|
||||
struct remote *remote = server->remote;
|
||||
|
||||
if (remote == NULL) {
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
}
|
||||
while (1) {
|
||||
ssize_t r = recv(server->fd, remote->buf, BUF_SIZE, 0);
|
||||
if (r == 0) {
|
||||
// connection closed
|
||||
remote->buf_len = 0;
|
||||
close_and_free_server(EV_A_ server);
|
||||
if (remote != NULL) {
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
}
|
||||
return;
|
||||
} else if(r < 0) {
|
||||
perror("recv");
|
||||
if (errno == EAGAIN) {
|
||||
// no data
|
||||
// continue to wait for recv
|
||||
break;
|
||||
} else {
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
}
|
||||
encrypt(remote->buf, r);
|
||||
int w = send(remote->fd, remote->buf, r, MSG_NOSIGNAL);
|
||||
if(w == -1) {
|
||||
perror("send");
|
||||
if (errno == EAGAIN) {
|
||||
// no data, wait for send
|
||||
ev_io_stop(EV_A_ &server_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
break;
|
||||
} else {
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
} else if(w < r) {
|
||||
char *pt;
|
||||
for (pt = remote->buf; pt < pt + min(w, BUF_SIZE); pt++) {
|
||||
*pt = *(pt + w);
|
||||
}
|
||||
remote->buf_len = r - w;
|
||||
ev_io_stop(EV_A_ &server_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
break;
|
||||
}
|
||||
|
||||
char *buf = remote->buf;
|
||||
int *buf_len = &remote->buf_len;
|
||||
if (server->stage != 5) {
|
||||
buf = server->buf;
|
||||
buf_len = &server->buf_len;
|
||||
}
|
||||
|
||||
while (1) {
|
||||
ssize_t r = recv(server->fd, buf, BUF_SIZE, 0);
|
||||
|
||||
if (r == 0) {
|
||||
// connection closed
|
||||
*buf_len = 0;
|
||||
close_and_free_server(EV_A_ server);
|
||||
if (remote != NULL) {
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
}
|
||||
return;
|
||||
} else if(r < 0) {
|
||||
if (errno == EAGAIN) {
|
||||
// no data
|
||||
// continue to wait for recv
|
||||
break;
|
||||
} else {
|
||||
perror("server recv");
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// local socks5 server
|
||||
if (server->stage == 5) {
|
||||
encrypt(remote->buf, r);
|
||||
int w = send(remote->fd, remote->buf, r, 0);
|
||||
if(w == -1) {
|
||||
if (errno == EAGAIN) {
|
||||
// no data, wait for send
|
||||
ev_io_stop(EV_A_ &server_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
break;
|
||||
} else {
|
||||
perror("send");
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
} else if(w < r) {
|
||||
char *pt = remote->buf;
|
||||
char *et = pt + min(w, BUF_SIZE);
|
||||
while (pt < et) {
|
||||
*pt = *(pt + w);
|
||||
pt++;
|
||||
}
|
||||
remote->buf_len = r - w;
|
||||
ev_io_stop(EV_A_ &server_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
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) {
|
||||
struct server_ctx *server_send_ctx = (struct server_ctx *)w;
|
||||
struct server *server = server_send_ctx->server;
|
||||
struct remote *remote = server->remote;
|
||||
if (server->buf_len == 0) {
|
||||
// close and free
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
} else {
|
||||
// has data to send
|
||||
ssize_t r = send(server->fd, server->buf,
|
||||
server->buf_len, 0);
|
||||
if (r < 0) {
|
||||
perror("send");
|
||||
if (errno != EAGAIN) {
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
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
|
||||
char *pt;
|
||||
for (pt = server->buf; pt < pt + min(r, BUF_SIZE); pt++) {
|
||||
*pt = *(pt + r);
|
||||
}
|
||||
server->buf_len -= r;
|
||||
return;
|
||||
} else {
|
||||
// all sent out, wait for reading
|
||||
ev_io_stop(EV_A_ &server_send_ctx->io);
|
||||
if (remote != NULL) {
|
||||
ev_io_start(EV_A_ &remote->recv_ctx->io);
|
||||
} else {
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
static void remote_recv_cb (EV_P_ ev_io *w, int revents) {
|
||||
struct remote_ctx *remote_recv_ctx = (struct remote_ctx *)w;
|
||||
struct remote *remote = remote_recv_ctx->remote;
|
||||
struct server *server = remote->server;
|
||||
if (server == NULL) {
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
while (1) {
|
||||
ssize_t r = recv(remote->fd, server->buf, BUF_SIZE, 0);
|
||||
/*LOGD("after recv: r=%d\n", r);*/
|
||||
if (r == 0) {
|
||||
// connection closed
|
||||
server->buf_len = 0;
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
if (server != NULL) {
|
||||
ev_io_start(EV_A_ &server->send_ctx->io);
|
||||
}
|
||||
return;
|
||||
} else if(r < 0) {
|
||||
perror("recv");
|
||||
if (errno == EAGAIN) {
|
||||
// no data
|
||||
// continue to wait for recv
|
||||
break;
|
||||
} else {
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
}
|
||||
decrypt(server->buf, r);
|
||||
int w = send(server->fd, server->buf, r, MSG_NOSIGNAL);
|
||||
/*LOGD("after send: w=%d\n", w);*/
|
||||
if(w == -1) {
|
||||
perror("send");
|
||||
if (errno == EAGAIN) {
|
||||
// no data, wait for send
|
||||
ev_io_stop(EV_A_ &remote_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &server->send_ctx->io);
|
||||
break;
|
||||
} else {
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
} else if(w < r) {
|
||||
char *pt;
|
||||
for (pt = server->buf; pt < pt + min(w, BUF_SIZE); pt++) {
|
||||
*pt = *(pt + w);
|
||||
}
|
||||
server->buf_len = r - w;
|
||||
ev_io_stop(EV_A_ &remote_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &server->send_ctx->io);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
static void remote_send_cb (EV_P_ ev_io *w, int revents) {
|
||||
struct remote_ctx *remote_send_ctx = (struct remote_ctx *)w;
|
||||
struct remote *remote = remote_send_ctx->remote;
|
||||
struct server *server = remote->server;
|
||||
if (!remote_send_ctx->connected) {
|
||||
socklen_t len;
|
||||
struct sockaddr_storage addr;
|
||||
len = sizeof addr;
|
||||
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);
|
||||
ev_io_start(EV_A_ &server->recv_ctx->io);
|
||||
ev_io_start(EV_A_ &remote->recv_ctx->io);
|
||||
} else {
|
||||
perror("getpeername");
|
||||
// not connected
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (remote->buf_len == 0) {
|
||||
// close and free
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
} else {
|
||||
// has data to send
|
||||
ssize_t r = send(remote->fd, remote->buf,
|
||||
remote->buf_len, 0);
|
||||
if (r < 0) {
|
||||
struct server_ctx *server_send_ctx = (struct server_ctx *)w;
|
||||
struct server *server = server_send_ctx->server;
|
||||
struct remote *remote = server->remote;
|
||||
if (server->buf_len == 0) {
|
||||
// close and free
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
} else {
|
||||
// has data to send
|
||||
ssize_t r = send(server->fd, server->buf,
|
||||
server->buf_len, 0);
|
||||
if (r < 0) {
|
||||
if (errno != EAGAIN) {
|
||||
perror("send");
|
||||
if (errno != EAGAIN) {
|
||||
// close and free
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (r < remote->buf_len) {
|
||||
// partly sent, move memory, wait for the next time to send
|
||||
char *pt;
|
||||
for (pt = remote->buf; pt < pt + min(r, BUF_SIZE); pt++) {
|
||||
*pt = *(pt + r);
|
||||
}
|
||||
remote->buf_len -= r;
|
||||
return;
|
||||
} else {
|
||||
// all sent out, wait for reading
|
||||
ev_io_stop(EV_A_ &remote_send_ctx->io);
|
||||
if (server != NULL) {
|
||||
ev_io_start(EV_A_ &server->recv_ctx->io);
|
||||
} else {
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (r < server->buf_len) {
|
||||
// partly sent, move memory, wait for the next time to send
|
||||
char *pt = server->buf;
|
||||
char *et = pt + min(r, BUF_SIZE);
|
||||
while (pt < et) {
|
||||
*pt = *(pt + r);
|
||||
pt++;
|
||||
}
|
||||
server->buf_len -= r;
|
||||
return;
|
||||
} else {
|
||||
// all sent out, wait for reading
|
||||
ev_io_stop(EV_A_ &server_send_ctx->io);
|
||||
if (remote != NULL) {
|
||||
ev_io_start(EV_A_ &remote->recv_ctx->io);
|
||||
} else {
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static void remote_recv_cb (EV_P_ ev_io *w, int revents) {
|
||||
struct remote_ctx *remote_recv_ctx = (struct remote_ctx *)w;
|
||||
struct remote *remote = remote_recv_ctx->remote;
|
||||
struct server *server = remote->server;
|
||||
if (server == NULL) {
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
while (1) {
|
||||
ssize_t r = recv(remote->fd, server->buf, BUF_SIZE, 0);
|
||||
|
||||
if (r == 0) {
|
||||
// connection closed
|
||||
server->buf_len = 0;
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
if (server != NULL) {
|
||||
ev_io_start(EV_A_ &server->send_ctx->io);
|
||||
}
|
||||
return;
|
||||
} else if(r < 0) {
|
||||
if (errno == EAGAIN) {
|
||||
// no data
|
||||
// continue to wait for recv
|
||||
break;
|
||||
} else {
|
||||
perror("remote recv");
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
}
|
||||
decrypt(server->buf, r);
|
||||
int w = send(server->fd, server->buf, r, MSG_NOSIGNAL);
|
||||
if(w == -1) {
|
||||
if (errno == EAGAIN) {
|
||||
// no data, wait for send
|
||||
ev_io_stop(EV_A_ &remote_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &server->send_ctx->io);
|
||||
break;
|
||||
} else {
|
||||
perror("send");
|
||||
close_and_free_server(EV_A_ server);
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
return;
|
||||
}
|
||||
} else if(w < r) {
|
||||
char *pt = server->buf;
|
||||
char *et = pt + min(w, BUF_SIZE);
|
||||
while (pt < et) {
|
||||
*pt = *(pt + w);
|
||||
pt++;
|
||||
}
|
||||
server->buf_len = r - w;
|
||||
ev_io_stop(EV_A_ &remote_recv_ctx->io);
|
||||
ev_io_start(EV_A_ &server->send_ctx->io);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void remote_send_cb (EV_P_ ev_io *w, int revents) {
|
||||
struct remote_ctx *remote_send_ctx = (struct remote_ctx *)w;
|
||||
struct remote *remote = remote_send_ctx->remote;
|
||||
struct server *server = remote->server;
|
||||
|
||||
if (!remote_send_ctx->connected) {
|
||||
|
||||
socklen_t len;
|
||||
struct sockaddr_storage addr;
|
||||
len = sizeof addr;
|
||||
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);
|
||||
ev_io_start(EV_A_ &server->recv_ctx->io);
|
||||
ev_io_start(EV_A_ &remote->recv_ctx->io);
|
||||
} else {
|
||||
perror("getpeername");
|
||||
// not connected
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (remote->buf_len == 0) {
|
||||
// close and free
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
} else {
|
||||
// has data to send
|
||||
ssize_t r = send(remote->fd, remote->buf,
|
||||
remote->buf_len, 0);
|
||||
if (r < 0) {
|
||||
if (errno != EAGAIN) {
|
||||
perror("send");
|
||||
// close and free
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (r < remote->buf_len) {
|
||||
// partly sent, move memory, wait for the next time to send
|
||||
char *pt = remote->buf;
|
||||
char *et = pt + min(r, BUF_SIZE);
|
||||
while (pt < et) {
|
||||
*pt = *(pt + r);
|
||||
pt++;
|
||||
}
|
||||
remote->buf_len -= r;
|
||||
return;
|
||||
} else {
|
||||
// all sent out, wait for reading
|
||||
ev_io_stop(EV_A_ &remote_send_ctx->io);
|
||||
if (server != NULL) {
|
||||
ev_io_start(EV_A_ &server->recv_ctx->io);
|
||||
} else {
|
||||
close_and_free_remote(EV_A_ remote);
|
||||
close_and_free_server(EV_A_ server);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
struct remote* new_remote(int fd) {
|
||||
struct remote *remote;
|
||||
remote = malloc(sizeof(struct remote));
|
||||
remote->fd = fd;
|
||||
remote->recv_ctx = malloc(sizeof(struct remote_ctx));
|
||||
remote->send_ctx = malloc(sizeof(struct remote_ctx));
|
||||
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);
|
||||
remote->recv_ctx->remote = remote;
|
||||
remote->recv_ctx->connected = 0;
|
||||
remote->send_ctx->remote = remote;
|
||||
remote->send_ctx->connected = 0;
|
||||
return remote;
|
||||
struct remote *remote;
|
||||
remote = malloc(sizeof(struct remote));
|
||||
remote->fd = fd;
|
||||
remote->recv_ctx = malloc(sizeof(struct remote_ctx));
|
||||
remote->send_ctx = malloc(sizeof(struct remote_ctx));
|
||||
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);
|
||||
remote->recv_ctx->remote = remote;
|
||||
remote->recv_ctx->connected = 0;
|
||||
remote->send_ctx->remote = remote;
|
||||
remote->send_ctx->connected = 0;
|
||||
return remote;
|
||||
}
|
||||
void free_remote(struct remote *remote) {
|
||||
if (remote != NULL) {
|
||||
if (remote->server != NULL) {
|
||||
remote->server->remote = NULL;
|
||||
}
|
||||
free(remote->recv_ctx);
|
||||
free(remote->send_ctx);
|
||||
free(remote);
|
||||
}
|
||||
if (remote != NULL) {
|
||||
if (remote->server != NULL) {
|
||||
remote->server->remote = NULL;
|
||||
}
|
||||
free(remote->recv_ctx);
|
||||
free(remote->send_ctx);
|
||||
free(remote);
|
||||
}
|
||||
}
|
||||
void close_and_free_remote(EV_P_ struct remote *remote) {
|
||||
if (remote != NULL) {
|
||||
ev_io_stop(EV_A_ &remote->send_ctx->io);
|
||||
ev_io_stop(EV_A_ &remote->recv_ctx->io);
|
||||
close(remote->fd);
|
||||
free_remote(remote);
|
||||
}
|
||||
if (remote != NULL) {
|
||||
ev_io_stop(EV_A_ &remote->send_ctx->io);
|
||||
ev_io_stop(EV_A_ &remote->recv_ctx->io);
|
||||
close(remote->fd);
|
||||
free_remote(remote);
|
||||
}
|
||||
}
|
||||
struct server* new_server(int fd) {
|
||||
struct server *server;
|
||||
server = malloc(sizeof(struct server));
|
||||
server->fd = fd;
|
||||
server->recv_ctx = malloc(sizeof(struct server_ctx));
|
||||
server->send_ctx = malloc(sizeof(struct server_ctx));
|
||||
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->connected = 0;
|
||||
server->send_ctx->server = server;
|
||||
server->send_ctx->connected = 0;
|
||||
return server;
|
||||
struct server *server;
|
||||
server = malloc(sizeof(struct server));
|
||||
server->fd = fd;
|
||||
server->recv_ctx = malloc(sizeof(struct server_ctx));
|
||||
server->send_ctx = malloc(sizeof(struct server_ctx));
|
||||
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->connected = 0;
|
||||
server->send_ctx->server = server;
|
||||
server->send_ctx->connected = 0;
|
||||
server->stage = 0;
|
||||
return server;
|
||||
}
|
||||
void free_server(struct server *server) {
|
||||
if (server != NULL) {
|
||||
if (server->remote != NULL) {
|
||||
server->remote->server = NULL;
|
||||
}
|
||||
free(server->recv_ctx);
|
||||
free(server->send_ctx);
|
||||
free(server);
|
||||
}
|
||||
if (server != NULL) {
|
||||
if (server->remote != NULL) {
|
||||
server->remote->server = NULL;
|
||||
}
|
||||
free(server->recv_ctx);
|
||||
free(server->send_ctx);
|
||||
free(server);
|
||||
}
|
||||
}
|
||||
void close_and_free_server(EV_P_ struct server *server) {
|
||||
if (server != NULL) {
|
||||
ev_io_stop(EV_A_ &server->send_ctx->io);
|
||||
ev_io_stop(EV_A_ &server->recv_ctx->io);
|
||||
close(server->fd);
|
||||
free_server(server);
|
||||
}
|
||||
if (server != NULL) {
|
||||
ev_io_stop(EV_A_ &server->send_ctx->io);
|
||||
ev_io_stop(EV_A_ &server->recv_ctx->io);
|
||||
close(server->fd);
|
||||
free_server(server);
|
||||
}
|
||||
}
|
||||
|
||||
static void accept_cb (EV_P_ ev_io *w, int revents)
|
||||
{
|
||||
struct listen_ctx *listener = (struct listen_ctx *)w;
|
||||
int serverfd;
|
||||
while (1) {
|
||||
serverfd = accept(listener->fd, NULL, NULL);
|
||||
if (serverfd == -1) {
|
||||
perror("accept");
|
||||
break;
|
||||
}
|
||||
setnonblocking(serverfd);
|
||||
struct server *server = new_server(serverfd);
|
||||
struct addrinfo hints, *res;
|
||||
int sockfd;
|
||||
memset(&hints, 0, sizeof hints);
|
||||
hints.ai_family = AF_UNSPEC;
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
getaddrinfo(_server, _remote_port, &hints, &res);
|
||||
sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
|
||||
if (sockfd < 0) {
|
||||
perror("socket");
|
||||
close(sockfd);
|
||||
free_server(server);
|
||||
continue;
|
||||
}
|
||||
setnonblocking(sockfd);
|
||||
struct remote *remote = new_remote(sockfd);
|
||||
server->remote = remote;
|
||||
remote->server = server;
|
||||
connect(sockfd, res->ai_addr, res->ai_addrlen);
|
||||
freeaddrinfo(res);
|
||||
// listen to remote connected event
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
break;
|
||||
}
|
||||
struct listen_ctx *listener = (struct listen_ctx *)w;
|
||||
int serverfd;
|
||||
while (1) {
|
||||
serverfd = accept(listener->fd, NULL, NULL);
|
||||
if (serverfd == -1) {
|
||||
perror("accept");
|
||||
break;
|
||||
}
|
||||
setnonblocking(serverfd);
|
||||
struct server *server = new_server(serverfd);
|
||||
struct addrinfo hints, *res;
|
||||
int sockfd;
|
||||
memset(&hints, 0, sizeof hints);
|
||||
hints.ai_family = AF_UNSPEC;
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
getaddrinfo(_server, _remote_port, &hints, &res);
|
||||
sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
|
||||
if (sockfd < 0) {
|
||||
perror("socket");
|
||||
close(sockfd);
|
||||
free_server(server);
|
||||
continue;
|
||||
}
|
||||
setnonblocking(sockfd);
|
||||
struct remote *remote = new_remote(sockfd);
|
||||
server->remote = remote;
|
||||
remote->server = server;
|
||||
connect(sockfd, res->ai_addr, res->ai_addrlen);
|
||||
freeaddrinfo(res);
|
||||
// listen to remote connected event
|
||||
ev_io_start(EV_A_ &remote->send_ctx->io);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int main (int argc, char **argv)
|
||||
|
||||
@@ -13,6 +13,7 @@ struct listen_ctx {
|
||||
struct server {
|
||||
int fd;
|
||||
char buf[BUF_SIZE]; // server send from, remote recv into
|
||||
char stage;
|
||||
int buf_len;
|
||||
struct server_ctx *recv_ctx;
|
||||
struct server_ctx *send_ctx;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user