git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfixing FAT Driver, Addint Multiboot2 Support
[tpg/acess2.git]
/
Modules
/
IPStack
/
ipv4.c
diff --git
a/Modules/IPStack/ipv4.c
b/Modules/IPStack/ipv4.c
index
5fe99ab
..
89f5671
100644
(file)
--- a/
Modules/IPStack/ipv4.c
+++ b/
Modules/IPStack/ipv4.c
@@
-51,6
+51,12
@@
int IPv4_RegisterCallback(int ID, tIPCallback Callback)
/**
* \brief Creates and sends an IPv4 Packet
/**
* \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)
{
*/
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->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;
hdr->TotalLength = htons( bufSize );
hdr->Identifcation = htons( ID ); // TODO: Check
hdr->TTL = DEFAULT_TTL;
@@
-70,7
+83,7
@@
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 = 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",
Address.B[0], Address.B[1], Address.B[2], Address.B[3]);
Log("[IPv4 ] Sending packet to %i.%i.%i.%i",
Address.B[0], Address.B[1], Address.B[2], Address.B[3]);
@@
-211,7
+224,7
@@
Uint16 IPv4_Checksum(void *Buf, int Size)
sum ++; // Simulate 1's complement
sum += arr[i];
}
sum ++; // Simulate 1's complement
sum += arr[i];
}
- return
htons( ~sum )
;
+ return
~sum
;
}
/**
}
/**
UCC
git Repository :: git.ucc.asn.au