X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fipv4.c;h=b6c70858d70409b4c1c299ff466ad4d8fd8ac236;hb=e6b37dbe81b4492796fd262f95fc94e06cb67966;hp=15cf65f89f9f3a96c2775e4cbadac3829a96dea4;hpb=3c85c92afe3f506a921447ef07963525d796137b;p=tpg%2Facess2.git diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c index 15cf65f8..b6c70858 100644 --- a/Modules/IPStack/ipv4.c +++ b/Modules/IPStack/ipv4.c @@ -5,6 +5,7 @@ #include "ipstack.h" #include "link.h" #include "ipv4.h" +#include "firewall.h" #define DEFAULT_TTL 32 @@ -20,7 +21,7 @@ extern tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address); 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); -Uint16 IPv4_Checksum(void *Buf, int Size); +Uint16 IPv4_Checksum(const void *Buf, int Size); int IPv4_Ping(tInterface *Iface, tIPv4 Addr); // === GLOBALS === @@ -58,17 +59,37 @@ int IPv4_RegisterCallback(int ID, tIPCallback Callback) * \param Length Data Length * \param Data Packet Data */ -int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int Length, void *Data) +int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int Length, const void *Data) { tMacAddr to = ARP_Resolve4(Iface, Address); int bufSize = sizeof(tIPv4Header) + Length; char buf[bufSize]; tIPv4Header *hdr = (void*)buf; + int ret; + + // TODO: OUTPUT Firewall rule go here + ret = IPTablesV4_TestChain("OUTPUT", + &Iface->IP4.Address, &Address, + Protocol, 0, + Length, Data); + + if(ret != 0) + { + // Just drop it + return 0; + } memcpy(&hdr->Options[0], Data, Length); hdr->Version = 4; hdr->HeaderLength = sizeof(tIPv4Header)/4; hdr->DiffServices = 0; // TODO: Check + + hdr->Reserved = 0; + hdr->DontFragment = 0; + hdr->MoreFragments = 0; + hdr->FragOffLow = 0; + hdr->FragOffHi = 0; + hdr->TotalLength = htons( bufSize ); hdr->Identifcation = htons( ID ); // TODO: Check hdr->TTL = DEFAULT_TTL; @@ -78,7 +99,7 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int hdr->Destination = Address; hdr->HeaderChecksum = IPv4_Checksum(hdr, sizeof(tIPv4Header)); - Log("[IPv4 ] Sending packet to %i.%i.%i.%i", + Log_Log("IPv4", "Sending packet to %i.%i.%i.%i", Address.B[0], Address.B[1], Address.B[2], Address.B[3]); Link_SendPacket(Iface->Adapter, IPV4_ETHERNET_ID, to, bufSize, buf); return 1; @@ -94,25 +115,29 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff tInterface *iface; Uint8 *data; int dataLength; + int ret; + if(Length < sizeof(tIPv4Header)) return; - //Log("[IPv4 ] Version = %i", hdr->Version); - Log("[IPv4 ] HeaderLength = %i", hdr->HeaderLength); - Log("[IPv4 ] DiffServices = %i", hdr->DiffServices); - Log("[IPv4 ] TotalLength = %i", ntohs(hdr->TotalLength) ); - //Log("[IPv4 ] Identifcation = %i", ntohs(hdr->Identifcation) ); - //Log("[IPv4 ] TTL = %i", hdr->TTL ); - Log("[IPv4 ] Protocol = %i", hdr->Protocol ); - //Log("[IPv4 ] HeaderChecksum = 0x%x", ntohs(hdr->HeaderChecksum) ); - Log("[IPv4 ] Source = %i.%i.%i.%i", + #if 0 + //Log_Log("IPv4", "Version = %i", hdr->Version); + //Log_Log("IPv4", "HeaderLength = %i", hdr->HeaderLength); + //Log_Log("IPv4", "DiffServices = %i", hdr->DiffServices); + Log_Log("IPv4", "TotalLength = %i", ntohs(hdr->TotalLength) ); + //Log_Log("IPv4", "Identifcation = %i", ntohs(hdr->Identifcation) ); + //Log_Log("IPv4", "TTL = %i", hdr->TTL ); + Log_Log("IPv4", "Protocol = %i", hdr->Protocol ); + //Log_Log("IPv4", "HeaderChecksum = 0x%x", ntohs(hdr->HeaderChecksum) ); + Log_Log("IPv4", "Source = %i.%i.%i.%i", hdr->Source.B[0], hdr->Source.B[1], hdr->Source.B[2], hdr->Source.B[3] ); - Log("[IPv4 ] Destination = %i.%i.%i.%i", + Log_Log("IPv4", "Destination = %i.%i.%i.%i", hdr->Destination.B[0], hdr->Destination.B[1], hdr->Destination.B[2], hdr->Destination.B[3] ); - + #endif + // Check that the version IS IPv4 if(hdr->Version != 4) { - Log("[IPv4 ] hdr->Version(%i) != 4", hdr->Version); + Log_Log("IPv4", "hdr->Version(%i) != 4", hdr->Version); return; } @@ -121,28 +146,61 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff // Check Packet length if( ntohs(hdr->TotalLength) > Length) { - Log("[IPv4 ] hdr->TotalLength(%i) > Length(%i)", ntohs(hdr->TotalLength), Length); + Log_Log("IPv4", "hdr->TotalLength(%i) > Length(%i)", ntohs(hdr->TotalLength), Length); return; } - // Get Interface (allowing broadcasts) - iface = IPv4_GetInterface(Adapter, hdr->Destination, 1); - if(!iface) { - Log("[IPv4 ] Ignoring Packet (Not for us)"); - return; // Not for us? Well, let's ignore it - } - // Defragment - //TODO + // TODO: Handle packet fragmentation + // 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); + + // TODO: INPUT Firewall Rule + if( iface ) { + ret = IPTablesV4_TestChain("INPUT", + &hdr->Source, &hdr->Destination, + hdr->Protocol, 0, + dataLength, data + ); + } + else { + ret = IPTablesV4_TestChain("FORWARD", + &hdr->Source, &hdr->Destination, + hdr->Protocol, 0, + dataLength, data + ); + } + switch(ret) + { + // 0 - Allow + case 0: break; + // 1 - Silent Drop + case 1: return ; + // Unknown, silent drop + default: + return ; + } + + // Routing + if(!iface) + { + Log_Log("IPv4", "Route the packet"); + + // TODO: Parse Routing tables and determine where to send it + + return ; + } + // Send it on if( gaIPv4_Callbacks[hdr->Protocol] ) gaIPv4_Callbacks[hdr->Protocol] (iface, &hdr->Source, dataLength, data); else - Log("[IPv4 ] Unknown Protocol %i", hdr->Protocol); + Log_Log("IPv4", "Unknown Protocol %i", hdr->Protocol); } /** @@ -171,13 +229,6 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast) // Check for broadcast netmask = IPv4_Netmask(iface->IP4.SubnetBits); - //Log("netmask = 0x%08x", netmask); - //Log("addr = 0x%08x", addr); - //Log("this = 0x%08x", this); - //Log("%08x == %08x && %08x == %08x", - // (addr & netmask), (this & netmask), - // (addr & ~netmask), (0xFFFFFFFF & ~netmask) - // ); if( (addr & netmask) == (this & netmask) && (addr & ~netmask) == (0xFFFFFFFF & ~netmask) ) return iface; @@ -195,22 +246,20 @@ Uint32 IPv4_Netmask(int FixedBits) Uint32 ret = 0xFFFFFFFF; ret >>= (32-FixedBits); ret <<= (32-FixedBits); - // Returs a little endian netmask + // Returns a native endian netmask return ret; } /** * \brief Calculate the IPv4 Checksum */ -Uint16 IPv4_Checksum(void *Buf, int Size) +Uint16 IPv4_Checksum(const void *Buf, int Size) { Uint16 sum = 0; - Uint16 *arr = Buf; + const Uint16 *arr = Buf; int i; - Log("IPv4_Checksum: (%p, %i)", Buf, Size); - - Size = (Size + 1) >> 1; + Size = (Size + 1) >> 1; // 16-bit word count for(i = 0; i < Size; i++ ) { if((int)sum + arr[i] > 0xFFFF)