X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Fipv4.c;h=000fe3966381c15393074d029408a5326ce31e30;hb=0c2915f7f306013a29fc79ed69039eae3a26f337;hp=36e2200bd89a0b2ef84f16793a851113cf51a0dc;hpb=4a6768100fb6328a1b88eed5372eaeb4c162399d;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/ipv4.c b/KernelLand/Modules/IPStack/ipv4.c
index 36e2200b..000fe396 100644
--- a/KernelLand/Modules/IPStack/ipv4.c
+++ b/KernelLand/Modules/IPStack/ipv4.c
@@ -6,16 +6,17 @@
 #include "ipstack.h"
 #include "link.h"
 #include "ipv4.h"
+#include "hwaddr_cache.h"
 #include "firewall.h"
 
+// === CONSTANTS ===
 #define DEFAULT_TTL	32
+#define IPV4_TRACE	1	// set to 1 to enable packet tracing
 
 // === IMPORTS ===
 extern tInterface	*gIP_Interfaces;
 extern void	ICMP_Initialise();
 extern  int	ICMP_Ping(tInterface *Interface, tIPv4 Addr);
-extern tMacAddr	ARP_Resolve4(tInterface *Interface, tIPv4 Address);
-extern void	ARP_UpdateCache4(tIPv4 SWAddr, tMacAddr HWAddr);
 
 // === PROTOTYPES ===
  int	IPv4_Initialise();
@@ -72,7 +73,7 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, tIPS
 	length = IPStack_Buffer_GetLength(Buffer);
 	
 	// --- Resolve destination MAC address
-	to = ARP_Resolve4(Iface, Address);
+	to = HWCache_Resolve(Iface, &Address);
 	if( MAC_EQU(to, cMAC_ZERO) ) {
 		// No route to host
 		Log_Notice("IPv4", "No route to host %i.%i.%i.%i",
@@ -118,8 +119,10 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, tIPS
 
 	IPStack_Buffer_AppendSubBuffer(Buffer, sizeof(tIPv4Header), 0, &hdr, NULL, NULL);
 
+	#if IPV4_TRACE
 	Log_Log("IPv4", "Sending packet to %i.%i.%i.%i",
 		Address.B[0], Address.B[1], Address.B[2], Address.B[3]);
+	#endif
 	Link_SendPacket(Iface->Adapter, IPV4_ETHERNET_ID, to, Buffer);
 	return 1;
 }
@@ -181,13 +184,13 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	
 	// TODO: Handle packet fragmentation
 	
-	Log_Debug("IPv4", " From %i.%i.%i.%i to %i.%i.%i.%i",
+	#if IPV4_TRACE
+	Log_Debug("IPv4", "Proto 0x%x From %i.%i.%i.%i to %i.%i.%i.%i",
+		hdr->Protocol,
 		hdr->Source.B[0], hdr->Source.B[1], hdr->Source.B[2], hdr->Source.B[3],
 		hdr->Destination.B[0], hdr->Destination.B[1], hdr->Destination.B[2], hdr->Destination.B[3]
 		);
-
-	// TODO: Tell ARP?
-	ARP_UpdateCache4(hdr->Source, From);
+	#endif
 	
 	// Get Data and Data Length
 	dataLength = ntohs(hdr->TotalLength) - sizeof(tIPv4Header);
@@ -207,6 +210,13 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	}
 	else {
 		// Routed packets
+		// Drop the packet if the TTL is zero
+		if( hdr->TTL == 0 ) {
+			Log_Warning("IPv4", "TODO: Send ICMP-Timeout when TTL exceeded");
+			return ;
+		}
+		hdr->TTL --;
+
 		ret = IPTables_TestChain("FORWARD",
 			4, &hdr->Source, &hdr->Destination,
 			hdr->Protocol, 0,
@@ -233,40 +243,16 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	// Routing
 	if(!iface)
 	{
-		#if 0
-		tMacAddr	to;
-		tRoute	*rt;
-	
-
-		// TODO: Put this in another thread to avoid delays in the RX thread	
-		Log_Debug("IPv4", "Route the packet");
-		// Drop the packet if the TTL is zero
-		if( hdr->TTL == 0 ) {
-			Log_Warning("IPv4", "TODO: Send ICMP-Timeout when TTL exceeded");
-			return ;
-		}
-		
-		hdr->TTL --;
-		
-		rt = IPStack_FindRoute(4, NULL, &hdr->Destination);	// Get the route (gets the interface)
-		if( !rt || !rt->Interface )
-			return ;
-		to = ARP_Resolve4(rt->Interface, hdr->Destination);	// Resolve address
-		if( MAC_EQU(to, cMAC_ZERO) )
-			return ;
-		
-		// Send packet
-		Log_Log("IPv4", "Forwarding packet to %i.%i.%i.%i (via %i.%i.%i.%i)",
-			hdr->Destination.B[0], hdr->Destination.B[1],
-			hdr->Destination.B[2], hdr->Destination.B[3],
-			((tIPv4*)rt->NextHop)->B[0], ((tIPv4*)rt->NextHop)->B[1],
-			((tIPv4*)rt->NextHop)->B[2], ((tIPv4*)rt->NextHop)->B[3]);
-		Log_Warning("IPv4", "TODO: Implement forwarding with tIPStackBuffer");
-//		Link_SendPacket(rt->Interface->Adapter, IPV4_ETHERNET_ID, to, Length, Buffer);
-		#endif
-		
+		//IPStack_RoutePacket(4, &hdr->Destination, Length, Buffer);
 		return ;
 	}
+
+	// Populate ARP cache from recieved packets
+	// - Should be safe
+	if( IPStack_CompareAddress(4, &hdr->Source, iface->Address, iface->SubnetBits) )
+	{
+		HWCache_Set(Adapter, 4, &hdr->Source, &From);
+	}
 	
 	// Send it on
 	if( !gaIPv4_Callbacks[hdr->Protocol] ) {
@@ -376,6 +362,7 @@ Uint32 IPv4_Netmask(int FixedBits)
  */
 Uint16 IPv4_Checksum(const void *Buf, size_t Length)
 {
+	//Debug_HexDump("IPv4_Checksum", Buf, Length);
 	const Uint16	*words = Buf;
 	Uint32	sum = 0;
 	 int	i;