X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Fipv4.c;h=11cbc1524578ce65affdfc7fa8ee338e09dc2834;hb=73c3cf615a9cae10446661133fd4dd16ae5bcdfe;hp=d5c2f965b630a63f29aada1e05d6de6c69109389;hpb=849329d50395b44ac97c5b5145fc2df0749eace2;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/ipv4.c b/KernelLand/Modules/IPStack/ipv4.c
index d5c2f965..11cbc152 100644
--- a/KernelLand/Modules/IPStack/ipv4.c
+++ b/KernelLand/Modules/IPStack/ipv4.c
@@ -8,13 +8,16 @@
 #include "ipv4.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();
@@ -117,8 +120,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;
 }
@@ -180,15 +185,21 @@ 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]
 		);
+	#endif
 	
 	// Get Data and Data Length
 	dataLength = ntohs(hdr->TotalLength) - sizeof(tIPv4Header);
 	data = &hdr->Options[0];
+
+	// Populate ARP cache from sniffing.
+	// - Downside: Poisoning, polluting from routed packets
+	//ARP_UpdateCache4(hdr->Source, From);
 	
 	// Get Interface (allowing broadcasts)
 	iface = IPv4_GetInterface(Adapter, hdr->Destination, 1);
@@ -230,9 +241,12 @@ 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 ) {
@@ -257,9 +271,14 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 			((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
 		
 		return ;
 	}
+
+	// Populate ARP cache from recieved packets
+	// - Should be safe
+	ARP_UpdateCache4(hdr->Source, From);
 	
 	// Send it on
 	if( !gaIPv4_Callbacks[hdr->Protocol] ) {
@@ -279,7 +298,7 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
  */
 tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
 {
-	tInterface	*iface = NULL;
+	tInterface	*iface = NULL, *zero_iface = NULL;
 	Uint32	netmask;
 	Uint32	addr, this;
 
@@ -297,7 +316,20 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
 			LEAVE('p', iface);
 			return iface;
 		}
-		
+
+		LOG("iface->Address = 0x%x", *(Uint32*)iface->Address);
+
+		if( *(Uint32*)iface->Address == 0 ) {
+			if( zero_iface ) {
+				Log_Notice("IPv4", "Multiple 0.0.0.0 interfaces on the same adapter, ignoring");
+			}
+			else {
+				zero_iface = iface;
+				LOG("Zero IF %p", iface);
+			}
+			continue ;
+		}		
+
 		if( !Broadcast )	continue;
 		
 		// Check for broadcast
@@ -312,6 +344,17 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
 			return iface;
 		}
 	}
+
+	// Special case for intefaces that are being DHCP configured
+	// - If the interface address is 0.0.0.0, then if there is no match for the
+	//   destination the packet is treated as if it was addressed to 0.0.0.0
+	if( zero_iface && Broadcast )
+	{
+		LOG("Using 0.0.0.0 interface with magic!");
+		LEAVE('p', zero_iface);
+		return zero_iface;
+	}
+
 	LEAVE('n');
 	return NULL;
 }