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

Fix ttl bug

Browse Source
This commit is contained in:
Nick Peng
2019-01-18 21:05:58 +08:00
parent bb1c4d2bfa
commit 7f5e0ef4e0
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dns_client.c
View File

@@ -746,6 +746,11 @@ static int _dns_client_create_socket_udp(struct dns_server_info *server_info)
server_info->status = DNS_SERVER_STATUS_CONNECTIONLESS; server_info->status = DNS_SERVER_STATUS_CONNECTIONLESS;
setsockopt(server_info->fd, IPPROTO_IP, IP_RECVTTL, &on, sizeof(on)); setsockopt(server_info->fd, IPPROTO_IP, IP_RECVTTL, &on, sizeof(on));
setsockopt(server_info->fd, SOL_IP, IP_TTL, &val, sizeof(val)); setsockopt(server_info->fd, SOL_IP, IP_TTL, &val, sizeof(val));
if (server_info->ai_family == AF_INET6) {
setsockopt(server_info->fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on));
setsockopt(server_info->fd, IPPROTO_IPV6, IPV6_2292HOPLIMIT, &on, sizeof(on));
setsockopt(server_info->fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &on, sizeof(on));
}
return 0; return 0;
errout: errout:
@@ -941,9 +946,15 @@ static int _dns_client_process_udp(struct dns_server_info *server_info, struct e
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_TTL) { if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_TTL) {
uint8_t *ttlPtr = (uint8_t *)CMSG_DATA(cmsg); if (cmsg->cmsg_len >= sizeof(int)) {
ttl = *ttlPtr; int *ttlPtr = (int *)CMSG_DATA(cmsg);
break; ttl = *ttlPtr;
}
} else if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT) {
if (cmsg->cmsg_len >= sizeof(int)) {
int *ttlPtr = (int *)CMSG_DATA(cmsg);
ttl = *ttlPtr;
}
} }
} }

33
src/fast_ping.c
View File

@@ -425,6 +425,7 @@ static int _fast_ping_sendping_udp(struct ping_host_struct *ping_host)
struct ping_dns_head dns_head; struct ping_dns_head dns_head;
int len; int len;
int flag = 0; int flag = 0;
int fd = 0;
flag |= (0 << 15) & 0x8000; flag |= (0 << 15) & 0x8000;
flag |= (2 << 11) & 0x7800; flag |= (2 << 11) & 0x7800;
@@ -434,11 +435,19 @@ static int _fast_ping_sendping_udp(struct ping_host_struct *ping_host)
flag |= (0 << 7) & 0x0080; flag |= (0 << 7) & 0x0080;
flag |= (0 << 0) & 0x000F; flag |= (0 << 0) & 0x000F;
if (ping_host->type == FAST_PING_UDP) {
fd = ping.fd_udp;
} else if (ping_host->type == FAST_PING_UDP6) {
fd = ping.fd_udp6;
} else {
return -1;
}
ping_host->seq++; ping_host->seq++;
memset(&dns_head, 0, sizeof(dns_head)); memset(&dns_head, 0, sizeof(dns_head));
dns_head.id = htons(ping_host->sid); dns_head.id = htons(ping_host->sid);
dns_head.flag = flag; dns_head.flag = flag;
len = sendto(ping.fd_udp, &dns_head, sizeof(dns_head), 0, (struct sockaddr *)&ping_host->addr, ping_host->addr_len); len = sendto(fd, &dns_head, sizeof(dns_head), 0, (struct sockaddr *)&ping_host->addr, ping_host->addr_len);
if (len < 0 || len != sizeof(dns_head)) { if (len < 0 || len != sizeof(dns_head)) {
int err = errno; int err = errno;
if (errno == ENETUNREACH || errno == EINVAL) { if (errno == ENETUNREACH || errno == EINVAL) {
@@ -522,7 +531,7 @@ static int _fast_ping_sendping(struct ping_host_struct *ping_host)
ret = _fast_ping_sendping_v6(ping_host); ret = _fast_ping_sendping_v6(ping_host);
} else if (ping_host->type == FAST_PING_TCP) { } else if (ping_host->type == FAST_PING_TCP) {
ret = _fast_ping_sendping_tcp(ping_host); ret = _fast_ping_sendping_tcp(ping_host);
} else if (ping_host->type == FAST_PING_UDP) { } else if (ping_host->type == FAST_PING_UDP || ping_host->type == FAST_PING_UDP6) {
ret = _fast_ping_sendping_udp(ping_host); ret = _fast_ping_sendping_udp(ping_host);
} }
@@ -652,6 +661,7 @@ static int _fast_ping_create_udp_sock(FAST_PING_TYPE type)
} }
udp_host = &ping.udp_host; udp_host = &ping.udp_host;
udp_host->type = FAST_PING_UDP;
break; break;
case FAST_PING_UDP6: case FAST_PING_UDP6:
fd = socket(AF_INET6, SOCK_DGRAM, 0); fd = socket(AF_INET6, SOCK_DGRAM, 0);
@@ -661,6 +671,10 @@ static int _fast_ping_create_udp_sock(FAST_PING_TYPE type)
} }
udp_host = &ping.udp6_host; udp_host = &ping.udp6_host;
udp_host->type = FAST_PING_UDP6;
setsockopt(fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on));
setsockopt(fd, IPPROTO_IPV6, IPV6_2292HOPLIMIT, &on, sizeof(on));
setsockopt(fd, IPPROTO_IPV6, IPV6_HOPLIMIT, &on, sizeof(on));
break; break;
default: default:
return -1; return -1;
@@ -677,7 +691,6 @@ static int _fast_ping_create_udp_sock(FAST_PING_TYPE type)
} }
udp_host->fd = fd; udp_host->fd = fd;
udp_host->type = FAST_PING_UDP;
return fd; return fd;
errout: errout:
@@ -829,7 +842,6 @@ struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int c
socktype = SOCK_DGRAM; socktype = SOCK_DGRAM;
snprintf(port_str, MAX_IP_LEN, "%d", port); snprintf(port_str, MAX_IP_LEN, "%d", port);
service = port_str; service = port_str;
ping_type = FAST_PING_UDP;
if (_fast_ping_create_udp(ping_type) < 0) { if (_fast_ping_create_udp(ping_type) < 0) {
goto errout; goto errout;
@@ -1194,9 +1206,15 @@ static int _fast_ping_process_udp(struct ping_host_struct *ping_host, struct tim
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_TTL) { if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_TTL) {
uint8_t *ttlPtr = (uint8_t *)CMSG_DATA(cmsg); if (cmsg->cmsg_len >= sizeof(int)) {
ttl = *ttlPtr; int *ttlPtr = (int *)CMSG_DATA(cmsg);
break; ttl = *ttlPtr;
}
} else if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT) {
if (cmsg->cmsg_len >= sizeof(int)) {
int *ttlPtr = (int *)CMSG_DATA(cmsg);
ttl = *ttlPtr;
}
} }
} }
@@ -1256,6 +1274,7 @@ static int _fast_ping_process(struct ping_host_struct *ping_host, struct epoll_e
case FAST_PING_TCP: case FAST_PING_TCP:
ret = _fast_ping_process_tcp(ping_host, event, now); ret = _fast_ping_process_tcp(ping_host, event, now);
break; break;
case FAST_PING_UDP6:
case FAST_PING_UDP: case FAST_PING_UDP:
ret = _fast_ping_process_udp(ping_host, now); ret = _fast_ping_process_udp(ping_host, now);
break; break;