RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:17:44 +00:00
Code Issues Activity Actions

ping: Account for raw sockets now receiving IPv4 headers

Browse source
This commit is contained in:
Andreas Kling 2020-10-31 11:38:00 +01:00
parent e06d8d94da
commit 778011dac6
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/ping.cpp
View file

@ -114,11 +114,17 @@ int main(int argc, char** argv)
char msg[64 - sizeof(struct icmphdr)]; char msg[64 - sizeof(struct icmphdr)];
}; };
struct PongPacket {
// FIXME: IPv4 headers are not actually fixed-size, handle other sizes.
char ip_header[20];
struct icmphdr header;
char msg[64 - sizeof(struct icmphdr)];
};
uint16_t seq = 1; uint16_t seq = 1;
for (;;) { for (;;) {
PingPacket ping_packet; PingPacket ping_packet;
PingPacket pong_packet;
memset(&ping_packet, 0, sizeof(PingPacket)); memset(&ping_packet, 0, sizeof(PingPacket));
ping_packet.header.type = 8; // Echo request ping_packet.header.type = 8; // Echo request
@ -142,8 +148,9 @@ int main(int argc, char** argv)
} }
for (;;) { for (;;) {
PongPacket pong_packet;
socklen_t peer_address_size = sizeof(peer_address); socklen_t peer_address_size = sizeof(peer_address);
rc = recvfrom(fd, &pong_packet, sizeof(PingPacket), 0, (struct sockaddr*)&peer_address, &peer_address_size); rc = recvfrom(fd, &pong_packet, sizeof(PongPacket), 0, (struct sockaddr*)&peer_address, &peer_address_size);
if (rc < 0) { if (rc < 0) {
if (errno == EAGAIN) { if (errno == EAGAIN) {
printf("Request (seq=%u) timed out.\n", ntohs(ping_packet.header.un.echo.sequence)); printf("Request (seq=%u) timed out.\n", ntohs(ping_packet.header.un.echo.sequence));