Author: cgutman
Date: Tue Aug 2 19:52:25 2011
New Revision: 53034
URL:
http://svn.reactos.org/svn/reactos?rev=53034&view=rev
Log:
[TCPIP]
- Remove some more debugging
[IP]
- Only print a message if the operation failed
Modified:
branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c
branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c
Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n…
==============================================================================
--- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Aug
2 19:52:25 2011
@@ -282,8 +282,6 @@
TDI_REQUEST Request;
NTSTATUS Status;
- DbgPrint("[TCPIP, TiCloseFileObject] Called\n");
-
IrpSp = IoGetCurrentIrpStackLocation(Irp);
Context = IrpSp->FileObject->FsContext;
if (!Context)
@@ -295,7 +293,6 @@
switch ((ULONG_PTR)IrpSp->FileObject->FsContext2)
{
case TDI_TRANSPORT_ADDRESS_FILE:
- DbgPrint("[TCPIP, TiCloseFileObject] Closing address file\n");
Request.Handle.AddressHandle = Context->Handle.AddressHandle;
Status = FileCloseAddress(&Request);
break;
@@ -311,14 +308,11 @@
break;
default:
- DbgPrint("Unknown type %d\n",
(ULONG_PTR)IrpSp->FileObject->FsContext2);
Status = STATUS_INVALID_PARAMETER;
break;
}
Irp->IoStatus.Status = Status;
-
- DbgPrint("[TCPIP, TiCloseFileObject] Leaving. Status = 0x%x\n", Status);
return Irp->IoStatus.Status;
}
Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive…
==============================================================================
--- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Aug
2 19:52:25 2011
@@ -195,7 +195,7 @@
switch (err)
{
- case ERR_OK: Status = STATUS_SUCCESS; break; //0
+ case ERR_OK: Status = STATUS_SUCCESS; return Status; //0
case ERR_MEM: Status = STATUS_INSUFFICIENT_RESOURCES; break; //-1
case ERR_BUF: Status = STATUS_BUFFER_TOO_SMALL; break; //-2
case ERR_TIMEOUT: Status = STATUS_TIMEOUT; break; // -3
@@ -209,7 +209,7 @@
case ERR_USE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; //-11
case ERR_IF: Status = STATUS_NETWORK_UNREACHABLE; break; //-12
case ERR_ISCONN: Status = STATUS_UNSUCCESSFUL; break; //-13 (FIXME)
- case ERR_INPROGRESS: Status = STATUS_PENDING; break; //-14
+ case ERR_INPROGRESS: Status = STATUS_PENDING; return Status; //-14
default:
DbgPrint("Invalid error value: %d\n", err);
ASSERT(FALSE);
@@ -217,8 +217,8 @@
break;
}
- DbgPrint("TCPTranslateError: %d -> %x\n", (unsigned int)err, Status);
-
+ DbgPrint("TCP operation failed: 0x%x (%d)\n", Status, err);
+
return Status;
}