Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix sending malformed ICMP packets because we read the wrong length from the wrong address in the buffer

Browse source 
- Fix the sequence number stored in the packet
 - Fix potential null pointer freeing
 - tracert partially works now (Setting TTL isn't implemented yet)

svn path=/trunk/; revision=43732
This commit is contained in:
Cameron Gutman 2009-10-25 04:30:28 +00:00
parent fcb80fec6e
commit 6d9bb99627
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/base/applications/network/tracert/tracert.c
View file

@ -260,10 +260,10 @@ PreparePacket(PAPPINFO pInfo,
pInfo->SendPacket->icmpheader.code = 0; pInfo->SendPacket->icmpheader.code = 0;
pInfo->SendPacket->icmpheader.checksum = 0; pInfo->SendPacket->icmpheader.checksum = 0;
pInfo->SendPacket->icmpheader.id = (USHORT)GetCurrentProcessId(); pInfo->SendPacket->icmpheader.id = (USHORT)GetCurrentProcessId();
pInfo->SendPacket->icmpheader.seq = iSeqNum; pInfo->SendPacket->icmpheader.seq = htons((USHORT)iSeqNum);
/* calculate checksum of packet */ /* calculate checksum of packet */
pInfo->SendPacket->icmpheader.checksum = CheckSum((PUSHORT)&pInfo->SendPacket, pInfo->SendPacket->icmpheader.checksum = CheckSum((PUSHORT)&pInfo->SendPacket->icmpheader,
sizeof(ICMP_HEADER) + PACKET_SIZE); sizeof(ICMP_HEADER) + PACKET_SIZE);
} }
@ -279,8 +279,8 @@ SendPacket(PAPPINFO pInfo)
pInfo->lTimeStart = GetTime(pInfo); pInfo->lTimeStart = GetTime(pInfo);
iSockRet = sendto(pInfo->icmpSock, //socket iSockRet = sendto(pInfo->icmpSock, //socket
(char *)pInfo->SendPacket, //buffer (char *)&pInfo->SendPacket->icmpheader,//buffer
PACKET_SIZE, //size of buffer sizeof(ICMP_HEADER) + PACKET_SIZE,//size of buffer
0, //flags 0, //flags
(SOCKADDR *)&pInfo->dest, //destination (SOCKADDR *)&pInfo->dest, //destination
sizeof(pInfo->dest)); //address length sizeof(pInfo->dest)); //address length
@ -598,7 +598,7 @@ Cleanup(PAPPINFO pInfo)
0, 0,
pInfo->SendPacket); pInfo->SendPacket);
if (pInfo->SendPacket) if (pInfo->RecvPacket)
HeapFree(GetProcessHeap(), HeapFree(GetProcessHeap(),
0, 0,
pInfo->RecvPacket); pInfo->RecvPacket);

4
reactos/base/applications/network/tracert/tracert.h
View file

@ -13,7 +13,7 @@
#define TTL_EXCEEDED 11 #define TTL_EXCEEDED 11
#define MAX_PING_PACKET_SIZE 1024 #define MAX_PING_PACKET_SIZE 1024
#define MAX_PING_DATA_SIZE (MAX_PING_PACKET_SIZE + sizeof(IPv4Header) #define MAX_PING_DATA_SIZE (MAX_PING_PACKET_SIZE + sizeof(IPv4Header))
#define PACKET_SIZE 32 #define PACKET_SIZE 32
#define ICMP_MIN_SIZE 8 #define ICMP_MIN_SIZE 8
@ -53,8 +53,8 @@ typedef struct ICMPHeader
/* ICMP Echo Reply Header, 12 bytes */ /* ICMP Echo Reply Header, 12 bytes */
typedef struct EchoReplyHeader typedef struct EchoReplyHeader
{ {
struct ICMPHeader icmpheader;
struct timeval timestamp; struct timeval timestamp;
struct ICMPHeader icmpheader;
} ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER; } ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER;
/* ICMP Echo Reply Header, 12 bytes */ /* ICMP Echo Reply Header, 12 bytes */