Modules/IPStack - Fix assertion failure, dedup some ACK code

[tpg/acess2.git] / KernelLand / Modules / IPStack / ipv4.c

diff --git a/KernelLand/Modules/IPStack/ipv4.c b/KernelLand/Modules/IPStack/ipv4.c
index 3162301..000fe39 100644 (file)
--- a/KernelLand/Modules/IPStack/ipv4.c
+++ b/KernelLand/Modules/IPStack/ipv4.c
@@ -6,16 +6,17 @@
 #include "ipstack.h"
 #include "link.h"
 #include "ipv4.h"
+#include "hwaddr_cache.h"
 #include "firewall.h"
 
+// === CONSTANTS ===
 #define DEFAULT_TTL    32
+#define IPV4_TRACE     1       // set to 1 to enable packet tracing
 
 // === IMPORTS ===
 extern tInterface      *gIP_Interfaces;
 extern void    ICMP_Initialise();
 extern  int    ICMP_Ping(tInterface *Interface, tIPv4 Addr);
-extern tMacAddr        ARP_Resolve4(tInterface *Interface, tIPv4 Address);
-extern void    ARP_UpdateCache4(tIPv4 SWAddr, tMacAddr HWAddr);
 
 // === PROTOTYPES ===
  int   IPv4_Initialise();
@@ -72,7 +73,7 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, tIPS
        length = IPStack_Buffer_GetLength(Buffer);
        
        // --- Resolve destination MAC address
-       to = ARP_Resolve4(Iface, Address);
+       to = HWCache_Resolve(Iface, &Address);
        if( MAC_EQU(to, cMAC_ZERO) ) {
                // No route to host
                Log_Notice("IPv4", "No route to host %i.%i.%i.%i",
@@ -118,8 +119,10 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, tIPS
 
        IPStack_Buffer_AppendSubBuffer(Buffer, sizeof(tIPv4Header), 0, &hdr, NULL, NULL);
 
+       #if IPV4_TRACE
        Log_Log("IPv4", "Sending packet to %i.%i.%i.%i",
                Address.B[0], Address.B[1], Address.B[2], Address.B[3]);
+       #endif
        Link_SendPacket(Iface->Adapter, IPV4_ETHERNET_ID, to, Buffer);
        return 1;
 }
@@ -181,14 +184,13 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
        
        // TODO: Handle packet fragmentation
        
-       
-       Log_Debug("IPv4", " From %i.%i.%i.%i to %i.%i.%i.%i",
+       #if IPV4_TRACE
+       Log_Debug("IPv4", "Proto 0x%x From %i.%i.%i.%i to %i.%i.%i.%i",
+               hdr->Protocol,
                hdr->Source.B[0], hdr->Source.B[1], hdr->Source.B[2], hdr->Source.B[3],
                hdr->Destination.B[0], hdr->Destination.B[1], hdr->Destination.B[2], hdr->Destination.B[3]
                );
-
-       // TODO: Tell ARP?
-       ARP_UpdateCache4(hdr->Source, From);
+       #endif
        
        // Get Data and Data Length
        dataLength = ntohs(hdr->TotalLength) - sizeof(tIPv4Header);
@@ -208,6 +210,13 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
        }
        else {
                // Routed packets
+               // Drop the packet if the TTL is zero
+               if( hdr->TTL == 0 ) {
+                       Log_Warning("IPv4", "TODO: Send ICMP-Timeout when TTL exceeded");
+                       return ;
+               }
+               hdr->TTL --;
+
                ret = IPTables_TestChain("FORWARD",
                        4, &hdr->Source, &hdr->Destination,
                        hdr->Protocol, 0,
@@ -234,36 +243,16 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
        // Routing
        if(!iface)
        {
-               tMacAddr        to;
-               tRoute  *rt;
-               
-               Log_Debug("IPv4", "Route the packet");
-               // Drop the packet if the TTL is zero
-               if( hdr->TTL == 0 ) {
-                       Log_Warning("IPv4", "TODO: Send ICMP-Timeout when TTL exceeded");
-                       return ;
-               }
-               
-               hdr->TTL --;
-               
-               rt = IPStack_FindRoute(4, NULL, &hdr->Destination);     // Get the route (gets the interface)
-               if( !rt || !rt->Interface )
-                       return ;
-               to = ARP_Resolve4(rt->Interface, hdr->Destination);     // Resolve address
-               if( MAC_EQU(to, cMAC_ZERO) )
-                       return ;
-               
-               // Send packet
-               Log_Log("IPv4", "Forwarding packet to %i.%i.%i.%i (via %i.%i.%i.%i)",
-                       hdr->Destination.B[0], hdr->Destination.B[1],
-                       hdr->Destination.B[2], hdr->Destination.B[3],
-                       ((tIPv4*)rt->NextHop)->B[0], ((tIPv4*)rt->NextHop)->B[1],
-                       ((tIPv4*)rt->NextHop)->B[2], ((tIPv4*)rt->NextHop)->B[3]);
-               Log_Warning("IPv4", "TODO: Implement forwarding with tIPStackBuffer");
-//             Link_SendPacket(rt->Interface->Adapter, IPV4_ETHERNET_ID, to, Length, Buffer);
-               
+               //IPStack_RoutePacket(4, &hdr->Destination, Length, Buffer);
                return ;
        }
+
+       // Populate ARP cache from recieved packets
+       // - Should be safe
+       if( IPStack_CompareAddress(4, &hdr->Source, iface->Address, iface->SubnetBits) )
+       {
+               HWCache_Set(Adapter, 4, &hdr->Source, &From);
+       }
        
        // Send it on
        if( !gaIPv4_Callbacks[hdr->Protocol] ) {
@@ -283,7 +272,7 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
  */
 tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
 {
-       tInterface      *iface = NULL;
+       tInterface      *iface = NULL, *zero_iface = NULL;
        Uint32  netmask;
        Uint32  addr, this;
 
@@ -301,7 +290,20 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
                        LEAVE('p', iface);
                        return iface;
                }
-               
+
+               LOG("iface->Address = 0x%x", *(Uint32*)iface->Address);
+
+               if( *(Uint32*)iface->Address == 0 ) {
+                       if( zero_iface ) {
+                               Log_Notice("IPv4", "Multiple 0.0.0.0 interfaces on the same adapter, ignoring");
+                       }
+                       else {
+                               zero_iface = iface;
+                               LOG("Zero IF %p", iface);
+                       }
+                       continue ;
+               }               
+
                if( !Broadcast )        continue;
                
                // Check for broadcast
@@ -316,6 +318,17 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
                        return iface;
                }
        }
+
+       // Special case for intefaces that are being DHCP configured
+       // - If the interface address is 0.0.0.0, then if there is no match for the
+       //   destination the packet is treated as if it was addressed to 0.0.0.0
+       if( zero_iface && Broadcast )
+       {
+               LOG("Using 0.0.0.0 interface with magic!");
+               LEAVE('p', zero_iface);
+               return zero_iface;
+       }
+
        LEAVE('n');
        return NULL;
 }
@@ -349,6 +362,7 @@ Uint32 IPv4_Netmask(int FixedBits)
  */
 Uint16 IPv4_Checksum(const void *Buf, size_t Length)
 {
+       //Debug_HexDump("IPv4_Checksum", Buf, Length);
        const Uint16    *words = Buf;
        Uint32  sum = 0;
         int    i;