daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lint issue

Browse Source
This commit is contained in:
Nick Peng
2019-08-09 22:32:17 +08:00
parent 5082f1ae55
commit 273c2d5100
8 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/fast_ping.c
View File

@@ -984,14 +984,10 @@ static int _fast_ping_get_addr_by_type(PING_TYPE type, const char *ip_str, int p
return _fast_ping_get_addr_by_dns(ip_str, port, out_gai, out_ping_type);
break;
default:
goto errout;
break;
}
return -1;
errout:
return -1;
}
struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int count, int interval, int timeout, fast_ping_result ping_callback, void *userptr)
@@ -1055,7 +1051,6 @@ struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int c
hash_add(ping.addrmap, &ping_host->addr_node, addrkey);
pthread_mutex_unlock(&ping.map_lock);
_fast_ping_host_get(ping_host);
_fast_ping_host_get(ping_host);
if (_fast_ping_sendping(ping_host) != 0) {
goto errout_remove;
@@ -1063,8 +1058,10 @@ struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int c
ping_host->run = 1;
freeaddrinfo(gai);
_fast_ping_host_put(ping_host);
return ping_host;
errout_remove:
fast_ping_stop(ping_host);
ping_host = NULL;
errout:
if (gai) {
freeaddrinfo(gai);
@@ -1074,10 +1071,6 @@ errout:
free(ping_host);
}
return NULL;
errout_remove:
fast_ping_stop(ping_host);
_fast_ping_host_put(ping_host);
return NULL;
}
@@ -1270,8 +1263,8 @@ static int _fast_ping_process_icmp(struct ping_host_struct *ping_host, struct ti
}
if (recv_ping_host->seq != seq) {
_fast_ping_host_put(recv_ping_host);
tlog(TLOG_ERROR, "seq num mismatch, expect %u, real %u", recv_ping_host->seq, seq);
_fast_ping_host_put(recv_ping_host);
return -1;
}
@@ -1640,7 +1633,7 @@ errout:
return -1;
}
void _fast_ping_close_fds(void)
static void _fast_ping_close_fds(void)
{
if (ping.fd_icmp > 0) {
close(ping.fd_icmp);