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

update code

Browse Source
This commit is contained in:
Nick Peng
2018-05-05 15:35:44 +08:00
parent dbf4cc7565
commit fa5b20dc2b
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fast_ping.c
View File

@@ -392,6 +392,7 @@ int fast_ping_start(const char *host, int timeout, void *userptr)
int icmp_proto = 0; int icmp_proto = 0;
uint32_t hostkey; uint32_t hostkey;
uint32_t addrkey; uint32_t addrkey;
int fd = -1;
domain = _fast_ping_getdomain(host); domain = _fast_ping_getdomain(host);
if (domain < 0) { if (domain < 0) {
@@ -410,10 +411,15 @@ int fast_ping_start(const char *host, int timeout, void *userptr)
break; break;
} }
fd = _fast_ping_create_icmp(icmp_proto);
if (fd < 0) {
goto errout;
}
gai = _fast_ping_getaddr(host, SOCK_RAW, icmp_proto); gai = _fast_ping_getaddr(host, SOCK_RAW, icmp_proto);
if (gai == NULL) { if (gai == NULL) {
return -1; goto errout;
} }
ping_host = malloc(sizeof(*ping_host)); ping_host = malloc(sizeof(*ping_host));
if (ping_host == NULL) { if (ping_host == NULL) {
@@ -424,8 +430,8 @@ int fast_ping_start(const char *host, int timeout, void *userptr)
memset(ping_host, 0, sizeof(*ping_host)); memset(ping_host, 0, sizeof(*ping_host));
strncpy(ping_host->host, host, PING_MAX_HOSTLEN); strncpy(ping_host->host, host, PING_MAX_HOSTLEN);
ping_host->type = domain; ping_host->type = domain;
ping_host->fd = _fast_ping_create_icmp(icmp_proto); ping_host->fd = fd;
ping_host->timeout = timeout; ping_host->timeout = timeout;
ping_host->interval = (timeout > interval) ? timeout : interval; ping_host->interval = (timeout > interval) ? timeout : interval;
memcpy(&ping_host->addr, gai->ai_addr, gai->ai_addrlen); memcpy(&ping_host->addr, gai->ai_addr, gai->ai_addrlen);
ping_host->addr_len = gai->ai_addrlen; ping_host->addr_len = gai->ai_addrlen;
@@ -445,6 +451,10 @@ int fast_ping_start(const char *host, int timeout, void *userptr)
_fast_ping_sendping(ping_host); _fast_ping_sendping(ping_host);
return 0; return 0;
errout: errout:
if (fd > 0) {
close(fd);
}
if (gai) { if (gai) {
freeaddrinfo(gai); freeaddrinfo(gai);
} }