X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Fipv4.c;h=371fe4026f224502521daa03df9bc91e388c42bc;hb=e14ac96d48bb4ef5cfc845e345df4770e1145ceb;hp=a765400c117bd5346b0d6ac53eb727285e04b616;hpb=2a49f5a6be4fd478ae4249115ff2a3bf0e34d7e5;p=tpg%2Facess2.git diff --git a/KernelLand/Modules/IPStack/ipv4.c b/KernelLand/Modules/IPStack/ipv4.c index a765400c..371fe402 100644 --- a/KernelLand/Modules/IPStack/ipv4.c +++ b/KernelLand/Modules/IPStack/ipv4.c @@ -6,22 +6,21 @@ #include "ipstack.h" #include "link.h" #include "ipv4.h" +#include "hwaddr_cache.h" #include "firewall.h" // === CONSTANTS === #define DEFAULT_TTL 32 -#define IPV4_TRACE 0 // set to 1 to enable packet tracing +#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(); - int IPv4_RegisterCallback(int ID, tIPCallback Callback); +// int IPv4_RegisterCallback(int ID, tIPRxCallback Callback, ); void IPv4_int_GetPacket(tAdapter *Interface, tMacAddr From, int Length, void *Buffer); tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast); Uint32 IPv4_Netmask(int FixedBits); @@ -29,7 +28,10 @@ Uint16 IPv4_Checksum(const void *Buf, size_t Length); int IPv4_Ping(tInterface *Iface, tIPv4 Addr); // === GLOBALS === -tIPCallback gaIPv4_Callbacks[256]; +struct { + tIPRxCallback* rx_cb; + tIPErrorCallback* err_cb; +} gaIPv4_Callbacks[256]; // === CODE === /** @@ -47,11 +49,12 @@ int IPv4_Initialise() * \param ID 8-bit packet type ID * \param Callback Callback function */ -int IPv4_RegisterCallback(int ID, tIPCallback Callback) +int IPv4_RegisterCallback(int ID, tIPRxCallback *RxCallback, tIPErrorCallback *ErrCallback) { if( ID < 0 || ID > 255 ) return 0; - if( gaIPv4_Callbacks[ID] ) return 0; - gaIPv4_Callbacks[ID] = Callback; + if( gaIPv4_Callbacks[ID].rx_cb ) return 0; + gaIPv4_Callbacks[ID].rx_cb = RxCallback; + gaIPv4_Callbacks[ID].err_cb = ErrCallback; return 1; } @@ -67,14 +70,12 @@ int IPv4_RegisterCallback(int ID, tIPCallback Callback) */ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, tIPStackBuffer *Buffer) { - tMacAddr to; tIPv4Header hdr; - int length; - length = IPStack_Buffer_GetLength(Buffer); + int length = IPStack_Buffer_GetLength(Buffer); // --- Resolve destination MAC address - to = ARP_Resolve4(Iface, Address); + tMacAddr 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", @@ -135,7 +136,6 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, tIPS void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffer) { tIPv4Header *hdr = Buffer; - tInterface *iface; Uint8 *data; int dataLength; int ret; @@ -186,22 +186,19 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff // TODO: Handle packet fragmentation #if IPV4_TRACE - Log_Debug("IPv4", " From %i.%i.%i.%i to %i.%i.%i.%i", + 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] ); #endif - - // TODO: Should ARP sniffing be used? - // - If we get a packet, cache the source MAC - ARP_UpdateCache4(hdr->Source, From); // Get Data and Data Length dataLength = ntohs(hdr->TotalLength) - sizeof(tIPv4Header); data = &hdr->Options[0]; // Get Interface (allowing broadcasts) - iface = IPv4_GetInterface(Adapter, hdr->Destination, 1); + tInterface *iface = IPv4_GetInterface(Adapter, hdr->Destination, 1); // Firewall rules if( iface ) { @@ -214,6 +211,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, @@ -240,48 +244,41 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff // Routing if(!iface) { - #if 0 - tMacAddr to; - tRoute *rt; - - - // TODO: Put this in another thread to avoid delays in the RX thread - 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); - #endif - + //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] ) { + if( !gaIPv4_Callbacks[hdr->Protocol].rx_cb ) { Log_Log("IPv4", "Unknown Protocol %i", hdr->Protocol); return ; } - gaIPv4_Callbacks[hdr->Protocol]( iface, &hdr->Source, dataLength, data ); + gaIPv4_Callbacks[hdr->Protocol].rx_cb( iface, &hdr->Source, dataLength, data ); +} + +/* + * Handles an error from the ICMPv4 code, 'Buf' contains part of an IPv4 packet + */ +void IPv4_HandleError(tInterface *Iface, tIPErrorMode Mode, size_t Length, const void *Buf) +{ + if(Length < sizeof(tIPv4Header)) return; + const tIPv4Header* hdr = Buf; + if(hdr->Version != 4) return; + + // Get Data and Data Length + size_t dataLength = MIN(Length, ntohs(hdr->TotalLength)) - sizeof(tIPv4Header); + const void *data = &hdr->Options[0]; + + if( gaIPv4_Callbacks[hdr->Protocol].err_cb ) + gaIPv4_Callbacks[hdr->Protocol].err_cb(Iface, Mode, &hdr->Source, dataLength, data); } /** @@ -293,16 +290,14 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff */ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast) { - tInterface *iface = NULL, *zero_iface = NULL; - Uint32 netmask; - Uint32 addr, this; + tInterface *zero_iface = NULL; ENTER("pAdapter xAddress bBroadcast", Adapter, Address, Broadcast); - addr = ntohl( Address.L ); + Uint32 addr = ntohl( Address.L ); LOG("addr = 0x%x", addr); - for( iface = gIP_Interfaces; iface; iface = iface->Next) + for( tInterface *iface = gIP_Interfaces; iface; iface = iface->Next) { if( iface->Adapter != Adapter ) continue; if( iface->Type != 4 ) continue; @@ -328,8 +323,8 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast) if( !Broadcast ) continue; // Check for broadcast - this = ntohl( ((tIPv4*)iface->Address)->L ); - netmask = IPv4_Netmask(iface->SubnetBits); + Uint32 this = ntohl( ((tIPv4*)iface->Address)->L ); + Uint32 netmask = IPv4_Netmask(iface->SubnetBits); LOG("iface addr = 0x%x, netmask = 0x%x (bits = %i)", this, netmask, iface->SubnetBits); if( (addr & netmask) == (this & netmask) && (addr & ~netmask) == (0xFFFFFFFF & ~netmask) ) @@ -383,6 +378,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;