Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-11-01 07:30:02 +00:00
Code Releases Activity

Refine nameserver settings

Browse Source 
* Use the nameserver given in the configuration file if any.
* Use Google Public DNS only if the user does not nominate a nameserver.
This commit is contained in:
Meitian Huang
2015-01-10 17:24:24 +11:00
parent c2cc700177
commit 6dbf0fae07
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server.c
+11 -2
View File
@@ -971,8 +971,7 @@ int main(int argc, char **argv)
const char *server_port = NULL;
char * nameservers[MAX_DNS_NUM + 1];
int nameserver_num = 1;
nameservers[0] = "8.8.8.8";
int nameserver_num = 0;
int option_index = 0;
static struct option long_options[] =
@@ -1078,6 +1077,9 @@ int main(int argc, char **argv)
set_nofile(nofile);
}
#endif
if (conf->nameserver != NULL) {
nameservers[nameserver_num++] = conf->nameserver;
}
}
if (server_num == 0 || server_port == NULL || password == NULL) {
@@ -1122,6 +1124,9 @@ int main(int argc, char **argv)
struct ev_loop *loop = EV_DEFAULT;
// setup udns
if (nameserver_num == 0) {
nameservers[nameserver_num++] = "8.8.8.8";
}
resolv_init(loop, nameservers, nameserver_num);
// inilitialize listen context
@@ -1144,6 +1149,10 @@ int main(int argc, char **argv)
setnonblocking(listenfd);
LOGI("server listening at port %s", server_port);
for (int i = 0; i < nameserver_num; i++) {
LOGI("using nameserver: %s", nameservers[i]);
}
struct listen_ctx *listen_ctx = &listen_ctx_list[index];
// Setup proxy context