int giARP_Cache6Space;
tMutex glARP_Cache6;
#endif
- int giARP_LastUpdateID = 0;
+volatile int giARP_LastUpdateID = 0;
// === CODE ===
/**
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);
- }
+ // If the next hop is defined, use it
+ // - 0.0.0.0 as the next hop means "no next hop / direct"
+ if( route && ((tIPv4*)route->NextHop)->L != 0 )
+ {
+ // Recursion: see /Recursion/
+ return ARP_Resolve4(Interface, *(tIPv4*)route->NextHop);
}
}
// Wait for a reply
for(;;)
{
- while(lastID == giARP_LastUpdateID && now() < timeout)
+ while(lastID == giARP_LastUpdateID && now() < timeout) {
Threads_Yield();
+ }
- if( now() >= timeout ) break; // Timeout
+ if( now() >= timeout ) {
+ Log_Log("ARP4", "Timeout");
+ break; // Timeout
+ }
lastID = giARP_LastUpdateID;
if(gaARP_Cache4[i].IP.L != Address.L) continue;
Mutex_Release( &glARP_Cache4 );
+ Log_Debug("ARP4", "Return %02x:%02x:%02x:%02x:%02x:%02x",
+ gaARP_Cache4[i].MAC.B[0], gaARP_Cache4[i].MAC.B[1],
+ gaARP_Cache4[i].MAC.B[2], gaARP_Cache4[i].MAC.B[3],
+ gaARP_Cache4[i].MAC.B[4], gaARP_Cache4[i].MAC.B[5]);
return gaARP_Cache4[i].MAC;
}
Mutex_Release( &glARP_Cache4 );
i = free;
else
i = oldest;
- gaARP_Cache4[i].IP = SWAddr;
}
Log_Log("ARP4", "Caching %i.%i.%i.%i (%02x:%02x:%02x:%02x:%02x:%02x) in %i",
i
);
+ gaARP_Cache4[i].IP = SWAddr;
gaARP_Cache4[i].MAC = HWAddr;
gaARP_Cache4[i].LastUpdate = now();
giARP_LastUpdateID ++;