X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Farp.c;h=d1d50cdaf07aa90a2f2e8524a6da7835addc5e4e;hb=de6091a10d2cdded5e58f25ba3e3db7db726d01d;hp=43c34256446a089aff96288786436b5f920e7b17;hpb=2db551c69841b4fb5a70ae05e08d54b1a016364b;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/arp.c b/KernelLand/Modules/IPStack/arp.c
index 43c34256..d1d50cda 100644
--- a/KernelLand/Modules/IPStack/arp.c
+++ b/KernelLand/Modules/IPStack/arp.c
@@ -16,6 +16,20 @@
 #define	ARP_CACHE_SIZE	128
 #define	ARP_MAX_AGE		(60*60*1000)	// 1Hr
 
+typedef struct sARP_CacheEnt
+{
+	void	*Layer3Addr;
+	tMacAddr	L2Addr;
+	Sint64	LastUpdate;
+	Sint64	LastUsed;
+} tARP_CacheEnt;
+typedef struct sARP_Cache
+{
+	size_t	AddrSize;
+	 int	nCacheEnts;
+	tARP_CacheEnt	Cache[];
+} tARP_Cache;
+
 // === IMPORTS ===
 extern tInterface	*IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast);
 #if ARPv6
@@ -28,6 +42,7 @@ tMacAddr	ARP_Resolve4(tInterface *Interface, tIPv4 Address);
 void	ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffer);
 
 // === GLOBALS ===
+ int	giARP_WaitingThreads;
 struct sARP_Cache4 {
 	tIPv4	IP;
 	tMacAddr	MAC;
@@ -37,7 +52,6 @@ struct sARP_Cache4 {
  int	giARP_Cache4Space;
 tMutex	glARP_Cache4;
 tSemaphore	gARP_Cache4Semaphore;
- int	giARP_WaitingThreads;
 #if ARPv6
 struct sARP_Cache6 {
 	tIPv6	IP;
@@ -50,6 +64,24 @@ tMutex	glARP_Cache6;
 #endif
 
 // === CODE ===
+tARP_Cache *ARP_int_CreateCache(unsigned int NumCacheEntries, size_t AddrSize)
+{
+	size_t	len = sizeof(tARP_Cache) + NumCacheEntries * (sizeof(tARP_CacheEnt) + AddrSize);
+	tARP_Cache	*ret = calloc(len, 1);
+	
+	ret->nCacheEnts = NumCacheEntries;
+	ret->AddrSize = AddrSize;
+	
+	char	*addr_storage_pos = (void*)&ret->Cache[NumCacheEntries];
+	
+	for( int i = 0; i < NumCacheEntries; i ++ )
+	{
+		ret->Cache[i].Layer3Addr = addr_storage_pos;
+		addr_storage_pos += AddrSize;
+	}
+	
+	return ret;
+}
 /**
  * \fn int ARP_Initialise()
  * \brief Initalise the ARP section
@@ -67,9 +99,26 @@ int ARP_Initialise()
 	#endif
 	
 	Link_RegisterType(0x0806, ARP_int_GetPacket);
+	Semaphore_Init(&gARP_Cache4Semaphore, 0, 0, "ARP4", "Cache Changes");
 	return 1;
 }
 
+tMacAddr ARP_Resolve(tInterface *Interface, void *Address)
+{
+	switch(Interface->Type)
+	{
+	case AF_INET4:
+		return ARP_Resolve4(Interface, *(tIPv4*)Address);
+//	case AF_INET6:
+//		ret = ARP_int_CacheLookup(Interface, 16, Address);
+//		if(ret == cMAC_ZERO) {
+//			// TODO: Send ICMPv6 ND requests
+//		}
+//		return ret;
+	}
+	return cMAC_ZERO;
+}
+
 /**
  * \brief Resolves a MAC address from an IPv4 address
  */
@@ -171,6 +220,7 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 			Log_Log("ARP4", "Timeout");
 			break;
 		}
+		Log_Debug("ARP4", "Cache change");
 		
 		Mutex_Acquire( &glARP_Cache4 );
 		for( i = 0; i < giARP_Cache4Space; i++ )
@@ -219,17 +269,20 @@ void ARP_UpdateCache4(tIPv4 SWAddr, tMacAddr HWAddr)
 		else
 			i = oldest;
 	}
-	
-	Log_Log("ARP4", "Caching %i.%i.%i.%i (%02x:%02x:%02x:%02x:%02x:%02x) in %i",
-		SWAddr.B[0], SWAddr.B[1], SWAddr.B[2], SWAddr.B[3],
-		HWAddr.B[0], HWAddr.B[1], HWAddr.B[2], HWAddr.B[3], HWAddr.B[4], HWAddr.B[5],
-		i
-		);
+
+	if( memcmp(&gaARP_Cache4[i].MAC, &HWAddr, sizeof(HWAddr)) != 0 )
+	{
+		Log_Log("ARP4", "Caching %i.%i.%i.%i (%02x:%02x:%02x:%02x:%02x:%02x) in %i",
+			SWAddr.B[0], SWAddr.B[1], SWAddr.B[2], SWAddr.B[3],
+			HWAddr.B[0], HWAddr.B[1], HWAddr.B[2], HWAddr.B[3], HWAddr.B[4], HWAddr.B[5],
+			i
+			);
 		
-	gaARP_Cache4[i].IP = SWAddr;
-	gaARP_Cache4[i].MAC = HWAddr;
-	gaARP_Cache4[i].LastUpdate = now();
-	Semaphore_Signal(&gARP_Cache4Semaphore, giARP_WaitingThreads);
+		gaARP_Cache4[i].IP = SWAddr;
+		gaARP_Cache4[i].MAC = HWAddr;
+		gaARP_Cache4[i].LastUpdate = now();
+		Semaphore_Signal(&gARP_Cache4Semaphore, giARP_WaitingThreads);
+	}
 	Mutex_Release(&glARP_Cache4);
 }