// === PROTOTYPES ===
int ARP_Initialise();
- int ARP_int_Resolve4(tInterface *Interface, tIPv4 Address);
+tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address);
void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffer);
// === GLOBALS ===
{
int lastID;
int i;
+ struct sArpRequest4 req;
ENTER("pInterface xAddress", Interface, Address);
RELEASE( &glARP_Cache4 );
lastID = giARP_LastUpdateID;
- ARP_int_Resolve4(Interface, Address);
+
+ // Create request
+ Log_Log("ARP4", "Asking for address %i.%i.%i.%i",
+ Address.B[0], Address.B[1], Address.B[2], Address.B[3]
+ );
+ req.HWType = htons(0x0001); // Ethernet
+ req.Type = htons(0x0800);
+ req.HWSize = 6;
+ req.SWSize = 4;
+ req.Request = htons(1);
+ req.SourceMac = Interface->Adapter->MacAddr;
+ req.SourceIP = Interface->IP4.Address;
+ req.DestMac = cMAC_BROADCAST;
+ req.DestIP = Address;
+
+ // Send Request
+ Link_SendPacket(Interface->Adapter, 0x0806, req.DestMac, sizeof(struct sArpRequest4), &req);
+
+ // Wait for a reply
for(;;)
{
while(lastID == giARP_LastUpdateID) Threads_Yield();
}
}
-/**
- * \fn int ARP_int_Resolve4(tInterface *Interface, tIPv4 Address)
- * \brief Request the network to resolve an IPv4 Address
- * \return Boolean Success
- */
-int ARP_int_Resolve4(tInterface *Interface, tIPv4 Address)
-{
- struct sArpRequest4 req;
-
- Log("[ARP4 ] Asking for address %i.%i.%i.%i",
- Address.B[0], Address.B[1], Address.B[2], Address.B[3]
- );
- req.HWType = htons(0x100); // Ethernet
- req.Type = htons(0x0800);
- req.HWSize = 6;
- req.SWSize = 4;
- req.Request = htons(1);
- req.SourceMac = Interface->Adapter->MacAddr;
- req.SourceIP = Interface->IP4.Address;
- req.DestMac = cMAC_BROADCAST;
- req.DestIP = Address;
-
- Link_SendPacket(Interface->Adapter, 0x0806, req.DestMac, sizeof(struct sArpRequest4), &req);
-
- return 0;
-}
-
/**
* \brief Updates the ARP Cache entry for an IPv4 Address
*/
gaARP_Cache4[i].IP = SWAddr;
}
+ 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].MAC = HWAddr;
gaARP_Cache4[i].LastUpdate = now();
+ giARP_LastUpdateID ++;
RELEASE(&glARP_Cache4);
}
gaARP_Cache6[i].IP = SWAddr;
gaARP_Cache6[i].LastUpdate = now();
+ giARP_LastUpdateID ++;
RELEASE(&glARP_Cache6);
}
// Sanity Check Packet
if( Length < sizeof(tArpRequest4) ) {
- Log("[ARP ] Recieved undersized packet");
+ Log_Log("ARP", "Recieved undersized packet");
return ;
}
if( ntohs(req4->Type) != 0x0800 ) {
- 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 ) {
- Log("[ARP ] Recieved a packet with HWSize != 6 (%i)", req4->HWSize);
+ Log_Log("ARP", "Recieved a packet with HWSize != 6 (%i)", req4->HWSize);
return;
}
+ #if ARP_DETECT_SPOOFS
if( !MAC_EQU(req4->SourceMac, From) ) {
- Log("[ARP ] ARP spoofing detected", req4->HWSize);
+ Log_Log("ARP", "ARP spoofing detected "
+ "(%02x%02x:%02x%02x:%02x%02x != %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],
+ From.B[0], From.B[1], From.B[2],
+ From.B[3], From.B[4], From.B[5]
+ );
return;
}
+ #endif
- Log("[ARP ] Request ID %i", ntohs(req4->Request));
+ Log_Debug("ARP", "Request ID %i", ntohs(req4->Request));
switch( ntohs(req4->Request) )
{
case 1: // You want my IP?
- Log("[ARP ] ARP Request Address class %i", req4->SWSize);
+ Log_Debug("ARP", "ARP Request Address class %i", req4->SWSize);
// Check what type of IP it is
switch( req4->SWSize )
{
case 4:
- Log("[ARP ] From MAC %02x:%02x:%02x:%02x:%02x:%02x",
+ 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("[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("[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("[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);
if( iface )
{
- Log("[ARP ] Caching sender's IP Address");
+ Log_Debug("ARP", "Caching sender's IP Address");
ARP_UpdateCache4(req4->SourceIP, req4->SourceMac);
req4->DestIP = req4->SourceIP;
req4->SourceIP = iface->IP4.Address;
req4->SourceMac = Adapter->MacAddr;
req4->Request = htons(2);
- Log("[ARP ] Hey, That's us!");
- Log("[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("[ARP ] Recieved undersized packet (IPv6)");
+ 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;
default:
- Log("[ARP ] Unknown Protocol Address size (%i)", req4->SWSize);
+ Log_Debug("ARP", "Unknown Protocol Address size (%i)", req4->SWSize);
return ;
}
break;
case 6:
if( Length < sizeof(tArpRequest6) ) {
- Log("[ARP ] Recieved undersized packet (IPv6)");
+ Log_Debug("ARP", "Recieved undersized packet (IPv6)");
return ;
}
ARP_UpdateCache6( req6->SourceIP, From );
break;
default:
- Log("[ARP ] Unknown Protocol Address size (%i)", req4->SWSize);
+ Log_Debug("ARP", "Unknown Protocol Address size (%i)", req4->SWSize);
return ;
}
break;
+
+ default:
+ Log_Warning("ARP", "Unknown Request ID %i", ntohs(req4->Request));
+ break;
}
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au