feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

zeroconf: increase wait for daemon to reduce the possibility of starting multiple daemons

Browse Source 
Change-Id: I406e5e86f1d549471d7b0f178763a4dd283e369c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Fawzi Mohamed
2012-04-02 14:07:19 +02:00
parent 4f239ff00d
commit f19c170a1e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/zeroconf/embed/dnssd_clientstub.c
View File

@@ -220,8 +220,8 @@ static int read_all(dnssd_sock_t sd, char *buf, int len)
while (len) while (len)
{ {
timeval timeout; timeval timeout;
timeout.tv_sec = 0; timeout.tv_sec = 1;
timeout.tv_usec = 100000; timeout.tv_usec = 0;
fd_set readFds, writeFds, exceptFds; fd_set readFds, writeFds, exceptFds;
memset(&readFds,0,sizeof(readFds)); memset(&readFds,0,sizeof(readFds));
memset(&writeFds,0,sizeof(writeFds)); memset(&writeFds,0,sizeof(writeFds));
@@ -233,7 +233,7 @@ static int read_all(dnssd_sock_t sd, char *buf, int len)
int nVal=select(sd+1, &readFds, &writeFds, &exceptFds, &timeout); int nVal=select(sd+1, &readFds, &writeFds, &exceptFds, &timeout);
if (nVal < 1 || !FD_ISSET(sd, &readFds)) { if (nVal < 1 || !FD_ISSET(sd, &readFds)) {
++nErr; ++nErr;
if (nErr < 5) // wait max 0.5s without reading if (nErr < 6) // wait max 6s without reading
continue; continue;
} else { } else {
num_read = recv(sd, buf, len, 0); num_read = recv(sd, buf, len, 0);