X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fipv4.c;h=15cf65f89f9f3a96c2775e4cbadac3829a96dea4;hb=3c85c92afe3f506a921447ef07963525d796137b;hp=282e71bbfe1ecf1643353eed6519744da63503d2;hpb=25f19babe7a0ab75d04ff7e6f98f7bcb65fb8941;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c
index 282e71bb..15cf65f8 100644
--- a/Modules/IPStack/ipv4.c
+++ b/Modules/IPStack/ipv4.c
@@ -12,7 +12,6 @@
 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 ===
@@ -34,7 +33,6 @@ tIPCallback	gaIPv4_Callbacks[256];
 int IPv4_Initialise()
 {
 	ICMP_Initialise();
-	UDP_Initialise();
 	Link_RegisterType(IPV4_ETHERNET_ID, IPv4_int_GetPacket);
 	return 1;
 }
@@ -53,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,7 +67,7 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int
 	
 	memcpy(&hdr->Options[0], Data, Length);
 	hdr->Version = 4;
-	hdr->HeaderLength = htons( sizeof(tIPv4Header) );
+	hdr->HeaderLength = sizeof(tIPv4Header)/4;
 	hdr->DiffServices = 0;	// TODO: Check
 	hdr->TotalLength = htons( bufSize );
 	hdr->Identifcation = htons( ID );	// TODO: Check
@@ -72,8 +76,10 @@ 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",
+		Address.B[0], Address.B[1], Address.B[2], Address.B[3]);
 	Link_SendPacket(Iface->Adapter, IPV4_ETHERNET_ID, to, bufSize, buf);
 	return 1;
 }
@@ -93,7 +99,7 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	//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 ] TotalLength = %i", ntohs(hdr->TotalLength) );
 	//Log("[IPv4 ] Identifcation = %i", ntohs(hdr->Identifcation) );
 	//Log("[IPv4 ] TTL = %i", hdr->TTL );
 	Log("[IPv4 ] Protocol = %i", hdr->Protocol );
@@ -115,7 +121,7 @@ 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)", hdr->TotalLength, Length);
+		Log("[IPv4 ] hdr->TotalLength(%i) > Length(%i)", ntohs(hdr->TotalLength), Length);
 		return;
 	}
 	
@@ -129,11 +135,14 @@ void IPv4_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buff
 	// Defragment
 	//TODO
 	
-	dataLength = hdr->TotalLength - sizeof(tIPv4Header);
+	dataLength = ntohs(hdr->TotalLength) - sizeof(tIPv4Header);
 	data = &hdr->Options[0];
 	
 	// Send it on
-	gaIPv4_Callbacks[hdr->Protocol] (iface, &hdr->Source, dataLength, data);
+	if( gaIPv4_Callbacks[hdr->Protocol] )
+		gaIPv4_Callbacks[hdr->Protocol] (iface, &hdr->Source, dataLength, data);
+	else
+		Log("[IPv4 ] Unknown Protocol %i", hdr->Protocol);
 }
 
 /**
@@ -199,6 +208,8 @@ 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++ )
 	{
@@ -206,7 +217,7 @@ Uint16 IPv4_Checksum(void *Buf, int Size)
 			sum ++;	// Simulate 1's complement
 		sum += arr[i];
 	}
-	return ~sum;
+	return ~sum ;
 }
 
 /**