X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Ficmp.c;h=de3a9db5ab606bf49fb5fe9a65957d27121389b8;hb=b1873b4cff47aae8ada8cc303ea01b475cc7ccc8;hp=5d53cc6c42db4ec61705a65d815ec59989e4cb62;hpb=0f48b41ce8edd3b6d549d641b35901e4b51a5132;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/icmp.c b/Modules/IPStack/icmp.c
index 5d53cc6c..de3a9db5 100644
--- a/Modules/IPStack/icmp.c
+++ b/Modules/IPStack/icmp.c
@@ -6,11 +6,18 @@
 #include "ipv4.h"
 #include "icmp.h"
 
+// === CONSTANTS ===
+#define PING_SLOTS	64
+
 // === PROTOTYPES ===
 void	ICMP_Initialise();
 void	ICMP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
 
 // === GLOBALS ===
+struct {
+	tInterface	*Interface;
+	 int	bArrived;
+}	gICMP_PingSlots[PING_SLOTS];
 
 // === CODE ===
 /**
@@ -30,9 +37,95 @@ void ICMP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buff
 {
 	tICMPHeader	*hdr = Buffer;
 	
-	Log("[ICMP ] hdr->Type = %i", hdr->Type);
-	Log("[ICMP ] hdr->Code = %i", hdr->Code);
-	Log("[ICMP ] hdr->Checksum = 0x%x", ntohs(hdr->Checksum));
-	Log("[ICMP ] hdr->ID = 0x%x", ntohs(hdr->ID));
-	Log("[ICMP ] hdr->Sequence = 0x%x", ntohs(hdr->Sequence));
+	//Log_Debug("ICMPv4", "Length = %i", Length);
+	Log_Debug("ICMPv4", "hdr->Type, hdr->Code = %i, %i", hdr->Type, hdr->Code);
+	//Log_Debug("ICMPv4", "hdr->Checksum = 0x%x", ntohs(hdr->Checksum));
+	Log_Debug("ICMPv4", "hdr->ID = 0x%x", ntohs(hdr->ID));
+	Log_Debug("ICMPv4", "hdr->Sequence = 0x%x", ntohs(hdr->Sequence));
+	
+	switch(hdr->Type)
+	{
+	// -- 0: Echo Reply
+	case ICMP_ECHOREPLY:
+		if(hdr->Code != 0) {
+			Log_Warning("ICMPv4", "Code == %i for ICMP Echo Reply, should be 0", hdr->Code);
+			return ;
+		}
+		if(hdr->ID != (Uint16)~hdr->Sequence) {
+			Log_Warning("ICMPv4", "ID and Sequence values do not match");
+			//return ;
+		}
+		gICMP_PingSlots[hdr->ID].bArrived = 1;
+		break;
+	
+	// -- 3: Destination Unreachable
+	case ICMP_UNREACHABLE:
+		switch(hdr->Code)
+		{
+		case 3:	// Port Unreachable
+			Log_Debug("ICMPv4", "Destination Unreachable (Port Unreachable)");
+			break;
+		default:
+			Log_Debug("ICMPv4", "Destination Unreachable (Code %i)", hdr->Code);
+			break;
+		}
+//		IPv4_Unreachable( Interface, hdr->Code, htons(hdr->Length)-sizeof(tICMPHeader), hdr->Data );
+		break;
+	
+	// -- 8: Echo Request
+	case ICMP_ECHOREQ:
+		if(hdr->Code != 0) {
+			Log_Warning("ICMPv4", "Code == %i for ICMP Echo Request, should be 0", hdr->Code);
+			return ;
+		}
+		//Log_Debug("ICMPv4", "Replying");
+		hdr->Type = ICMP_ECHOREPLY;
+		hdr->Checksum = 0;
+		hdr->Checksum = htons( IPv4_Checksum(hdr, Length) );
+		//Log_Debug("ICMPv4", "Checksum = 0x%04x", hdr->Checksum);
+		IPv4_SendPacket(Interface, *(tIPv4*)Address, 1, ntohs(hdr->Sequence), Length, hdr);
+		break;
+	default:
+		break;
+	}
+	
+}
+
+/**
+ * \brief Sends ICMP Echo and waits for the reply
+ * \note Times out after \a Interface->TimeoutDelay has elapsed
+ */
+int ICMP_Ping(tInterface *Interface, tIPv4 Addr)
+{
+	Sint64	ts;
+	Sint64	end;
+	char	buf[32] = "\x8\0\0\0\0\0\0\0Acess2 I"
+                      "P/TCP Stack 1.0\0";
+	tICMPHeader	*hdr = (void*)buf;
+	 int	i;
+	
+	for(;;)
+	{
+		for(i=0;i<PING_SLOTS;i++)
+		{
+			if(gICMP_PingSlots[i].Interface == NULL)	break;
+		}
+		if( i < PING_SLOTS )	break;
+		Threads_Yield();
+	}
+	gICMP_PingSlots[i].Interface = Interface;
+	gICMP_PingSlots[i].bArrived = 0;
+	hdr->ID = i;
+	hdr->Sequence = ~i;
+	hdr->Checksum = htons( IPv4_Checksum(hdr, sizeof(buf)) );
+	IPv4_SendPacket(Interface, Addr, 1, i, sizeof(buf), buf);
+	
+	ts = now();
+	end = ts + Interface->TimeoutDelay;
+	while( !gICMP_PingSlots[i].bArrived && now() < end)	Threads_Yield();
+	
+	if(now() > end)
+		return -1;
+	
+	return (int)ts;
 }