Fiddling with usermode PCI dump
[tpg/acess2.git] / Modules / IPStack / ipv4.c
index 5fe99ab..aff593a 100644 (file)
@@ -51,6 +51,12 @@ int IPv4_RegisterCallback(int ID, tIPCallback Callback)
 
 /**
  * \brief Creates and sends an IPv4 Packet
+ * \param Iface        Interface
+ * \param Address      Destination IP
+ * \param Protocol     Protocol ID
+ * \param ID   Some random ID number
+ * \param Length       Data Length
+ * \param Data Packet Data
  */
 int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int Length, void *Data)
 {
@@ -63,6 +69,13 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int
        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;
@@ -70,9 +83,9 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int
        hdr->HeaderChecksum = 0;        // Will be set later
        hdr->Source = Iface->IP4.Address;
        hdr->Destination = Address;
-       hdr->HeaderChecksum = htons( IPv4_Checksum(hdr, sizeof(tIPv4Header)) );
+       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;
@@ -90,23 +103,25 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
         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",
+       #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;
        }
        
@@ -115,14 +130,14 @@ 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)");
+               Log_Log("IPv4", "Ignoring Packet (Not for us)");
                return; // Not for us? Well, let's ignore it
        }
        
@@ -136,7 +151,7 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
        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);
 }
 
 /**
@@ -202,8 +217,6 @@ Uint16 IPv4_Checksum(void *Buf, int Size)
        Uint16  *arr = Buf;
         int    i;
        
-       Log("IPv4_Checksum: (%p, %i)", Buf, Size);
-       
        Size = (Size + 1) >> 1;
        for(i = 0; i < Size; i++ )
        {
@@ -211,7 +224,7 @@ Uint16 IPv4_Checksum(void *Buf, int Size)
                        sum ++; // Simulate 1's complement
                sum += arr[i];
        }
-       return htons( ~sum );
+       return ~sum ;
 }
 
 /**

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