From: John Hodge <tpg@mutabah.net>
Date: Sun, 7 Aug 2011 04:08:23 +0000 (+0800)
Subject: Kernel - Cleaning up messages
X-Git-Tag: rel0.10
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=c205f388f8722a5d73f71ee98b0232444c5c7e9d;p=tpg%2Facess2.git

Kernel - Cleaning up messages
---

diff --git a/Kernel/arch/x86/vm8086.c b/Kernel/arch/x86/vm8086.c
index ef449d45..6d60d9b1 100644
--- a/Kernel/arch/x86/vm8086.c
+++ b/Kernel/arch/x86/vm8086.c
@@ -89,7 +89,8 @@ int VM8086_Install(char **Arguments)
 		for(i=1;i<0x9F;i++) {
 			MM_Map( i * 0x1000, i * 0x1000 );
 			MM_DerefPhys( i * 0x1000 );	// Above
-			MM_DerefPhys( i * 0x1000 );	// Phys setup
+			if(MM_GetRefCount(i*0x1000))
+				MM_DerefPhys( i * 0x1000 );	// Phys setup
 		}
 		MM_Map( 0x9F000, 0x9F000 );	// Stack / EBDA
 		// System Stack / Stub
diff --git a/Modules/IPStack/tcp.c b/Modules/IPStack/tcp.c
index 24f2c239..bb71fdbf 100644
--- a/Modules/IPStack/tcp.c
+++ b/Modules/IPStack/tcp.c
@@ -135,17 +135,10 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
 	tTCPListener	*srv;
 	tTCPConnection	*conn;
 
-	Log_Log("TCP", "TCP_GetPacket: SourcePort = %i, DestPort = %i",
-		ntohs(hdr->SourcePort), ntohs(hdr->DestPort));
-/*
-	Log_Log("TCP", "TCP_GetPacket: SequenceNumber = 0x%x", ntohl(hdr->SequenceNumber));
-	Log_Log("TCP", "TCP_GetPacket: AcknowlegementNumber = 0x%x", ntohl(hdr->AcknowlegementNumber));
-	Log_Log("TCP", "TCP_GetPacket: DataOffset = %i", hdr->DataOffset >> 4);
-	Log_Log("TCP", "TCP_GetPacket: WindowSize = %i", htons(hdr->WindowSize));
-	Log_Log("TCP", "TCP_GetPacket: Checksum = 0x%x", htons(hdr->Checksum));
-	Log_Log("TCP", "TCP_GetPacket: UrgentPointer = 0x%x", htons(hdr->UrgentPointer));
-*/
-	Log_Log("TCP", "TCP_GetPacket: Flags = %s%s%s%s%s%s%s%s",
+	Log_Log("TCP", "TCP_GetPacket: <Local>:%i from [%s]:%i, Flags= %s%s%s%s%s%s%s%s",
+		ntohs(hdr->SourcePort),
+		IPStack_PrintAddress(Interface->Type, Address),
+		ntohs(hdr->DestPort),
 		(hdr->Flags & TCP_FLAG_CWR) ? "CWR " : "",
 		(hdr->Flags & TCP_FLAG_ECE) ? "ECE " : "",
 		(hdr->Flags & TCP_FLAG_URG) ? "URG " : "",
@@ -183,8 +176,6 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
 			// Is this in an established connection?
 			for( conn = srv->Connections; conn; conn = conn->Next )
 			{
-				Log_Log("TCP", "TCP_GetPacket: conn->Interface(%p) == Interface(%p)",
-					conn->Interface, Interface);
 				// Check that it is coming in on the same interface
 				if(conn->Interface != Interface)	continue;