X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Farp.c;h=f96c2d85a6f8788eda4fe76b02914762dec16d7a;hb=7d881c2e5fef91a6570e46ef69a5d4a5cf0e8b4d;hp=fab74f8504117abab67cbe5f9a596a80a20bc795;hpb=be53e78f163ec7e0e5271d41650476bf5e1de571;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/arp.c b/Modules/IPStack/arp.c
index fab74f85..f96c2d85 100644
--- a/Modules/IPStack/arp.c
+++ b/Modules/IPStack/arp.c
@@ -27,7 +27,7 @@ struct sARP_Cache4 {
 	Sint64	LastUsed;
 }	*gaARP_Cache4;
  int	giARP_Cache4Space;
-tSpinlock	glARP_Cache4;
+tMutex	glARP_Cache4;
 struct sARP_Cache6 {
 	tIPv6	IP;
 	tMacAddr	MAC;
@@ -35,7 +35,7 @@ struct sARP_Cache6 {
 	Sint64	LastUsed;
 }	*gaARP_Cache6;
  int	giARP_Cache6Space;
-tSpinlock	glARP_Cache6;
+tMutex	glARP_Cache6;
  int	giARP_LastUpdateID = 0;
 
 // === CODE ===
@@ -68,7 +68,7 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 	
 	ENTER("pInterface xAddress", Interface, Address);
 	
-	LOCK( &glARP_Cache4 );
+	Mutex_Acquire( &glARP_Cache4 );
 	for( i = 0; i < giARP_Cache4Space; i++ )
 	{
 		if(gaARP_Cache4[i].IP.L != Address.L)	continue;
@@ -76,7 +76,7 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 		// Check if the entry needs to be refreshed
 		if( now() - gaARP_Cache4[i].LastUpdate > ARP_MAX_AGE )	break;
 		
-		RELEASE( &glARP_Cache4 );
+		Mutex_Release( &glARP_Cache4 );
 		LOG("Return %x:%x:%x:%x:%x:%x",
 			gaARP_Cache4[i].MAC.B[0], gaARP_Cache4[i].MAC.B[1],
 			gaARP_Cache4[i].MAC.B[2], gaARP_Cache4[i].MAC.B[3],
@@ -85,7 +85,7 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 		LEAVE('-');
 		return gaARP_Cache4[i].MAC;
 	}
-	RELEASE( &glARP_Cache4 );
+	Mutex_Release( &glARP_Cache4 );
 	
 	lastID = giARP_LastUpdateID;
 	
@@ -112,15 +112,15 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 		while(lastID == giARP_LastUpdateID)	Threads_Yield();
 		lastID = giARP_LastUpdateID;
 		
-		LOCK( &glARP_Cache4 );
+		Mutex_Acquire( &glARP_Cache4 );
 		for( i = 0; i < giARP_Cache4Space; i++ )
 		{
 			if(gaARP_Cache4[i].IP.L != Address.L)	continue;
 			
-			RELEASE( &glARP_Cache4 );
+			Mutex_Release( &glARP_Cache4 );
 			return gaARP_Cache4[i].MAC;
 		}
-		RELEASE( &glARP_Cache4 );
+		Mutex_Release( &glARP_Cache4 );
 	}
 }
 
@@ -134,7 +134,7 @@ void ARP_UpdateCache4(tIPv4 SWAddr, tMacAddr HWAddr)
 	 int	oldest = 0;
 	
 	// Find an entry for the IP address in the cache
-	LOCK(&glARP_Cache4);
+	Mutex_Acquire(&glARP_Cache4);
 	for( i = giARP_Cache4Space; i--; )
 	{
 		if(gaARP_Cache4[oldest].LastUpdate > gaARP_Cache4[i].LastUpdate) {
@@ -161,7 +161,7 @@ void ARP_UpdateCache4(tIPv4 SWAddr, tMacAddr HWAddr)
 	gaARP_Cache4[i].MAC = HWAddr;
 	gaARP_Cache4[i].LastUpdate = now();
 	giARP_LastUpdateID ++;
-	RELEASE(&glARP_Cache4);
+	Mutex_Release(&glARP_Cache4);
 }
 
 /**
@@ -174,7 +174,7 @@ void ARP_UpdateCache6(tIPv6 SWAddr, tMacAddr HWAddr)
 	 int	oldest = 0;
 	
 	// Find an entry for the MAC address in the cache
-	LOCK(&glARP_Cache6);
+	Mutex_Acquire(&glARP_Cache6);
 	for( i = giARP_Cache6Space; i--; )
 	{
 		if(gaARP_Cache6[oldest].LastUpdate > gaARP_Cache6[i].LastUpdate) {
@@ -195,7 +195,7 @@ void ARP_UpdateCache6(tIPv6 SWAddr, tMacAddr HWAddr)
 	gaARP_Cache6[i].IP = SWAddr;
 	gaARP_Cache6[i].LastUpdate = now();
 	giARP_LastUpdateID ++;
-	RELEASE(&glARP_Cache6);
+	Mutex_Release(&glARP_Cache6);
 }
 
 /**
@@ -209,7 +209,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
 	tInterface	*iface;
 	
 	// Sanity Check Packet
-	if( Length < sizeof(tArpRequest4) ) {
+	if( Length < (int)sizeof(tArpRequest4) ) {
 		Log_Log("ARP", "Recieved undersized packet");
 		return ;
 	}
@@ -276,7 +276,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
 			}
 			break;
 		case 6:
-			if( Length < sizeof(tArpRequest6) ) {
+			if( Length < (int)sizeof(tArpRequest6) ) {
 				Log_Log("ARP", "Recieved undersized packet (IPv6)");
 				return ;
 			}
@@ -314,7 +314,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
 			ARP_UpdateCache4( req4->SourceIP, From );
 			break;
 		case 6:
-			if( Length < sizeof(tArpRequest6) ) {
+			if( Length < (int)sizeof(tArpRequest6) ) {
 				Log_Debug("ARP", "Recieved undersized packet (IPv6)");
 				return ;
 			}