X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fipv4.c;h=89f5671355087ee3d5b8676826c5844777b39479;hb=351dd3b194833c923bad0292e9019320fb2a41fa;hp=7e7c5854544ca254e77bd0103f560dbcbd31a7f0;hpb=0f48b41ce8edd3b6d549d641b35901e4b51a5132;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c
index 7e7c5854..89f56713 100644
--- a/Modules/IPStack/ipv4.c
+++ b/Modules/IPStack/ipv4.c
@@ -6,10 +6,13 @@
 #include "link.h"
 #include "ipv4.h"
 
+#define DEFAULT_TTL	32
+
 // === IMPORTS ===
 extern tInterface	*gIP_Interfaces;
 extern void	ICMP_Initialise();
-extern void	UDP_Initialise();
+extern  int	ICMP_Ping(tInterface *Interface, tIPv4 Addr);
+extern tMacAddr	ARP_Resolve4(tInterface *Interface, tIPv4 Address);
 
 // === PROTOTYPES ===
  int	IPv4_Initialise();
@@ -17,6 +20,8 @@ extern void	UDP_Initialise();
 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];
@@ -28,7 +33,6 @@ tIPCallback	gaIPv4_Callbacks[256];
 int IPv4_Initialise()
 {
 	ICMP_Initialise();
-	UDP_Initialise();
 	Link_RegisterType(IPV4_ETHERNET_ID, IPv4_int_GetPacket);
 	return 1;
 }
@@ -45,6 +49,48 @@ int IPv4_RegisterCallback(int ID, tIPCallback Callback)
 	return 1;
 }
 
+/**
+ * \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)
+{
+	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 = 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->Protocol = Protocol;
+	hdr->HeaderChecksum = 0;	// Will be set later
+	hdr->Source = Iface->IP4.Address;
+	hdr->Destination = Address;
+	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;
+}
+
 /**
  * \fn void IPv4_int_GetPacket(tInterface *Adapter, tMacAddr From, int Length, void *Buffer)
  * \brief Process an IPv4 Packet
@@ -60,7 +106,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 );
@@ -82,7 +128,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;
 	}
 	
@@ -96,11 +142,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);
 }
 
 /**
@@ -156,3 +205,32 @@ Uint32 IPv4_Netmask(int 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;
+	
+	Log("IPv4_Checksum: (%p, %i)", Buf, Size);
+	
+	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);
+}