From fcbccf39ef9da233de545cd4501c73365d7e445c Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Sun, 17 Jan 2016 02:13:17 +0300 Subject: [PATCH] Use configured timeouts for DNS operations instead static ones --- src/auth.c | 4 ++-- src/dnspr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/auth.c b/src/auth.c index 5a81433..bc31c11 100644 --- a/src/auth.c +++ b/src/auth.c @@ -1113,7 +1113,7 @@ unsigned long udpresolve(int af, unsigned char * name, unsigned char * value, un continue; } if(param) param->statscli64 += len; - len = sockrecvfrom(sock, sinsr, buf, 4096, 15000); + len = sockrecvfrom(sock, sinsr, buf, 4096, conf.timeouts[DNS_TO]*1000); so._shutdown(sock, SHUT_RDWR); so._closesocket(sock); if(len <= 13) { @@ -1125,7 +1125,7 @@ unsigned long udpresolve(int af, unsigned char * name, unsigned char * value, un us = ntohs(*(unsigned short*)buf); len-=2; buf+=2; - if(us > 4096 || us < len || (us > len && sockrecvfrom(sock, sinsr, buf+len, us-len, 15000) != us-len)) { + if(us > 4096 || us < len || (us > len && sockrecvfrom(sock, sinsr, buf+len, us-len, conf.timeouts[DNS_TO]*1000) != us-len)) { continue; } } diff --git a/src/dnspr.c b/src/dnspr.c index bdee19e..ac67895 100644 --- a/src/dnspr.c +++ b/src/dnspr.c @@ -158,7 +158,7 @@ void * dnsprchild(struct clientparam* param) { } param->statscli64 += i; param->nwrites++; - len = sockrecvfrom(param->remsock, (struct sockaddr *)¶m->sinsr, buf, BUFSIZE, 15000); + len = sockrecvfrom(param->remsock, (struct sockaddr *)¶m->sinsr, buf, BUFSIZE, conf.timeouts[DNS_TO]*1000); if(len <= 13) { RETURN(821); }