Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-28 11:43:50 +00:00
Code Releases Activity

Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev

Browse Source 
Conflicts:
	src/udprelay.c
This commit is contained in:
Max Lv
2015-01-27 20:48:56 +08:00
parent b672c4ce7f f3f6ece4fc
commit 02050e49e7
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server.c
+2 -7
View File
@@ -197,7 +197,6 @@ int create_and_bind(const char *host, const char *port)
rp = ipv4v6bindall; /* Take first IPV6 address available */
break;
}
ipv4v6bindall = ipv4v6bindall->ai_next; /* Get next address info, if any */
}
}
@@ -208,16 +207,12 @@ int create_and_bind(const char *host, const char *port)
continue;
}
int opt = 1;
if (rp->ai_family == AF_INET6) {
int ipv6only = 0;
if (host) {
ipv6only = 1;
}
int ipv6only = host ? 1 : 0;
setsockopt(listen_sock, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6only, sizeof(ipv6only));
}
int opt = 1;
setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE
setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
src/udprelay.c
+2 -7
View File
@@ -345,7 +345,6 @@ int create_server_socket(const char *host, const char *port)
rp = ipv4v6bindall; /* Take first IPV6 address available */
break;
}
ipv4v6bindall = ipv4v6bindall->ai_next; /* Get next address info, if any */
}
}
@@ -356,16 +355,12 @@ int create_server_socket(const char *host, const char *port)
continue;
}
int opt = 1;
if (rp->ai_family == AF_INET6) {
int ipv6only = 0;
if (host) {
ipv6only = 1;
}
int ipv6only = host ? 1 : 0;
setsockopt(server_sock, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6only, sizeof(ipv6only));
}
int opt = 1;
setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE
set_nosigpipe(server_sock);