X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Modules%2FIPStack%2Farp.c;h=82382635872475bec621a4f8d7fc8cb5dec58a90;hb=11e9a26f9aa039eb2b4edcf55c1295e640b5999a;hp=d84b9187e6d05bf6a7b905ed8a3230ca30da44dc;hpb=2904567b1901a524d44a136f06f2e6d7b5ce7db5;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/arp.c b/Modules/IPStack/arp.c
index d84b9187..82382635 100644
--- a/Modules/IPStack/arp.c
+++ b/Modules/IPStack/arp.c
@@ -1,13 +1,14 @@
 /*
  * Acess2 IP Stack
  * - Address Resolution Protocol
+ * - Part of the IPv4 protocol
  */
 #define DEBUG	0
 #include "ipstack.h"
 #include "arp.h"
 #include "link.h"
 
-#define ARPv6	1
+#define ARPv6	0
 #define	ARP_CACHE_SIZE	64
 #define	ARP_MAX_AGE		(60*60*1000)	// 1Hr
 
@@ -72,9 +73,25 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 	 int	lastID;
 	 int	i;
 	struct sArpRequest4	req;
+	Sint64	timeout;
 	
 	ENTER("pInterface xAddress", Interface, Address);
 	
+	// Check routing tables if not on this subnet
+	if( IPStack_CompareAddress(4, &Address, Interface->Address, Interface->SubnetBits) == 0 )
+	{
+		tRoute	*route = IPStack_FindRoute(4, Interface, &Address);
+		if( route ) {
+			// If the next hop is defined, use it
+			// - 0.0.0.0 as the next hop means "no next hop / direct"
+			if( ((tIPv4*)route->NextHop)->L != 0 ) {
+				// Recursion: see /Recursion/
+				return ARP_Resolve4(Interface, *(tIPv4*)route->NextHop);
+			}
+		}
+	}
+	
+	// Check ARP Cache
 	Mutex_Acquire( &glARP_Cache4 );
 	for( i = 0; i < giARP_Cache4Space; i++ )
 	{
@@ -106,17 +123,23 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 	req.SWSize = 4;
 	req.Request = htons(1);
 	req.SourceMac = Interface->Adapter->MacAddr;
-	req.SourceIP = Interface->IP4.Address;
+	req.SourceIP = *(tIPv4*)Interface->Address;
 	req.DestMac = cMAC_BROADCAST;
 	req.DestIP = Address;
 	
 	// Send Request
 	Link_SendPacket(Interface->Adapter, 0x0806, req.DestMac, sizeof(struct sArpRequest4), &req);
 	
+	timeout = now() + Interface->TimeoutDelay;
+	
 	// Wait for a reply
 	for(;;)
 	{
-		while(lastID == giARP_LastUpdateID)	Threads_Yield();
+		while(lastID == giARP_LastUpdateID && now() < timeout)
+			Threads_Yield();
+		
+		if( now() >= timeout )	break;	// Timeout
+		
 		lastID = giARP_LastUpdateID;
 		
 		Mutex_Acquire( &glARP_Cache4 );
@@ -129,6 +152,10 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 		}
 		Mutex_Release( &glARP_Cache4 );
 	}
+	{
+		tMacAddr	ret = {{0,0,0,0,0,0}};
+		return ret;
+	}
 }
 
 /**
@@ -245,38 +272,30 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
 	}
 	#endif
 	
-	Log_Debug("ARP", "Request ID %i", ntohs(req4->Request));
-	
 	switch( ntohs(req4->Request) )
 	{
 	case 1:	// You want my IP?
-		Log_Debug("ARP", "ARP Request Address class %i", req4->SWSize);
 		// Check what type of IP it is
 		switch( req4->SWSize )
 		{
 		case 4:
-			Log_Debug("ARP", "From MAC %02x:%02x:%02x:%02x:%02x:%02x",
-				req4->SourceMac.B[0], req4->SourceMac.B[1],
-				req4->SourceMac.B[2], req4->SourceMac.B[3],
-				req4->SourceMac.B[4], req4->SourceMac.B[5]);
-			//Log_Debug("ARP", "to MAC %02x:%02x:%02x:%02x:%02x:%02x",
-			//	req4->DestMac.B[0], req4->DestMac.B[1],
-			//	req4->DestMac.B[2], req4->DestMac.B[3],
-			//	req4->DestMac.B[4], req4->DestMac.B[5]);
 			Log_Debug("ARP", "ARP Request IPv4 Address %i.%i.%i.%i from %i.%i.%i.%i",
 				req4->DestIP.B[0], req4->DestIP.B[1], req4->DestIP.B[2],
 				req4->DestIP.B[3],
 				req4->SourceIP.B[0], req4->SourceIP.B[1],
 				req4->SourceIP.B[2], req4->SourceIP.B[3]);
+			Log_Debug("ARP", " from MAC %02x:%02x:%02x:%02x:%02x:%02x",
+				req4->SourceMac.B[0], req4->SourceMac.B[1],
+				req4->SourceMac.B[2], req4->SourceMac.B[3],
+				req4->SourceMac.B[4], req4->SourceMac.B[5]);
 			iface = IPv4_GetInterface(Adapter, req4->DestIP, 0);
 			if( iface )
 			{
-				Log_Debug("ARP", "Caching sender's IP Address");
 				ARP_UpdateCache4(req4->SourceIP, req4->SourceMac);
 				
 				req4->DestIP = req4->SourceIP;
 				req4->DestMac = req4->SourceMac;
-				req4->SourceIP = iface->IP4.Address;
+				req4->SourceIP = *(tIPv4*)iface->Address;;
 				req4->SourceMac = Adapter->MacAddr;
 				req4->Request = htons(2);
 				Log_Debug("ARP", "Sending back us (%02x:%02x:%02x:%02x:%02x:%02x)",
@@ -301,7 +320,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
 			{
 				req6->DestIP = req6->SourceIP;
 				req6->DestMac = req6->SourceMac;
-				req6->SourceIP = iface->IP6.Address;
+				req6->SourceIP = *(tIPv6*)iface->Address;
 				req6->SourceMac = Adapter->MacAddr;
 				req6->Request = htons(2);
 				Log_Debug("ARP", "Sending back us (%02x:%02x:%02x:%02x:%02x:%02x)",