mirror of
https://github.com/Fennix-Project/Kernel.git
synced 2025-07-13 16:29:21 +00:00
Fix type sizes
This commit is contained in:
@ -188,7 +188,7 @@ namespace NetworkARP
|
||||
delete Header, Header = nullptr;
|
||||
}
|
||||
|
||||
bool ARP::OnEthernetPacketReceived(uint8_t *Data, uint64_t Length)
|
||||
bool ARP::OnEthernetPacketReceived(uint8_t *Data, size_t Length)
|
||||
{
|
||||
UNUSED(Length);
|
||||
netdbg("Received packet");
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#include <net/net.hpp>
|
||||
|
||||
uint16_t CalculateChecksum(uint16_t *Data, uint64_t Length)
|
||||
uint16_t CalculateChecksum(uint16_t *Data, size_t Length)
|
||||
{
|
||||
uint16_t *Data16 = (uint16_t *)Data;
|
||||
uint64_t Checksum = 0;
|
||||
|
@ -153,7 +153,7 @@ namespace NetworkDHCP
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void DHCP::OnUDPPacketReceived(NetworkUDP::Socket *Socket, uint8_t *Data, uint64_t Length)
|
||||
void DHCP::OnUDPPacketReceived(NetworkUDP::Socket *Socket, uint8_t *Data, size_t Length)
|
||||
{
|
||||
UNUSED(Socket);
|
||||
UNUSED(Length);
|
||||
|
@ -43,7 +43,7 @@ namespace NetworkEthernet
|
||||
debug("Ethernet interface %#lx destroyed.", this);
|
||||
}
|
||||
|
||||
void Ethernet::Send(MediaAccessControl MAC, FrameType Type, uint8_t *Data, uint64_t Length)
|
||||
void Ethernet::Send(MediaAccessControl MAC, FrameType Type, uint8_t *Data, size_t Length)
|
||||
{
|
||||
netdbg("Sending frame type %#x to %s", Type, MAC.ToString());
|
||||
size_t PacketLength = sizeof(EthernetHeader) + Length;
|
||||
@ -60,7 +60,7 @@ namespace NetworkEthernet
|
||||
kfree(Packet);
|
||||
}
|
||||
|
||||
void Ethernet::Receive(uint8_t *Data, uint64_t Length)
|
||||
void Ethernet::Receive(uint8_t *Data, size_t Length)
|
||||
{
|
||||
EthernetPacket *Packet = (EthernetPacket *)Data;
|
||||
size_t PacketLength = Length - sizeof(EthernetHeader);
|
||||
@ -124,7 +124,7 @@ namespace NetworkEthernet
|
||||
}
|
||||
}
|
||||
|
||||
void Ethernet::OnInterfaceReceived(NetworkInterfaceManager::DeviceInterface *Interface, uint8_t *Data, uint64_t Length)
|
||||
void Ethernet::OnInterfaceReceived(NetworkInterfaceManager::DeviceInterface *Interface, uint8_t *Data, size_t Length)
|
||||
{
|
||||
if (Interface == this->Interface)
|
||||
this->Receive(Data, Length);
|
||||
|
@ -62,7 +62,7 @@ namespace NetworkICMPv6
|
||||
ICMPv6::ICMPv6(NetworkInterfaceManager::DeviceInterface *Interface) { this->Interface = Interface; }
|
||||
ICMPv6::~ICMPv6() {}
|
||||
|
||||
void ICMPv6::Send(uint8_t *Data, uint64_t Length)
|
||||
void ICMPv6::Send(uint8_t *Data, size_t Length)
|
||||
{
|
||||
UNUSED(Data);
|
||||
UNUSED(Length);
|
||||
|
@ -34,7 +34,7 @@ namespace NetworkIPv4
|
||||
debug("IPv4 interface %#lx destroyed.", this);
|
||||
}
|
||||
|
||||
void IPv4::Send(uint8_t *Data, uint64_t Length, uint8_t Protocol, InternetProtocol DestinationIP)
|
||||
void IPv4::Send(uint8_t *Data, size_t Length, uint8_t Protocol, InternetProtocol DestinationIP)
|
||||
{
|
||||
netdbg("Sending %ld bytes to %s", Length, DestinationIP.v4.ToStringLittleEndian());
|
||||
IPv4Packet *Packet = (IPv4Packet *)kmalloc(Length + sizeof(IPv4Header));
|
||||
@ -68,7 +68,7 @@ namespace NetworkIPv4
|
||||
|
||||
std::vector<IPv4Events *> RegisteredEvents;
|
||||
|
||||
bool IPv4::OnEthernetPacketReceived(uint8_t *Data, uint64_t Length)
|
||||
bool IPv4::OnEthernetPacketReceived(uint8_t *Data, size_t Length)
|
||||
{
|
||||
IPv4Packet *Packet = (IPv4Packet *)Data;
|
||||
netdbg("Received %d bytes [Protocol %ld]", Length, Packet->Header.Protocol);
|
||||
@ -82,7 +82,7 @@ namespace NetworkIPv4
|
||||
|
||||
if (b32(Packet->Header.DestinationIP) == Ethernet->GetInterface()->IP.v4.ToHex() || b32(Packet->Header.DestinationIP) == 0xFFFFFFFF || Ethernet->GetInterface()->IP.v4.ToHex() == 0)
|
||||
{
|
||||
uint64_t TotalLength = Packet->Header.TotalLength;
|
||||
size_t TotalLength = Packet->Header.TotalLength;
|
||||
if (TotalLength > Length)
|
||||
TotalLength = Length;
|
||||
|
||||
@ -127,7 +127,7 @@ namespace NetworkIPv4
|
||||
|
||||
IPv4Events::~IPv4Events()
|
||||
{
|
||||
for (uint64_t i = 0; i < RegisteredEvents.size(); i++)
|
||||
for (size_t i = 0; i < RegisteredEvents.size(); i++)
|
||||
if (RegisteredEvents[i] == this)
|
||||
{
|
||||
RegisteredEvents.remove(i);
|
||||
|
@ -210,7 +210,7 @@ namespace NetworkInterfaceManager
|
||||
NIManager->Receive(inf, Data, Size);
|
||||
}
|
||||
|
||||
void NetworkInterface::Send(DeviceInterface *Interface, uint8_t *Data, uint64_t Length)
|
||||
void NetworkInterface::Send(DeviceInterface *Interface, uint8_t *Data, size_t Length)
|
||||
{
|
||||
void *DataToBeSent = mem->RequestPages(TO_PAGES(Length + 1));
|
||||
memcpy(DataToBeSent, Data, Length);
|
||||
@ -226,7 +226,7 @@ namespace NetworkInterfaceManager
|
||||
var->OnInterfaceSent(Interface, Data, Length);
|
||||
}
|
||||
|
||||
void NetworkInterface::Receive(DeviceInterface *Interface, uint8_t *Data, uint64_t Length)
|
||||
void NetworkInterface::Receive(DeviceInterface *Interface, uint8_t *Data, size_t Length)
|
||||
{
|
||||
foreach (auto re in RegisteredEvents)
|
||||
re->OnInterfaceReceived(Interface, Data, Length);
|
||||
|
@ -88,8 +88,8 @@ namespace NetDbg
|
||||
|
||||
NETWORK_DEBUG() : NetworkInterfaceManager::Events(nullptr) { netdbg("NetworkDebugger initialized."); }
|
||||
~NETWORK_DEBUG() { netdbg("NetworkDebugger destroyed."); }
|
||||
void OnInterfaceReceived(NetworkInterfaceManager::DeviceInterface *Interface, uint8_t *Data, uint64_t Length) { DumpData("Received", Data, Length); }
|
||||
void OnInterfaceSent(NetworkInterfaceManager::DeviceInterface *Interface, uint8_t *Data, uint64_t Length) { DumpData("Sent", Data, Length); }
|
||||
void OnInterfaceReceived(NetworkInterfaceManager::DeviceInterface *Interface, uint8_t *Data, size_t Length) { DumpData("Received", Data, Length); }
|
||||
void OnInterfaceSent(NetworkInterfaceManager::DeviceInterface *Interface, uint8_t *Data, size_t Length) { DumpData("Sent", Data, Length); }
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
namespace NetworkNTP
|
||||
{
|
||||
void NTP::OnUDPPacketReceived(NetworkUDP::Socket *Socket, uint8_t *Data, uint64_t Length)
|
||||
void NTP::OnUDPPacketReceived(NetworkUDP::Socket *Socket, uint8_t *Data, size_t Length)
|
||||
{
|
||||
UNUSED(Socket);
|
||||
UNUSED(Length);
|
||||
@ -68,7 +68,7 @@ namespace NetworkNTP
|
||||
TaskManager->Sleep(1000);
|
||||
}
|
||||
|
||||
long UnixTimestamp = b32(this->NTPPacket.TransmitTimestamp[0]) - 2208988800;
|
||||
uint64_t UnixTimestamp = (b32(this->NTPPacket.TransmitTimestamp[0])) - 2208988800;
|
||||
debug("Unix time: %d", UnixTimestamp);
|
||||
return s_cst(int, UnixTimestamp);
|
||||
}
|
||||
|
@ -76,7 +76,7 @@ namespace NetworkUDP
|
||||
fixme("Not implemented.");
|
||||
}
|
||||
|
||||
void UDP::Send(Socket *Socket, uint8_t *Data, uint64_t Length)
|
||||
void UDP::Send(Socket *Socket, uint8_t *Data, size_t Length)
|
||||
{
|
||||
netdbg("Sending %d bytes to %s", Length, Socket->RemoteIP.v4.ToStringLittleEndian(), Socket->RemotePort);
|
||||
uint16_t TotalLength = s_cst(uint16_t, Length + sizeof(UDPHeader));
|
||||
@ -97,7 +97,7 @@ namespace NetworkUDP
|
||||
Socket->EventHandler = EventHandler;
|
||||
}
|
||||
|
||||
bool UDP::OnIPv4PacketReceived(InternetProtocol SourceIP, InternetProtocol DestinationIP, uint8_t *Data, uint64_t Length)
|
||||
bool UDP::OnIPv4PacketReceived(InternetProtocol SourceIP, InternetProtocol DestinationIP, uint8_t *Data, size_t Length)
|
||||
{
|
||||
netdbg("Received %d bytes from %s", Length, SourceIP.v4.ToStringLittleEndian());
|
||||
if (Length < sizeof(UDPHeader))
|
||||
|
Reference in New Issue
Block a user