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

diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c
index 7e7c5854..933b90ba 100644
--- a/Modules/IPStack/ipv4.c
+++ b/Modules/IPStack/ipv4.c
@@ -6,10 +6,14 @@
 #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();
@@ -17,6 +21,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];
@@ -45,6 +51,35 @@ int IPv4_RegisterCallback(int ID, tIPCallback 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
@@ -156,3 +191,30 @@ 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;
+	
+	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);
+}