Sint64 LastUsed;
} *gaARP_Cache4;
int giARP_Cache4Space;
-tSpinlock glARP_Cache4;
+tMutex glARP_Cache4;
struct sARP_Cache6 {
tIPv6 IP;
tMacAddr MAC;
Sint64 LastUsed;
} *gaARP_Cache6;
int giARP_Cache6Space;
-tSpinlock glARP_Cache6;
+tMutex glARP_Cache6;
int giARP_LastUpdateID = 0;
// === CODE ===
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;
// 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],
LEAVE('-');
return gaARP_Cache4[i].MAC;
}
- RELEASE( &glARP_Cache4 );
+ Mutex_Release( &glARP_Cache4 );
lastID = giARP_LastUpdateID;
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 );
}
}
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) {
gaARP_Cache4[i].MAC = HWAddr;
gaARP_Cache4[i].LastUpdate = now();
giARP_LastUpdateID ++;
- RELEASE(&glARP_Cache4);
+ Mutex_Release(&glARP_Cache4);
}
/**
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) {
gaARP_Cache6[i].IP = SWAddr;
gaARP_Cache6[i].LastUpdate = now();
giARP_LastUpdateID ++;
- RELEASE(&glARP_Cache6);
+ Mutex_Release(&glARP_Cache6);
}
/**
tInterface *iface;
// Sanity Check Packet
- if( Length < sizeof(tArpRequest4) ) {
+ if( Length < (int)sizeof(tArpRequest4) ) {
Log_Log("ARP", "Recieved undersized packet");
return ;
}
if( ntohs(req4->Type) != 0x0800 ) {
- Log_Log("ARP", "Recieved a packet with a bad type 0x%x", ntohs(req4->Type));
+ Log_Log("ARP", "Recieved a packet with a bad type (0x%x)", ntohs(req4->Type));
return ;
}
if( req4->HWSize != 6 ) {
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",
+ //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]);
- Log_Debug("ARP", "from %i.%i.%i.%i",
+ req4->DestIP.B[3],
req4->SourceIP.B[0], req4->SourceIP.B[1],
req4->SourceIP.B[2], req4->SourceIP.B[3]);
iface = IPv4_GetInterface(Adapter, req4->DestIP, 0);
req4->SourceIP = iface->IP4.Address;
req4->SourceMac = Adapter->MacAddr;
req4->Request = htons(2);
- Log_Debug("ARP", "Hey, That's us!");
- Log_Debug("ARP", "Sending back %02x:%02x:%02x:%02x:%02x:%02x",
+ Log_Debug("ARP", "Sending back us (%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]);
}
break;
case 6:
- if( Length < sizeof(tArpRequest6) ) {
- Log_Debug("ARP", "Recieved undersized packet (IPv6)");
+ if( Length < (int)sizeof(tArpRequest6) ) {
+ Log_Log("ARP", "Recieved undersized packet (IPv6)");
return ;
}
+ Log_Debug("ARP", "ARP Request IPv6 Address %08x:%08x:%08x:%08x",
+ ntohl(req6->DestIP.L[0]), ntohl(req6->DestIP.L[1]),
+ ntohl(req6->DestIP.L[2]), ntohl(req6->DestIP.L[3])
+ );
iface = IPv6_GetInterface(Adapter, req6->DestIP, 0);
if( iface )
{
req6->SourceIP = iface->IP6.Address;
req6->SourceMac = Adapter->MacAddr;
req6->Request = htons(2);
+ Log_Debug("ARP", "Sending back us (%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]);
Link_SendPacket(Adapter, 0x0806, req6->DestMac, sizeof(tArpRequest6), req6);
}
break;
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 ;
}
break;
default:
- Warning("[ARP ] Unknown Request ID %i", ntohs(req4->Request));
+ Log_Warning("ARP", "Unknown Request ID %i", ntohs(req4->Request));
break;
}
}