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

Refine ipv6only handling

Browse Source
This commit is contained in:
Max Lv
2019-03-10 07:40:07 +08:00
parent 1a77023777
commit 3fa9e57248
6 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/local.c
+6 -2
View File
@@ -1708,7 +1708,7 @@ main(int argc, char **argv)
FATAL("failed to find a free port");
}
snprintf(tmp_port, 8, "%d", port);
if (is_ipv6only(remote_addr, remote_num)) {
if (is_ipv6only(remote_addr, remote_num, ipv6first)) {
plugin_host = "::1";
} else {
plugin_host = "127.0.0.1";
@@ -1748,7 +1748,11 @@ main(int argc, char **argv)
#endif
if (local_addr == NULL) {
local_addr = "127.0.0.1";
if (is_ipv6only(remote_addr, remote_num, ipv6first)) {
local_addr = "::1";
} else {
local_addr = "127.0.0.1";
}
}
USE_SYSLOG(argv[0], pid_flags);
src/netutils.c
+7 -7
View File
@@ -285,17 +285,17 @@ validate_hostname(const char *hostname, const int hostname_len)
}
int
is_ipv6only(ss_addr_t *servers, size_t server_num)
is_ipv6only(ss_addr_t *servers, size_t server_num, int ipv6first)
{
struct cork_ip ip;
int i;
for (i = 0; i < server_num; i++)
{
if (cork_ip_init(&ip, servers[i].host) != -1) {
if (ip.version != 6) {
return 0;
}
} else {
struct sockaddr_storage storage;
memset(&storage, 0, sizeof(struct sockaddr_storage));
if (get_sockaddr(servers[i].host, servers[i].port, &storage, 1, ipv6first) == -1) {
FATAL("failed to resolve the provided hostname");
}
if (storage.ss_family != AF_INET6) {
return 0;
}
}
src/netutils.h
+1 -1
View File
@@ -108,6 +108,6 @@ int sockaddr_cmp_addr(struct sockaddr_storage *addr1,
int validate_hostname(const char *hostname, const int hostname_len);
int is_ipv6only(ss_addr_t *servers, size_t server_num);
int is_ipv6only(ss_addr_t *servers, size_t server_num, int ipv6first);
#endif
src/redir.c
+6 -2
View File
@@ -1067,7 +1067,7 @@ main(int argc, char **argv)
FATAL("failed to find a free port");
}
snprintf(tmp_port, 8, "%d", port);
if (is_ipv6only(remote_addr, remote_num)) {
if (is_ipv6only(remote_addr, remote_num, ipv6first)) {
plugin_host = "::1";
} else {
plugin_host = "127.0.0.1";
@@ -1099,7 +1099,11 @@ main(int argc, char **argv)
#endif
if (local_addr == NULL) {
local_addr = "127.0.0.1";
if (is_ipv6only(remote_addr, remote_num, ipv6first)) {
local_addr = "::1";
} else {
local_addr = "127.0.0.1";
}
}
if (fast_open == 1) {
src/server.c
+1 -1
View File
@@ -1835,7 +1835,7 @@ main(int argc, char **argv)
exit(EXIT_FAILURE);
}
if (is_ipv6only(server_addr, server_num)) {
if (is_ipv6only(server_addr, server_num, ipv6first)) {
plugin_host = "::1";
} else {
plugin_host = "127.0.0.1";
src/tunnel.c
+6 -2
View File
@@ -1116,7 +1116,7 @@ main(int argc, char **argv)
FATAL("failed to find a free port");
}
snprintf(tmp_port, 8, "%d", port);
if (is_ipv6only(remote_addr, remote_num)) {
if (is_ipv6only(remote_addr, remote_num, ipv6first)) {
plugin_host = "::1";
} else {
plugin_host = "127.0.0.1";
@@ -1156,7 +1156,11 @@ main(int argc, char **argv)
#endif
if (local_addr == NULL) {
local_addr = "127.0.0.1";
if (is_ipv6only(remote_addr, remote_num, ipv6first)) {
local_addr = "::1";
} else {
local_addr = "127.0.0.1";
}
}
if (fast_open == 1) {