update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6590 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
f481f79daa
commit
2fd1958d48
|
@ -432,7 +432,7 @@ static switch_status_t enum_lookup(char *root, char *in, enum_record_t ** result
|
||||||
char *name = NULL;
|
char *name = NULL;
|
||||||
enum_query_t query = { 0 };
|
enum_query_t query = { 0 };
|
||||||
enum dns_type l_qtyp = DNS_T_NAPTR;
|
enum dns_type l_qtyp = DNS_T_NAPTR;
|
||||||
int i = 0, abs = 0;
|
int i = 0, abs = 0, j = 0;
|
||||||
dns_socket fd = (dns_socket) - 1;
|
dns_socket fd = (dns_socket) - 1;
|
||||||
fd_set fds;
|
fd_set fds;
|
||||||
struct timeval tv = { 0 };
|
struct timeval tv = { 0 };
|
||||||
|
@ -489,7 +489,7 @@ static switch_status_t enum_lookup(char *root, char *in, enum_record_t ** result
|
||||||
FD_ZERO(&fds);
|
FD_ZERO(&fds);
|
||||||
now = 0;
|
now = 0;
|
||||||
|
|
||||||
while ((i = dns_timeouts(nctx, globals.timeout, now)) > 0) {
|
while ((i = dns_timeouts(nctx, 1, now)) > 0) {
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
#pragma warning(disable: 4389 4127)
|
#pragma warning(disable: 4389 4127)
|
||||||
|
@ -498,6 +498,13 @@ static switch_status_t enum_lookup(char *root, char *in, enum_record_t ** result
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
j += i;
|
||||||
|
|
||||||
|
if (j > globals.timeout || query.results) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
tv.tv_sec = i;
|
tv.tv_sec = i;
|
||||||
tv.tv_usec = 0;
|
tv.tv_usec = 0;
|
||||||
i = select((int) (fd + 1), &fds, 0, 0, &tv);
|
i = select((int) (fd + 1), &fds, 0, 0, &tv);
|
||||||
|
|
Loading…
Reference in New Issue