X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Ficmp.c;h=f34d790fd01751a1616f91c11857ba203de07298;hb=7e9bbefbdcbfdba27eb6cdacae0811f428483892;hp=16037199173abb974df8cae419ab4b5b41f0c917;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/icmp.c b/KernelLand/Modules/IPStack/icmp.c
index 16037199..f34d790f 100644
--- a/KernelLand/Modules/IPStack/icmp.c
+++ b/KernelLand/Modules/IPStack/icmp.c
@@ -26,7 +26,7 @@ struct {
  */
 void ICMP_Initialise()
 {
-	IPv4_RegisterCallback(IP4PROT_ICMP, ICMP_GetPacket);
+	IPv4_RegisterCallback(IP4PROT_ICMP, ICMP_GetPacket, NULL);
 }
 
 /**
@@ -64,12 +64,15 @@ void ICMP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buff
 		{
 		case 3:	// Port Unreachable
 			Log_Debug("ICMPv4", "Destination Unreachable (Port Unreachable)");
+			IPv4_HandleError( Interface, IPERR_PORT_UNREACHABLE,
+				htons(Length)-sizeof(tICMPHeader), hdr->Data );
 			break;
 		default:
 			Log_Debug("ICMPv4", "Destination Unreachable (Code %i)", hdr->Code);
+			IPv4_HandleError( Interface, IPERR_MISC,
+				htons(Length)-sizeof(tICMPHeader), hdr->Data );
 			break;
 		}
-//		IPv4_Unreachable( Interface, hdr->Code, htons(hdr->Length)-sizeof(tICMPHeader), hdr->Data );
 		break;
 	
 	// -- 8: Echo Request
@@ -83,7 +86,10 @@ void ICMP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buff
 		hdr->Checksum = 0;
 		hdr->Checksum = htons( IPv4_Checksum( (Uint16*)hdr, Length/2 ) );
 		//Log_Debug("ICMPv4", "Checksum = 0x%04x", hdr->Checksum);
-		IPv4_SendPacket(Interface, *(tIPv4*)Address, 1, ntohs(hdr->Sequence), Length, hdr);
+		
+		tIPStackBuffer	*buffer = IPStack_Buffer_CreateBuffer(1 + IPV4_BUFFERS);
+		IPStack_Buffer_AppendSubBuffer(buffer, Length, 0, hdr, NULL, NULL);
+		IPv4_SendPacket(Interface, *(tIPv4*)Address, 1, ntohs(hdr->Sequence), buffer);
 		break;
 	default:
 		break;
@@ -117,16 +123,18 @@ int ICMP_Ping(tInterface *Interface, tIPv4 Addr)
 	gICMP_PingSlots[i].bArrived = 0;
 	hdr->ID = i;
 	hdr->Sequence = ~i;
-	hdr->Checksum = htons( IPv4_Checksum((Uint16*)hdr, sizeof(buf)/2) );
+	hdr->Checksum = htons( IPv4_Checksum((Uint16*)buf, sizeof(buf)) );
 	
 	ts = now();
 	
-	IPv4_SendPacket(Interface, Addr, 1, i, sizeof(buf), buf);
+	tIPStackBuffer	*buffer = IPStack_Buffer_CreateBuffer(1 + IPV4_BUFFERS);
+	IPStack_Buffer_AppendSubBuffer(buffer, sizeof(buf), 0, buf, NULL, NULL);
+	IPv4_SendPacket(Interface, Addr, 1, i, buffer);
 	
 	end = ts + Interface->TimeoutDelay;
 	while( !gICMP_PingSlots[i].bArrived && now() < end)	Threads_Yield();
 	
-	if(now() > end)
+	if( !gICMP_PingSlots[i].bArrived )
 		return -1;
 	
 	return (int)( now() - ts );