X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Farp.c;h=5b9303b9b302aa14586e36e8de7edda87336cab2;hb=9382d3191512d5194a6d31f220a508f242449439;hp=d1d50cdaf07aa90a2f2e8524a6da7835addc5e4e;hpb=9a98f63d3d121415145ffdf4b87b739313642948;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/arp.c b/KernelLand/Modules/IPStack/arp.c
index d1d50cda..5b9303b9 100644
--- a/KernelLand/Modules/IPStack/arp.c
+++ b/KernelLand/Modules/IPStack/arp.c
@@ -206,9 +206,6 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address)
 
 	// Send Request
 	Link_SendPacket(Interface->Adapter, 0x0806, req.DestMac, buffer);
-
-	// Clean up
-	IPStack_Buffer_DestroyBuffer(buffer);
 	
 	// Wait for a reply
 	Time_ScheduleTimer(NULL, Interface->TimeoutDelay);
@@ -367,18 +364,18 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
 		switch( req4->SWSize )
 		{
 		case 4:
-			Log_Debug("ARP", "ARP Request IPv4 Address %i.%i.%i.%i from %i.%i.%i.%i",
-				req4->DestIP.B[0], req4->DestIP.B[1], req4->DestIP.B[2],
-				req4->DestIP.B[3],
-				req4->SourceIP.B[0], req4->SourceIP.B[1],
-				req4->SourceIP.B[2], req4->SourceIP.B[3]);
-			Log_Debug("ARP", " from MAC %02x:%02x:%02x:%02x:%02x:%02x",
-				req4->SourceMac.B[0], req4->SourceMac.B[1],
-				req4->SourceMac.B[2], req4->SourceMac.B[3],
-				req4->SourceMac.B[4], req4->SourceMac.B[5]);
 			iface = IPv4_GetInterface(Adapter, req4->DestIP, 0);
 			if( iface )
 			{
+				Log_Debug("ARP", "ARP Request IPv4 Address %i.%i.%i.%i from %i.%i.%i.%i"
+					" (%02x:%02x:%02x:%02x:%02x:%02x)",
+					req4->DestIP.B[0], req4->DestIP.B[1], req4->DestIP.B[2],
+					req4->DestIP.B[3],
+					req4->SourceIP.B[0], req4->SourceIP.B[1],
+					req4->SourceIP.B[2], req4->SourceIP.B[3],
+					req4->SourceMac.B[0], req4->SourceMac.B[1],
+					req4->SourceMac.B[2], req4->SourceMac.B[3],
+					req4->SourceMac.B[4], req4->SourceMac.B[5]);
 				ARP_UpdateCache4(req4->SourceIP, req4->SourceMac);
 				
 				req4->DestIP = req4->SourceIP;
@@ -393,9 +390,10 @@ void ARP_int_GetPacket(tAdapter *Adapter, tMacAddr From, int Length, void *Buffe
 				
 				// Assumes only a header and footer at link layer
 				tIPStackBuffer	*buffer = IPStack_Buffer_CreateBuffer(3);
-				IPStack_Buffer_AppendSubBuffer(buffer, sizeof(struct sArpRequest4), 0, req4, NULL, NULL);
+				IPStack_Buffer_AppendSubBuffer(buffer,
+					sizeof(struct sArpRequest4), 0, req4,
+					NULL, NULL);
 				Link_SendPacket(Adapter, 0x0806, req4->DestMac, buffer);
-				IPStack_Buffer_DestroyBuffer(buffer);
 			}
 			break;
 		#if ARPv6