OpenWrt/apfree_wifidog
1
0
Fork 0
mirror of https://github.com/liudf0716/apfree_wifidog.git synced 2025-01-08 11:57:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

skip always dns resolve when ip already exist

Browse Source
This commit is contained in:
fenggui321 2017-11-28 18:19:42 +08:00 committed by Dengfeng Liu
parent 13b5677154
commit 9706596099
2 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contributors.md
View File

@ -20,4 +20,6 @@ Thank you to all contributors:
[wenchangshou2](https://github.com/wenchangshou2) [wenchangshou2](https://github.com/wenchangshou2)
[Lzxiangxmut](https://github.com/Lzxiangxmut) [Lzxiangxmut](https://github.com/Lzxiangxmut)
[fenggui321](https://github.com/fenggui321)

85
src/centralserver.c Normal file → Executable file
View File

@ -462,49 +462,52 @@ _connect_auth_server(int level) {
*/ */
auth_server = config->auth_servers; auth_server = config->auth_servers;
hostname = auth_server->authserv_hostname; hostname = auth_server->authserv_hostname;
debug(LOG_DEBUG, "Level %d: Resolving auth server [%s]", level, hostname); if (NULL == auth_server->last_ip){
h_addr = wd_gethostbyname(hostname); debug(LOG_DEBUG, "Level %d: Resolving auth server [%s]", level, hostname);
if (!h_addr) { h_addr = wd_gethostbyname(hostname);
/* if (!h_addr) {
* DNS resolving it failed
*/
debug(LOG_INFO, "Level %d: Resolving auth server [%s] failed", level, hostname);
if (auth_server->last_ip) {
free(auth_server->last_ip);
auth_server->last_ip = NULL;
}
mark_auth_server_bad(auth_server);
return _connect_auth_server(level);
} else {
/*
* DNS resolving was successful
*/
ip = safe_malloc(HTTP_IP_ADDR_LEN);
inet_ntop(AF_INET, h_addr, ip, HTTP_IP_ADDR_LEN);
ip[HTTP_IP_ADDR_LEN-1] = '\0';
debug(LOG_DEBUG, "Level %d: Resolving auth server [%s] succeeded = [%s]", level, hostname, ip);
if (!auth_server->last_ip || strcmp(auth_server->last_ip, ip) != 0) {
/* /*
* But the IP address is different from the last one we knew * DNS resolving it failed
* Update it */
*/ debug(LOG_INFO, "Level %d: Resolving auth server [%s] failed", level, hostname);
debug(LOG_INFO, "Level %d: Updating last_ip IP of server [%s] to [%s]", level, hostname, ip);
if (auth_server->last_ip) if (auth_server->last_ip) {
free(auth_server->last_ip); free(auth_server->last_ip);
auth_server->last_ip = ip; auth_server->last_ip = NULL;
}
/* Update firewall rules */ mark_auth_server_bad(auth_server);
fw_clear_authservers(); return _connect_auth_server(level);
fw_set_authservers();
} else { } else {
/* /*
* IP is the same as last time * DNS resolving was successful
*/ */
free(ip); ip = safe_malloc(HTTP_IP_ADDR_LEN);
inet_ntop(AF_INET, h_addr, ip, HTTP_IP_ADDR_LEN);
ip[HTTP_IP_ADDR_LEN-1] = '\0';
debug(LOG_DEBUG, "Level %d: Resolving auth server [%s] succeeded = [%s]", level, hostname, ip);
if (!auth_server->last_ip || strcmp(auth_server->last_ip, ip) != 0) {
/*
* But the IP address is different from the last one we knew
* Update it
*/
debug(LOG_INFO, "Level %d: Updating last_ip IP of server [%s] to [%s]", level, hostname, ip);
if (auth_server->last_ip)
free(auth_server->last_ip);
auth_server->last_ip = ip;
/* Update firewall rules */
fw_clear_authservers();
fw_set_authservers();
} else {
/*
* IP is the same as last time
*/
free(ip);
}
free(h_addr);
} }
}
/* /*
* Connect to it * Connect to it
*/ */
@ -513,9 +516,8 @@ _connect_auth_server(int level) {
their_addr.sin_port = port; their_addr.sin_port = port;
their_addr.sin_family = AF_INET; their_addr.sin_family = AF_INET;
their_addr.sin_addr = *h_addr; inet_aton(auth_server->last_ip, &their_addr.sin_addr);
memset(&(their_addr.sin_zero), '\0', sizeof(their_addr.sin_zero)); memset(&(their_addr.sin_zero), '\0', sizeof(their_addr.sin_zero));
free(h_addr);
if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
debug(LOG_ERR, "Level %d: Failed to create a new SOCK_STREAM socket: %s", strerror(errno)); debug(LOG_ERR, "Level %d: Failed to create a new SOCK_STREAM socket: %s", strerror(errno));
@ -537,7 +539,6 @@ _connect_auth_server(int level) {
mark_auth_server_bad(auth_server); mark_auth_server_bad(auth_server);
return _connect_auth_server(level); /* Yay recursion! */ return _connect_auth_server(level); /* Yay recursion! */
} }
}
} }
// 0, failure; 1, success // 0, failure; 1, success