Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ping to build again.

Browse source 
Remove some errors.

svn path=/trunk/; revision=7673
This commit is contained in:
Mark Tempel 2004-01-16 04:43:19 +00:00
parent f1ec3f9804
commit d57d41f1f8
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rosapps/net/ping/makefile
View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.2 2001/12/31 18:24:13 sedwards Exp $
# $Id: makefile,v 1.3 2004/01/16 04:43:19 mtempel Exp $
PATH_TO_TOP=../../../reactos
@ -8,6 +8,8 @@ TARGET_APPTYPE = console
TARGET_NAME = ping
TARGET_CFLAGS = -D__USE_W32_SOCKETS
TARGET_SDKLIBS = ntdll.a ws2_32.a
TARGET_OBJECTS = $(TARGET_NAME).o

16
rosapps/net/ping/ping.c
View file

@ -1,4 +1,4 @@
/* $Id: ping.c,v 1.2 2004/01/12 22:45:53 sedwards Exp $
/* $Id: ping.c,v 1.3 2004/01/16 04:43:19 mtempel Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS ping utility
@ -8,6 +8,7 @@
* REVISIONS:
* CSH 01/09/2000 Created
*/
//#include <windows.h>
#include <winsock2.h>
#include <tchar.h>
#include <stdarg.h>
@ -18,6 +19,9 @@
//#define DBG
/* FIXME: Where should this be? */
#ifdef CopyMemory
#undef CopyMemory
#endif
#define CopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length);
/* Should be in the header files somewhere (exported by ntdll.dll) */
@ -421,7 +425,7 @@ BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
if (size < IphLength + ICMP_MINSIZE) {
#ifdef DBG
printf("Bad size (0x%X < 0x%X)\n", size, IphLength + ICMP_MINSIZE);
#endif DBG
#endif /* DBG */
return FALSE;
}
@ -430,14 +434,14 @@ BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
if (Icmp->Icmp.Type != ICMPMSG_ECHOREPLY) {
#ifdef DBG
printf("Bad ICMP type (0x%X should be 0x%X)\n", Icmp->Icmp.Type, ICMPMSG_ECHOREPLY);
#endif DBG
#endif /* DBG */
return FALSE;
}
if (Icmp->Icmp.Id != (USHORT)GetCurrentProcessId()) {
#ifdef DBG
printf("Bad ICMP id (0x%X should be 0x%X)\n", Icmp->Icmp.Id, (USHORT)GetCurrentProcessId());
#endif DBG
#endif /* DBG */
return FALSE;
}
@ -510,7 +514,7 @@ BOOL Ping(VOID)
printf("Sending packet\n");
DisplayBuffer(Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize);
printf("\n");
#endif DBG
#endif /* DBG */
Status = sendto(IcmpSock, Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize,
0, (SOCKADDR*)&Target, sizeof(Target));
@ -541,7 +545,7 @@ BOOL Ping(VOID)
printf("Received packet\n");
DisplayBuffer(Buffer, Status);
printf("\n");
#endif DBG
#endif /* DBG */
}
if (Status == SOCKET_ERROR) {
if (WSAGetLastError() != WSAETIMEDOUT) {