Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://thekelleys.org.uk/var/local/git/dnsmasq

Browse Source
This commit is contained in:
Simon Kelley
2023-05-26 18:01:58 +01:00
parent 1419de285f 50adf82199
commit 6536187b62
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/forward.c
View File

@@ -1909,7 +1909,7 @@ static ssize_t tcp_talk(int first, int last, int start, unsigned char *packet,
while (1) while (1)
{ {
int data_sent = 0; int data_sent = 0, timedout = 0;
struct server *serv; struct server *serv;
if (firstsendto == -1) if (firstsendto == -1)
@@ -1948,14 +1948,26 @@ static ssize_t tcp_talk(int first, int last, int start, unsigned char *packet,
continue; continue;
} }
#ifdef TCP_SYNCNT
/* TCP connections by default take ages to time out.
At least on Linux, we can reduce that to only two attempts
to get a reply. For DNS, that's more sensible. */
mark = 2;
setsockopt(serv->tcpfd, IPPROTO_TCP, TCP_SYNCNT, &mark, sizeof(unsigned int));
#endif
#ifdef MSG_FASTOPEN #ifdef MSG_FASTOPEN
server_send(serv, serv->tcpfd, packet, qsize + sizeof(u16), MSG_FASTOPEN); server_send(serv, serv->tcpfd, packet, qsize + sizeof(u16), MSG_FASTOPEN);
if (errno == 0) if (errno == 0)
data_sent = 1; data_sent = 1;
else if (errno = ETIMEDOUT || errno == EHOSTUNREACH)
timedout = 1;
#endif #endif
if (!data_sent && connect(serv->tcpfd, &serv->addr.sa, sa_len(&serv->addr)) == -1) /* If fastopen failed due to lack of reply, then there's no point in
trying again in non-FASTOPEN mode. */
if (timedout || (!data_sent && connect(serv->tcpfd, &serv->addr.sa, sa_len(&serv->addr)) == -1))
{ {
close(serv->tcpfd); close(serv->tcpfd);
serv->tcpfd = -1; serv->tcpfd = -1;