Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IPHLPAPI] Fix all testIcmpSendEcho tests. By Peter Hater. Please see CORE-11993 for the list of changes.

Browse source 
svn path=/trunk/; revision=72759
This commit is contained in:
Amine Khaldi 2016-09-21 15:53:17 +00:00
parent 640e1bacfc
commit 51d329b7e1
2 changed files with 59 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
reactos/dll/win32/iphlpapi/icmp.c
View file

@ -538,8 +538,23 @@ DWORD WINAPI IcmpSendEcho(
return 0;
}
if (ReplySize<sizeof(ICMP_ECHO_REPLY)+ICMP_MINLEN) {
SetLastError(IP_BUF_TOO_SMALL);
if (ReplySize<sizeof(ICMP_ECHO_REPLY)) {
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
if (ReplySize-RequestSize<sizeof(ICMP_ECHO_REPLY)) {
SetLastError(IP_GENERAL_FAILURE);
return 0;
}
if (!ReplyBuffer) {
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
if (Timeout == 0 || Timeout == -1) {
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
/* check the request size against SO_MAX_MSG_SIZE using getsockopt */
@ -564,7 +579,9 @@ DWORD WINAPI IcmpSendEcho(
#endif
seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF;
reqsize=ICMP_MINLEN+RequestSize;
reqsize=ICMP_MINLEN;
if (RequestData && RequestSize > 0)
reqsize += RequestSize;
reqbuf=HeapAlloc(GetProcessHeap(), 0, reqsize);
if (reqbuf==NULL) {
SetLastError(ERROR_OUTOFMEMORY);
@ -577,7 +594,8 @@ DWORD WINAPI IcmpSendEcho(
icmp_header->icmp_cksum=0;
icmp_header->icmp_id=id;
icmp_header->icmp_seq=seq;
memcpy(reqbuf+ICMP_MINLEN, RequestData, RequestSize);
if (RequestData && RequestSize > 0)
memcpy(reqbuf+ICMP_MINLEN, RequestData, RequestSize);
icmp_header->icmp_cksum=cksum=in_cksum((u_short*)reqbuf,reqsize);
addr.sin_family=AF_INET;
@ -633,9 +651,8 @@ DWORD WINAPI IcmpSendEcho(
#endif
addrlen=sizeof(addr);
ier=ReplyBuffer;
ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY));
endbuf=(char *) ReplyBuffer+ReplySize;
maxlen=ReplySize-sizeof(ICMP_ECHO_REPLY);
endbuf=((char *) ReplyBuffer)+ReplySize;
maxlen=sizeof(struct ip)+ICMP_MINLEN+RequestSize;
/* Send the packet */
TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr));
@ -673,6 +690,7 @@ DWORD WINAPI IcmpSendEcho(
}
/* Get the reply */
ip_header=HeapAlloc(GetProcessHeap(), 0, maxlen);
ip_header_len=0; /* because gcc was complaining */
#ifdef __REACTOS__
while ((res=select(icp->sid+1,&fdr,NULL,NULL,&timeout))>0) {
@ -683,6 +701,8 @@ DWORD WINAPI IcmpSendEcho(
res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,(int*)&addrlen);
TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr));
ier->Status=IP_REQ_TIMED_OUT;
if (res < 0)
break;
/* Check whether we should ignore this packet */
if ((ip_header->ip_p==IPPROTO_ICMP) && (res>=sizeof(struct ip)+ICMP_MINLEN)) {
@ -704,7 +724,7 @@ DWORD WINAPI IcmpSendEcho(
case ICMP_UNREACH_ISOLATED:
#endif
#ifdef ICMP_UNREACH_HOST_PROHIB
case ICMP_UNREACH_HOST_PROHIB:
case ICMP_UNREACH_HOST_PROHIB:
#endif
#ifdef ICMP_UNREACH_TOSHOST
case ICMP_UNREACH_TOSHOST:
@ -744,9 +764,9 @@ DWORD WINAPI IcmpSendEcho(
rep_ip_header=(struct ip*)(((char*)icmp_header)+ICMP_MINLEN);
rep_icmp_header=(struct icmp*)(((char*)rep_ip_header)+(rep_ip_header->ip_hl << 2));
/* Make sure that this is really a reply to our packet */
/* Make sure that this is really a reply to our packet */
if (ip_header_len+ICMP_MINLEN+(rep_ip_header->ip_hl << 2)+ICMP_MINLEN>ip_header->ip_len) {
ier->Status=IP_REQ_TIMED_OUT;
ier->Status=IP_REQ_TIMED_OUT;
} else if ((rep_icmp_header->icmp_type!=ICMP_ECHO) ||
(rep_icmp_header->icmp_code!=0) ||
(rep_icmp_header->icmp_id!=id) ||
@ -762,11 +782,11 @@ DWORD WINAPI IcmpSendEcho(
TRACE("expected type,code=8,0 id,seq=%d,%d cksum=%d\n",
id,seq,
cksum);
ier->Status=IP_REQ_TIMED_OUT;
}
ier->Status=IP_REQ_TIMED_OUT;
}
}
}
}
}
}
if (ier->Status==IP_REQ_TIMED_OUT) {
/* This packet was not for us.
@ -778,6 +798,8 @@ DWORD WINAPI IcmpSendEcho(
if (t < 0) t = 0;
timeout.tv_sec = t / 1000;
timeout.tv_usec = (t % 1000) * 1000;
FD_ZERO(&fdr);
FD_SET(icp->sid, &fdr);
#else
DWORD t = (recv_time - send_time);
if (Timeout > t) Timeout -= t;
@ -809,8 +831,6 @@ DWORD WINAPI IcmpSendEcho(
/* Prepare for the next packet */
ier++;
ip_header=(struct ip*)(((char*)ip_header)+sizeof(ICMP_ECHO_REPLY));
maxlen=endbuf-(char*)ip_header;
/* Check out whether there is more but don't wait this time */
#ifdef __REACTOS__
@ -825,6 +845,7 @@ DWORD WINAPI IcmpSendEcho(
FD_SET(icp->sid,&fdr);
#endif
}
HeapFree(GetProcessHeap(), 0, ip_header);
res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer;
if (res==0)
SetLastError(IP_REQ_TIMED_OUT);

22
reactos/dll/win32/iphlpapi/ip.h
View file

@ -61,6 +61,16 @@ struct ip {
#ifdef _IP_VHL
u_char ip_vhl; /* version << 4 | header length >> 2 */
#else
#ifdef __REACTOS__
#if BYTE_ORDER == LITTLE_ENDIAN
u_char ip_hl : 4, /* header length */
ip_v : 4; /* version */
#endif
#if BYTE_ORDER == BIG_ENDIAN
u_char ip_v : 4, /* version */
ip_hl : 4; /* header length */
#endif
#else
#if BYTE_ORDER == LITTLE_ENDIAN
u_int ip_hl:4, /* header length */
ip_v:4; /* version */
@ -69,6 +79,7 @@ struct ip {
u_int ip_v:4, /* version */
ip_hl:4; /* header length */
#endif
#endif /* __REACTOS__ */
#endif /* not _IP_VHL */
u_char ip_tos; /* type of service */
u_short ip_len; /* total length */
@ -151,6 +162,16 @@ struct ip_timestamp {
u_char ipt_code; /* IPOPT_TS */
u_char ipt_len; /* size of structure (variable) */
u_char ipt_ptr; /* index of current entry */
#ifdef __REACTOS__
#if BYTE_ORDER == LITTLE_ENDIAN
u_char ipt_flg:4, /* flags, see below */
ipt_oflw:4; /* overflow counter */
#endif
#if BYTE_ORDER == BIG_ENDIAN
u_char ipt_oflw:4, /* overflow counter */
ipt_flg:4; /* flags, see below */
#endif
#else
#if BYTE_ORDER == LITTLE_ENDIAN
u_int ipt_flg:4, /* flags, see below */
ipt_oflw:4; /* overflow counter */
@ -159,6 +180,7 @@ struct ip_timestamp {
u_int ipt_oflw:4, /* overflow counter */
ipt_flg:4; /* flags, see below */
#endif
#endif /* __REACTOS__ */
union ipt_timestamp {
n_long ipt_time[1];
struct ipt_ta {