|
@@ -185,7 +185,7 @@ void handle_icmp(const EthernetFrameHeader& eth, int frame_size)
|
|
LOCKER(socket->lock());
|
|
LOCKER(socket->lock());
|
|
if (socket->protocol() != (unsigned)IPv4Protocol::ICMP)
|
|
if (socket->protocol() != (unsigned)IPv4Protocol::ICMP)
|
|
continue;
|
|
continue;
|
|
- socket->did_receive(ByteBuffer::copy((const byte*)&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
|
|
|
|
+ socket->did_receive(ByteBuffer::copy(&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -244,7 +244,7 @@ void handle_udp(const EthernetFrameHeader& eth, int frame_size)
|
|
|
|
|
|
ASSERT(socket->type() == SOCK_DGRAM);
|
|
ASSERT(socket->type() == SOCK_DGRAM);
|
|
ASSERT(socket->source_port() == udp_packet.destination_port());
|
|
ASSERT(socket->source_port() == udp_packet.destination_port());
|
|
- socket->did_receive(ByteBuffer::copy((const byte*)&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
|
|
|
|
+ socket->did_receive(ByteBuffer::copy(&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
}
|
|
}
|
|
|
|
|
|
void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
|
|
void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
|
|
@@ -304,7 +304,7 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
|
|
kprintf("handle_tcp: Got FIN, payload_size=%u\n", payload_size);
|
|
kprintf("handle_tcp: Got FIN, payload_size=%u\n", payload_size);
|
|
|
|
|
|
if (payload_size != 0)
|
|
if (payload_size != 0)
|
|
- socket->did_receive(ByteBuffer::copy((const byte*)&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
|
|
|
|
+ socket->did_receive(ByteBuffer::copy(&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
|
|
|
|
socket->set_ack_number(tcp_packet.sequence_number() + payload_size + 1);
|
|
socket->set_ack_number(tcp_packet.sequence_number() + payload_size + 1);
|
|
socket->send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK);
|
|
socket->send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK);
|
|
@@ -323,5 +323,5 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
|
|
socket->send_tcp_packet(TCPFlags::ACK);
|
|
socket->send_tcp_packet(TCPFlags::ACK);
|
|
|
|
|
|
if (payload_size != 0)
|
|
if (payload_size != 0)
|
|
- socket->did_receive(ByteBuffer::copy((const byte*)&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
|
|
|
|
+ socket->did_receive(ByteBuffer::copy(&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
|
|
}
|
|
}
|