Replace some sizeofs with SerializedLengths

src/net-ethernet.h

@@ -19,6 +19,10 @@ struct EthernetFrameHeader
 		macDestination(macDestination), macSource(macSource), type(type)
 	{}
 
+	constexpr static std::size_t SerializedLength()
+	{
+		return sizeof(EthernetFrameHeader);
+	}
 
 	std::size_t Serialize(uint8_t* buffer)
 	{

src/net-tftp.cpp

@@ -94,7 +94,7 @@ static std::unique_ptr<TftpPacket> handleTftpData(const uint8_t* data, size_t le
 		return std::unique_ptr<TftpErrorPacket>(new TftpErrorPacket(0, "io error"));
 	}
 
-	if (packet.data.size() < 512)
+	if (packet.data.size() < TFTP_BLOCK_SIZE)
 	{
 		// Close the file for the last packet.
 		f_close(&outFile);

src/net.cpp

@@ -15,7 +15,8 @@
 //
 // ARP
 //
-void SendArpPacket(ArpOperation operation,
+void SendArpPacket(
+	ArpOperation operation,
 	MacAddress targetMac,
 	MacAddress senderMac,
 	uint32_t targetIp,
@@ -36,18 +37,14 @@ void SendArpPacket(ArpOperation operation,
 	USPiSendFrame(buffer, size);
 }
 
-void SendArpRequest(MacAddress targetMac,
+void SendArpRequest(
-					MacAddress senderMac,
+	MacAddress targetMac, MacAddress senderMac, uint32_t targetIp, uint32_t senderIp)
-					uint32_t targetIp,
-					uint32_t senderIp)
 {
 	SendArpPacket(ARP_OPERATION_REQUEST, targetMac, senderMac, targetIp, senderIp);
 }
 
-void SendArpReply(MacAddress targetMac,
+void SendArpReply(
-					MacAddress senderMac,
+	MacAddress targetMac, MacAddress senderMac, uint32_t targetIp, uint32_t senderIp)
-					uint32_t targetIp,
-					uint32_t senderIp)
 {
 	SendArpPacket(ARP_OPERATION_REPLY, targetMac, senderMac, targetIp, senderIp);
 }
@@ -116,11 +113,12 @@ void HandleUdpFrame(const uint8_t* buffer)
 	const auto header = frame.payload.payload;
 
 	uint8_t* data = (uint8_t*)malloc(header.length);
-	memcpy(
+	const auto size =
-		data,
+		buffer +
-		buffer + sizeof(EthernetFrameHeader) + sizeof(Ipv4Header) + sizeof(UdpDatagramHeader),
+		EthernetFrameHeader::SerializedLength() +
-		header.length
+		Ipv4Header::SerializedLength() +
-	);
+		UdpDatagramHeader::SerializedLength();
+	memcpy(data, size, header.length);
 
 	if (header.destinationPort == 69) // nice
 	{