Kernel - Instruction tracing support

[tpg/acess2.git] / Modules / IPStack / arp.c

diff --git a/Modules/IPStack/arp.c b/Modules/IPStack/arp.c
index f96c2d8..1e5bb07 100644 (file)
--- a/Modules/IPStack/arp.c
+++ b/Modules/IPStack/arp.c
@@ -1,18 +1,22 @@
 /*
  * Acess2 IP Stack
  * - Address Resolution Protocol
+ * - Part of the IPv4 protocol
  */
 #define DEBUG  0
 #include "ipstack.h"
 #include "arp.h"
 #include "link.h"
 
+#define ARPv6  0
 #define        ARP_CACHE_SIZE  64
 #define        ARP_MAX_AGE             (60*60*1000)    // 1Hr
 
 // === IMPORTS ===
 extern tInterface      *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast);
+#if ARPv6
 extern tInterface      *IPv6_GetInterface(tAdapter *Adapter, tIPv6 Address, int Broadcast);
+#endif
 
 // === PROTOTYPES ===
  int   ARP_Initialise();
@@ -28,6 +32,7 @@ struct sARP_Cache4 {
 }      *gaARP_Cache4;
  int   giARP_Cache4Space;
 tMutex glARP_Cache4;
+#if ARPv6
 struct sARP_Cache6 {
        tIPv6   IP;
        tMacAddr        MAC;
@@ -36,6 +41,7 @@ struct sARP_Cache6 {
 }      *gaARP_Cache6;
  int   giARP_Cache6Space;
 tMutex glARP_Cache6;
+#endif
  int   giARP_LastUpdateID = 0;
 
 // === CODE ===
@@ -49,9 +55,11 @@ int ARP_Initialise()
        memset( gaARP_Cache4, 0, ARP_CACHE_SIZE * sizeof(struct sARP_Cache4) );
        giARP_Cache4Space = ARP_CACHE_SIZE;
        
+       #if ARPv6
        gaARP_Cache6 = malloc( ARP_CACHE_SIZE * sizeof(struct sARP_Cache6) );
        memset( gaARP_Cache6, 0, ARP_CACHE_SIZE * sizeof(struct sARP_Cache6) );
        giARP_Cache6Space = ARP_CACHE_SIZE;
+       #endif
        
        Link_RegisterType(0x0806, ARP_int_GetPacket);
        return 1;
@@ -65,9 +73,24 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
         int    lastID;
         int    i;
        struct sArpRequest4     req;
+       Sint64  timeout;
        
        ENTER("pInterface xAddress", Interface, Address);
        
+       // Check routing tables if not on this subnet
+       if( IPStack_CompareAddress(4, &Address, Interface->Address, Interface->SubnetBits) == 0 )
+       {
+               tRoute  *route = IPStack_FindRoute(4, Interface, &Address);
+               // 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);
+               }
+       }
+       
+       // Check ARP Cache
        Mutex_Acquire( &glARP_Cache4 );
        for( i = 0; i < giARP_Cache4Space; i++ )
        {
@@ -99,17 +122,23 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
        req.SWSize = 4;
        req.Request = htons(1);
        req.SourceMac = Interface->Adapter->MacAddr;
-       req.SourceIP = Interface->IP4.Address;
+       req.SourceIP = *(tIPv4*)Interface->Address;
        req.DestMac = cMAC_BROADCAST;
        req.DestIP = Address;
        
        // Send Request
        Link_SendPacket(Interface->Adapter, 0x0806, req.DestMac, sizeof(struct sArpRequest4), &req);
        
+       timeout = now() + Interface->TimeoutDelay;
+       
        // Wait for a reply
        for(;;)
        {
-               while(lastID == giARP_LastUpdateID)     Threads_Yield();
+               while(lastID == giARP_LastUpdateID && now() < timeout)
+                       Threads_Yield();
+               
+               if( now() >= timeout )  break;  // Timeout
+               
                lastID = giARP_LastUpdateID;
                
                Mutex_Acquire( &glARP_Cache4 );
@@ -122,6 +151,10 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
                }
                Mutex_Release( &glARP_Cache4 );
        }
+       {
+               tMacAddr        ret = {{0,0,0,0,0,0}};
+               return ret;
+       }
 }
 
 /**
@@ -164,6 +197,7 @@ void ARP_UpdateCache4(tIPv4 SWAddr, tMacAddr HWAddr)
        Mutex_Release(&glARP_Cache4);
 }
 
+#if ARPv6
 /**
  * \brief Updates the ARP Cache entry for an IPv6 Address
  */
@@ -197,6 +231,7 @@ void ARP_UpdateCache6(tIPv6 SWAddr, tMacAddr HWAddr)
        giARP_LastUpdateID ++;
        Mutex_Release(&glARP_Cache6);
 }
+#endif
 
 /**
  * \fn void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffer)
@@ -205,7 +240,9 @@ void ARP_UpdateCache6(tIPv6 SWAddr, tMacAddr HWAddr)
 void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffer)
 {
        tArpRequest4    *req4 = Buffer;
+       #if ARPv6
        tArpRequest6    *req6 = Buffer;
+       #endif
        tInterface      *iface;
        
        // Sanity Check Packet
@@ -234,38 +271,30 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
        }
        #endif
        
-       Log_Debug("ARP", "Request ID %i", ntohs(req4->Request));
-       
        switch( ntohs(req4->Request) )
        {
        case 1: // You want my IP?
-               Log_Debug("ARP", "ARP Request Address class %i", req4->SWSize);
                // Check what type of IP it is
                switch( req4->SWSize )
                {
                case 4:
-                       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_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],
                                req4->SourceIP.B[0], req4->SourceIP.B[1],
                                req4->SourceIP.B[2], req4->SourceIP.B[3]);
+                       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]);
                        iface = IPv4_GetInterface(Adapter, req4->DestIP, 0);
                        if( iface )
                        {
-                               Log_Debug("ARP", "Caching sender's IP Address");
                                ARP_UpdateCache4(req4->SourceIP, req4->SourceMac);
                                
                                req4->DestIP = req4->SourceIP;
                                req4->DestMac = req4->SourceMac;
-                               req4->SourceIP = iface->IP4.Address;
+                               req4->SourceIP = *(tIPv4*)iface->Address;;
                                req4->SourceMac = Adapter->MacAddr;
                                req4->Request = htons(2);
                                Log_Debug("ARP", "Sending back us (%02x:%02x:%02x:%02x:%02x:%02x)",
@@ -275,6 +304,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
                                Link_SendPacket(Adapter, 0x0806, req4->DestMac, sizeof(tArpRequest4), req4);
                        }
                        break;
+               #if ARPv6
                case 6:
                        if( Length < (int)sizeof(tArpRequest6) ) {
                                Log_Log("ARP", "Recieved undersized packet (IPv6)");
@@ -289,7 +319,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
                        {
                                req6->DestIP = req6->SourceIP;
                                req6->DestMac = req6->SourceMac;
-                               req6->SourceIP = iface->IP6.Address;
+                               req6->SourceIP = *(tIPv6*)iface->Address;
                                req6->SourceMac = Adapter->MacAddr;
                                req6->Request = htons(2);
                                Log_Debug("ARP", "Sending back us (%02x:%02x:%02x:%02x:%02x:%02x)",
@@ -299,6 +329,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
                                Link_SendPacket(Adapter, 0x0806, req6->DestMac, sizeof(tArpRequest6), req6);
                        }
                        break;
+               #endif
                default:
                        Log_Debug("ARP", "Unknown Protocol Address size (%i)", req4->SWSize);
                        return ;
@@ -313,6 +344,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
                case 4:
                        ARP_UpdateCache4( req4->SourceIP, From );
                        break;
+               #if ARPv6
                case 6:
                        if( Length < (int)sizeof(tArpRequest6) ) {
                                Log_Debug("ARP", "Recieved undersized packet (IPv6)");
@@ -320,6 +352,7 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
                        }
                        ARP_UpdateCache6( req6->SourceIP, From );
                        break;
+               #endif
                default:
                        Log_Debug("ARP", "Unknown Protocol Address size (%i)", req4->SWSize);
                        return ;