Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-31 06:23:52 +00:00
Code Releases Activity

ignore all SIGPIPE

Browse Source
This commit is contained in:
Max Lv
2013-01-12 22:01:08 +08:00
parent 8eda09c8cc
commit 5d0c839324
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local.c
+6 -8
View File
@@ -25,10 +25,6 @@
#include "config.h"
#endif
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL SO_NOSIGPIPE
#endif
#ifndef EAGAIN
#define EAGAIN EWOULDBLOCK
#endif
@@ -170,7 +166,7 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) {
response.ver = SVERSION;
response.method = 0;
char *send_buf = (char *)&response;
send(server->fd, send_buf, sizeof(response), MSG_NOSIGNAL);
send(server->fd, send_buf, sizeof(response), 0);
server->stage = 1;
return;
} else if (server->stage == 1) {
@@ -184,7 +180,7 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) {
response.rsv = 0;
response.atyp = 1;
char *send_buf = (char *)&response;
send(server->fd, send_buf, 4, MSG_NOSIGNAL);
send(server->fd, send_buf, 4, 0);
close_and_free_remote(EV_A_ remote);
close_and_free_server(EV_A_ server);
return;
@@ -238,7 +234,7 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) {
= (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);
int r = send(server->fd, server->buf, reply_size, 0);
if (r < reply_size) {
LOGE("header not complete sent\n");
close_and_free_remote(EV_A_ remote);
@@ -346,7 +342,7 @@ static void remote_recv_cb (EV_P_ ev_io *w, int revents) {
}
}
decrypt_ctx(server->buf, r, server->d_ctx);
int w = send(server->fd, server->buf, r, MSG_NOSIGNAL);
int w = send(server->fd, server->buf, r, 0);
if(w == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
// no data, wait for send
@@ -693,6 +689,8 @@ int main (int argc, char **argv)
close(STDERR_FILENO);
}
signal(SIGPIPE, SIG_IGN);
// init global variables
_server = strdup(server);
_remote_port = strdup(remote_port);