Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-24 17:33:46 +00:00
Code Releases Activity

Merge pull request #472 from crvv/master

Browse Source 
fix two error
This commit is contained in:
Max Lv
2015-12-07 18:45:01 +08:00
parent e7a1d1e333 d0cd1b427b
commit a436e398a8
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/local.c
+4 -7
View File
@@ -301,14 +301,11 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
endpoints.sae_dstaddr = (struct sockaddr*)&(remote->addr);
endpoints.sae_dstaddrlen = remote->addr_len;
struct iovec iov;
iov.iov_base = remote->buf->array;
iov.iov_len = remote->buf->len;
size_t len;
int s = connectx(remote->fd, &endpoints, SAE_ASSOCID_ANY, CONNECT_DATA_IDEMPOTENT,
&iov, 1, &len, NULL);
int s = connectx(remote->fd, &endpoints, SAE_ASSOCID_ANY,
CONNECT_RESUME_ON_READ_WRITE | CONNECT_DATA_IDEMPOTENT,
NULL, 0, NULL, NULL);
if (s == 0) {
s = len;
s = send(remote->fd, remote->buf->array, remote->buf->len, 0);
}
#else
int s = sendto(remote->fd, remote->buf->array, remote->buf->len, MSG_FASTOPEN,
src/server.c
+1 -1
View File
@@ -446,7 +446,7 @@ static remote_t *connect_to_remote(struct addrinfo *res,
} else {
ERROR("sendto");
}
} else if (s < server->buf->len) {
} else if (s <= server->buf->len) {
server->buf->idx += s;
server->buf->len -= s;
} else {