Author: cgutman
Date: Sun Jul 31 23:32:38 2011
New Revision: 53013
URL: http://svn.reactos.org/svn/reactos?rev=53013&view=rev
Log:
[TCPIP]
- Add a couple more debug prints
Modified:
trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c
Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Jul 31 23:32:38 2011
@@ -284,6 +284,7 @@
{
/* The client specified an explicit port so we force a bind to this */
AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port);
+ DbgPrint("Bind - Explicit port %d\n", AddrFile->Port);
/* Check for bind success */
if (AddrFile->Port == 0xffff)
@@ -299,6 +300,7 @@
{
/* The client is trying to bind to a local address so allocate a port now too */
AddrFile->Port = TCPAllocatePort(0);
+ DbgPrint("Bind - Unspecified port %d\n", AddrFile->Port);
/* Check for bind success */
if (AddrFile->Port == 0xffff)
Author: cgutman
Date: Sun Jul 31 22:32:18 2011
New Revision: 53010
URL: http://svn.reactos.org/svn/reactos?rev=53010&view=rev
Log:
[IP]
- Add some temporary debug prints to troubleshoot some seemingly random bind failures
Modified:
trunk/reactos/lib/drivers/ip/transport/tcp/accept.c
trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t…
==============================================================================
--- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sun Jul 31 22:32:18 2011
@@ -88,6 +88,8 @@
Status = TCPTranslateError(OskitTCPBind(Connection,
&AddressToBind,
sizeof(AddressToBind)));
+
+ DbgPrint("Listen - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status);
}
else
{
@@ -108,6 +110,7 @@
{
/* Allocate the port in the port bitmap */
Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port);
+ DbgPrint("Listen - Implicit bind on port %d\n", Connection->AddressFile->Port);
/* This should never fail */
ASSERT(Connection->AddressFile->Port != 0xFFFF);
Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t…
==============================================================================
--- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Jul 31 22:32:18 2011
@@ -773,6 +773,8 @@
Status = TCPTranslateError(OskitTCPBind(Connection,
&AddressToBind,
sizeof(AddressToBind)));
+
+ DbgPrint("Connect - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status);
}
else
{
@@ -803,6 +805,7 @@
{
/* Allocate the port in the port bitmap */
Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port);
+ DbgPrint("Connect - Implicit bind on port %d\n", Connection->AddressFile->Port);
/* This should never fail */
ASSERT(Connection->AddressFile->Port != 0xFFFF);
Author: tkreuzer
Date: Sun Jul 31 19:26:11 2011
New Revision: 53008
URL: http://svn.reactos.org/svn/reactos?rev=53008&view=rev
Log:
[NTOSKRNL]
Fix OBTRACE definition.
the macro used __VA_ARGS__ and passes that to DPRINT(fmt, ...)
The preprocessor interpretes all arguments of __VA_ARGS__ as one token. This token was now passed as the first parameter of DPRINT1. This caused wrong parameters being used, resulting in a crash.
Modified:
trunk/reactos/ntoskrnl/include/internal/ob.h
Modified: trunk/reactos/ntoskrnl/include/internal/ob.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Sun Jul 31 19:26:11 2011
@@ -31,7 +31,7 @@
if (x & ObpTraceLevel) DbgPrint(__VA_ARGS__)
#endif
#else
-#define OBTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define OBTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
#endif
//
Author: cgutman
Date: Sun Jul 31 18:47:35 2011
New Revision: 53006
URL: http://svn.reactos.org/svn/reactos?rev=53006&view=rev
Log:
[FLOPPY]
- Report recalibration failure if the EC flag is set after seeking to fix a hang while trying to read
- Thanks to igorko for testing
Modified:
trunk/reactos/drivers/storage/floppy/hardware.c
Modified: trunk/reactos/drivers/storage/floppy/hardware.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har…
==============================================================================
--- trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] Sun Jul 31 18:47:35 2011
@@ -448,7 +448,10 @@
/* Is the equipment check flag set? Could be no disk in drive... */
if((Buffer[0] & SR0_EQUIPMENT_CHECK) == SR0_EQUIPMENT_CHECK)
- INFO_(FLOPPY, "HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n");
+ {
+ WARN_(FLOPPY, "HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning failure\n");
+ return STATUS_UNSUCCESSFUL;
+ }
return STATUS_SUCCESS;
}