reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-31 09:01:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid using gettimeofday.

Browse Source
This commit is contained in:
Alexandre Julliard 2004-09-29 21:33:05 +00:00
parent c3421ea434
commit e22ae15773
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/icmp/icmp_main.c
View File

@ -210,7 +210,8 @@ DWORD WINAPI IcmpSendEcho(
int ip_header_len; int ip_header_len;
int maxlen; int maxlen;
fd_set fdr; fd_set fdr;
struct timeval timeout,send_time,recv_time; struct timeval timeout;
DWORD send_time,recv_time;
struct sockaddr_in addr; struct sockaddr_in addr;
int addrlen; int addrlen;
unsigned short id,seq,cksum; unsigned short id,seq,cksum;
@ -313,7 +314,7 @@ DWORD WINAPI IcmpSendEcho(
} }
#endif #endif
gettimeofday(&send_time,NULL); send_time = GetTickCount();
res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr));
HeapFree(GetProcessHeap (), 0, reqbuf); HeapFree(GetProcessHeap (), 0, reqbuf);
if (res<0) { if (res<0) {
@ -338,7 +339,7 @@ DWORD WINAPI IcmpSendEcho(
/* Get the reply */ /* Get the reply */
ip_header_len=0; /* because gcc was complaining */ ip_header_len=0; /* because gcc was complaining */
while ((res=select(icp->sid+1,&fdr,NULL,NULL,&timeout))>0) { while ((res=select(icp->sid+1,&fdr,NULL,NULL,&timeout))>0) {
gettimeofday(&recv_time,NULL); recv_time = GetTickCount();
res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen);
TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr));
ier->Status=IP_REQ_TIMED_OUT; ier->Status=IP_REQ_TIMED_OUT;
@ -432,18 +433,16 @@ DWORD WINAPI IcmpSendEcho(
* Decrease the timeout so that we don't enter an endless loop even * Decrease the timeout so that we don't enter an endless loop even
* if we get flooded with ICMP packets that are not for us. * if we get flooded with ICMP packets that are not for us.
*/ */
timeout.tv_sec=Timeout/1000-(recv_time.tv_sec-send_time.tv_sec); int t = Timeout - (recv_time - send_time);
timeout.tv_usec=(Timeout % 1000)*1000+send_time.tv_usec-(recv_time.tv_usec-send_time.tv_usec); if (t < 0) t = 0;
if (timeout.tv_usec<0) { timeout.tv_sec = t / 1000;
timeout.tv_usec+=1000000; timeout.tv_usec = (t % 1000) * 1000;
timeout.tv_sec--;
}
continue; continue;
} else { } else {
/* This is a reply to our packet */ /* This is a reply to our packet */
memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr)); memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr));
/* Status is already set */ /* Status is already set */
ier->RoundTripTime=(recv_time.tv_sec-send_time.tv_sec)*1000+(recv_time.tv_usec-send_time.tv_usec)/1000; ier->RoundTripTime= recv_time - send_time;
ier->DataSize=res-ip_header_len-ICMP_MINLEN; ier->DataSize=res-ip_header_len-ICMP_MINLEN;
ier->Reserved=0; ier->Reserved=0;
ier->Data=endbuf-ier->DataSize; ier->Data=endbuf-ier->DataSize;