Multi-user testing and bugfixing
[tpg/acess2.git] / Modules / IPStack / ipv4.c
index d57b124..933b90b 100644 (file)
@@ -6,11 +6,23 @@
 #include "link.h"
 #include "ipv4.h"
 
+#define DEFAULT_TTL    32
+
+// === IMPORTS ===
+extern tInterface      *gIP_Interfaces;
+extern void    ICMP_Initialise();
+extern  int    ICMP_Ping(tInterface *Interface, tIPv4 Addr);
+extern void    UDP_Initialise();
+extern tMacAddr        ARP_Resolve4(tInterface *Interface, tIPv4 Address);
+
 // === PROTOTYPES ===
  int   IPv4_Initialise();
+ int   IPv4_RegisterCallback(int ID, tIPCallback 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);
+Uint16 IPv4_Checksum(void *Buf, int Size);
+ int   IPv4_Ping(tInterface *Iface, tIPv4 Addr);
 
 // === GLOBALS ===
 tIPCallback    gaIPv4_Callbacks[256];
@@ -21,10 +33,53 @@ tIPCallback gaIPv4_Callbacks[256];
  */
 int IPv4_Initialise()
 {
+       ICMP_Initialise();
+       UDP_Initialise();
        Link_RegisterType(IPV4_ETHERNET_ID, IPv4_int_GetPacket);
        return 1;
 }
 
+/**
+ * \fn int IPv4_RegisterCallback( int ID, tIPCallback Callback )
+ * \brief Registers a callback
+ */
+int IPv4_RegisterCallback(int ID, tIPCallback Callback)
+{
+       if( ID < 0 || ID > 255 )        return 0;
+       if( gaIPv4_Callbacks[ID] )      return 0;
+       gaIPv4_Callbacks[ID] = Callback;
+       return 1;
+}
+
+/**
+ * \brief Creates and sends an IPv4 Packet
+ */
+int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int Length, void *Data)
+{
+       tMacAddr        to = ARP_Resolve4(Iface, Address);
+        int    bufSize = sizeof(tIPv4Header) + Length;
+       char    buf[bufSize];
+       tIPv4Header     *hdr = (void*)buf;
+       
+       memcpy(&hdr->Options[0], Data, Length);
+       hdr->Version = 4;
+       hdr->HeaderLength = htons( sizeof(tIPv4Header) );
+       hdr->DiffServices = 0;  // TODO: Check
+       hdr->TotalLength = htons( bufSize );
+       hdr->Identifcation = htons( ID );       // TODO: Check
+       hdr->TTL = DEFAULT_TTL;
+       hdr->Protocol = Protocol;
+       hdr->HeaderChecksum = 0;        // Will be set later
+       hdr->Source = Iface->IP4.Address;
+       hdr->Destination = Address;
+       hdr->HeaderChecksum = htons( IPv4_Checksum(hdr, sizeof(tIPv4Header)) );
+       
+       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;
+}
+
 /**
  * \fn void IPv4_int_GetPacket(tInterface *Adapter, tMacAddr From, int Length, void *Buffer)
  * \brief Process an IPv4 Packet
@@ -33,22 +88,45 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 {
        tIPv4Header     *hdr = Buffer;
        tInterface      *iface;
-       char    *data;
+       Uint8   *data;
         int    dataLength;
        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",
+               hdr->Source.B[0], hdr->Source.B[1], hdr->Source.B[2], hdr->Source.B[3] );
+       Log("[IPv4 ] Destination = %i.%i.%i.%i",
+               hdr->Destination.B[0], hdr->Destination.B[1],
+               hdr->Destination.B[2], hdr->Destination.B[3] );
+       
        // Check that the version IS IPv4
-       if(hdr->Version != 4)   return;
+       if(hdr->Version != 4) {
+               Log("[IPv4 ] hdr->Version(%i) != 4", hdr->Version);
+               return;
+       }
        
        // Check Header checksum
        //TODO
        
        // Check Packet length
-       if(hdr->TotalLength > Length)   return;
+       if( ntohs(hdr->TotalLength) > Length) {
+               Log("[IPv4 ] hdr->TotalLength(%i) > Length(%i)", hdr->TotalLength, Length);
+               return;
+       }
        
        // Get Interface (allowing broadcasts)
-       iface = IPv4_GetInterface(Adapter, hdr->Source, 1);
-       if(!iface)      return; // Not for us? Well, let's ignore it
+       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
@@ -68,19 +146,33 @@ tInterface *IPv4_GetInterface(tAdapter *Adapter, tIPv4 Address, int Broadcast)
 {
        tInterface      *iface = NULL;
        Uint32  netmask;
+       Uint32  addr, this;
+       
+       addr = ntohl( Address.L );
        
-       for( iface = Adapter->Interfaces; iface; iface = iface->Next)
+       for( iface = gIP_Interfaces; iface; iface = iface->Next)
        {
+               if( iface->Adapter != Adapter ) continue;
                if( iface->Type != 4 )  continue;
                if( IP4_EQU(Address, iface->IP4.Address) )
                        return iface;
                
                if( !Broadcast )        continue;
                
+               this = ntohl( iface->IP4.Address.L );
+               
                // Check for broadcast
                netmask = IPv4_Netmask(iface->IP4.SubnetBits);
-               if( (Address.L & netmask) == (iface->IP4.Address.L & netmask)
-                && (Address.L & ~netmask) == (0xFFFFFFFF & ~netmask) )
+               
+               //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;
        }
        return NULL;
@@ -96,5 +188,33 @@ Uint32 IPv4_Netmask(int FixedBits)
        Uint32  ret = 0xFFFFFFFF;
        ret >>= (32-FixedBits);
        ret <<= (32-FixedBits);
+       // Returs a little endian netmask
        return ret;
 }
+
+/**
+ * \brief Calculate the IPv4 Checksum
+ */
+Uint16 IPv4_Checksum(void *Buf, int Size)
+{
+       Uint16  sum = 0;
+       Uint16  *arr = Buf;
+        int    i;
+       
+       Size = (Size + 1) >> 1;
+       for(i = 0; i < Size; i++ )
+       {
+               if((int)sum + arr[i] > 0xFFFF)
+                       sum ++; // Simulate 1's complement
+               sum += arr[i];
+       }
+       return ~sum;
+}
+
+/**
+ * \brief Sends an ICMP Echo and waits for a reply
+ */
+int IPv4_Ping(tInterface *Iface, tIPv4 Addr)
+{
+       return ICMP_Ping(Iface, Addr);
+}

UCC git Repository :: git.ucc.asn.au