extern VOID TcpipAcquireFastMutex( PFAST_MUTEX Mutex );
extern VOID TcpipReleaseFastMutex( PFAST_MUTEX Mutex );
extern VOID TcpipRecursiveMutexInit( PRECURSIVE_MUTEX RecMutex );
-extern VOID TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex,
- BOOLEAN ToWrite );
+extern VOID TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex );
extern VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex );
#endif/*_LOCK_H*/
/* Get associated connection endpoint file object. Quit if none exists */
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
TranContext = IrpSp->FileObject->FsContext;
if (!TranContext) {
TI_DbgPrint(MID_TRACE, ("Bad transport context.\n"));
}
done:
- TcpipRecursiveMutexLeave( &TCPLock );
-
if (Status != STATUS_PENDING) {
DispDataRequestComplete(Irp, Status, 0);
} else
IrpSp = IoGetCurrentIrpStackLocation(Irp);
DisReq = (PTDI_REQUEST_KERNEL_DISCONNECT)&IrpSp->Parameters;
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
/* Get associated connection endpoint file object. Quit if none exists */
TranContext = IrpSp->FileObject->FsContext;
Irp );
done:
- TcpipRecursiveMutexLeave( &TCPLock );
-
if (Status != STATUS_PENDING) {
DispDataRequestComplete(Irp, Status, 0);
} else
/* Get associated connection endpoint file object. Quit if none exists */
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
TranContext = IrpSp->FileObject->FsContext;
if (TranContext == NULL)
{
}
done:
- TcpipRecursiveMutexLeave( &TCPLock );
-
if (Status != STATUS_PENDING) {
DispDataRequestComplete(Irp, Status, 0);
} else
PTDI_REQUEST_KERNEL_QUERY_INFORMATION Parameters;
PTRANSPORT_CONTEXT TranContext;
PIO_STACK_LOCATION IrpSp;
- NTSTATUS Status;
TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
IrpSp = IoGetCurrentIrpStackLocation(Irp);
Parameters = (PTDI_REQUEST_KERNEL_QUERY_INFORMATION)&IrpSp->Parameters;
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
TranContext = IrpSp->FileObject->FsContext;
if (!TranContext) {
TI_DbgPrint(MID_TRACE, ("Bad transport context.\n"));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_INVALID_PARAMETER;
}
(FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) +
sizeof(TDI_ADDRESS_IP))) {
TI_DbgPrint(MID_TRACE, ("MDL buffer too small.\n"));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_BUFFER_TOO_SMALL;
}
RtlZeroMemory(
&Address->Address[0].Address[0].sin_zero,
sizeof(Address->Address[0].Address[0].sin_zero));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_SUCCESS;
case TDI_CONNECTION_FILE:
RtlZeroMemory(
&Address->Address[0].Address[0].sin_zero,
sizeof(Address->Address[0].Address[0].sin_zero));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_SUCCESS;
default:
TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n"));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_INVALID_PARAMETER;
}
}
(FIELD_OFFSET(TDI_CONNECTION_INFORMATION, RemoteAddress) +
sizeof(PVOID))) {
TI_DbgPrint(MID_TRACE, ("MDL buffer too small (ptr).\n"));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_BUFFER_TOO_SMALL;
}
default:
TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n"));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_INVALID_PARAMETER;
}
if (!Endpoint) {
TI_DbgPrint(MID_TRACE, ("No connection object.\n"));
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_INVALID_PARAMETER;
}
- Status = TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE );
-
- TcpipRecursiveMutexLeave(&TCPLock);
- return Status;
+ return TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE );
}
}
- TcpipRecursiveMutexLeave(&TCPLock);
return STATUS_NOT_IMPLEMENTED;
}
IrpSp = IoGetCurrentIrpStackLocation(Irp);
ReceiveInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&(IrpSp->Parameters);
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
TranContext = IrpSp->FileObject->FsContext;
if (TranContext == NULL)
{
}
done:
- TcpipRecursiveMutexLeave( &TCPLock );
-
if (Status != STATUS_PENDING) {
DispDataRequestComplete(Irp, Status, BytesReceived);
} else
IrpSp = IoGetCurrentIrpStackLocation(Irp);
DgramInfo = (PTDI_REQUEST_KERNEL_RECEIVEDG)&(IrpSp->Parameters);
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
TranContext = IrpSp->FileObject->FsContext;
if (TranContext == NULL)
{
}
done:
- TcpipRecursiveMutexLeave( &TCPLock );
-
if (Status != STATUS_PENDING) {
DispDataRequestComplete(Irp, Status, BytesReceived);
} else
IrpSp = IoGetCurrentIrpStackLocation(Irp);
SendInfo = (PTDI_REQUEST_KERNEL_SEND)&(IrpSp->Parameters);
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
TranContext = IrpSp->FileObject->FsContext;
if (TranContext == NULL)
{
}
done:
- TcpipRecursiveMutexLeave( &TCPLock );
-
if (Status != STATUS_PENDING) {
DispDataRequestComplete(Irp, Status, BytesSent);
} else
IrpSp = IoGetCurrentIrpStackLocation(Irp);
DgramInfo = (PTDI_REQUEST_KERNEL_SENDDG)&(IrpSp->Parameters);
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
TranContext = IrpSp->FileObject->FsContext;
if (TranContext == NULL)
{
}
done:
- TcpipRecursiveMutexLeave( &TCPLock );
-
if (Status != STATUS_PENDING) {
DispDataRequestComplete(Irp, Status, Irp->IoStatus.Information);
} else
case IPPROTO_TCP:
TCPFreePort( AddrFile->Port );
if( AddrFile->Listener ) {
- TcpipRecursiveMutexEnter(&TCPLock, TRUE);
TCPClose( AddrFile->Listener );
- TcpipRecursiveMutexLeave(&TCPLock);
exFreePool( AddrFile->Listener );
}
break;
if( !Connection ) return STATUS_NO_MEMORY;
- TcpipRecursiveMutexEnter(&TCPLock, TRUE);
Status = TCPSocket( Connection, AF_INET, SOCK_STREAM, IPPROTO_TCP );
- TcpipRecursiveMutexLeave(&TCPLock);
if( !NT_SUCCESS(Status) ) {
TCPFreeConnectionEndpoint( Connection );
RemoveEntryList(&Connection->ListEntry);
TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql);
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
TCPClose( Connection );
- TcpipRecursiveMutexLeave( &TCPLock );
TCPFreeConnectionEndpoint(Connection);
RecursiveMutexInit( RecMutex );
}
-VOID TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) {
+VOID TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex ) {
//TI_DbgPrint(DEBUG_LOCK,("Locking\n"));
RecursiveMutexEnter( RecMutex );
}
VOID TcpipRecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ) {
}
-UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) {
- return 0;
+VOID TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex ) {
}
VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ) {
PTA_IP_ADDRESS RequestAddressReturn;
PTDI_CONNECTION_INFORMATION WhoIsConnecting;
- ASSERT_LOCKED(&TCPLock);
-
/* Unpack TDI info -- We need the return connection information
* struct to return the address so it can be filtered if needed
* by WSAAccept -- The returned address will be passed on to
WhoIsConnecting = (PTDI_CONNECTION_INFORMATION)
Request->ReturnConnectionInformation;
+ TcpipRecursiveMutexEnter(&TCPLock);
+
Status = TCPTranslateError
( OskitTCPAccept( Listener->SocketContext,
&Connection->SocketContext,
&OutAddrLen,
Request->RequestFlags & TDI_QUERY_ACCEPT ? 0 : 1 ) );
+ TcpipRecursiveMutexLeave(&TCPLock);
+
TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status));
if( NT_SUCCESS(Status) && Status != STATUS_PENDING ) {
NTSTATUS Status = STATUS_SUCCESS;
SOCKADDR_IN AddressToBind;
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
ASSERT(Connection);
ASSERT_KM_POINTER(Connection->SocketContext);
ASSERT_KM_POINTER(Connection->AddressFile);
TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port));
+ TcpipRecursiveMutexEnter( &TCPLock );
+
Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext,
&AddressToBind,
sizeof(AddressToBind) ) );
TI_DbgPrint(DEBUG_TCP,("TCPAccept started\n"));
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-
Status = TCPServiceListeningSocket( Listener, Connection,
(PTDI_REQUEST_KERNEL)Request );
- TcpipRecursiveMutexLeave( &TCPLock );
-
if( Status == STATUS_PENDING ) {
Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) );
Connection->SignalState |= NewState;
+ TcpipRecursiveMutexLeave(&TCPLock);
+
+ /* We must not be locked when handling signalled connections
+ * because a completion could trigger another IOCTL which
+ * would cause a deadlock
+ */
NewState = HandleSignalledConnection(Connection);
+ TcpipRecursiveMutexEnter(&TCPLock);
+
KeAcquireSpinLock(&SignalledConnectionsLock, &OldIrql);
if ((NewState == 0 || NewState == SEL_FIN) &&
(OldState != 0 && OldState != SEL_FIN))
PIRP Irp;
PMDL Mdl;
- ASSERT_LOCKED(&TCPLock);
-
TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n",
Connection, Connection->SocketContext));
UINT Family, UINT Type, UINT Proto ) {
NTSTATUS Status;
- ASSERT_LOCKED(&TCPLock);
+ TcpipRecursiveMutexEnter(&TCPLock);
TI_DbgPrint(DEBUG_TCP,("Called: Connection %x, Family %d, Type %d, "
"Proto %d\n",
TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n",
Connection->SocketContext));
+ TcpipRecursiveMutexLeave(&TCPLock);
+
return Status;
}
IPPacket->TotalSize,
IPPacket->HeaderSize));
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+ TcpipRecursiveMutexEnter( &TCPLock );
OskitTCPReceiveDatagram( IPPacket->Header,
IPPacket->TotalSize,
PsTerminateSystemThread(Status);
}
- TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+ TcpipRecursiveMutexEnter( &TCPLock );
TimerOskitTCP( Next == NextFast, Next == NextSlow );
+ TcpipRecursiveMutexLeave( &TCPLock );
+
if (Next == NextSlow) {
DrainSignals();
}
- TcpipRecursiveMutexLeave( &TCPLock );
Current = Next;
if (10 <= Current) {
return Status;
}
- TcpipRecursiveMutexEnter(&TCPLock, TRUE);
+ TcpipRecursiveMutexEnter(&TCPLock);
RegisterOskitTCPEventHandlers( &EventHandlers );
InitOskitTCP();
TcpipRecursiveMutexLeave(&TCPLock);
TCPInitialized = FALSE;
+ TcpipRecursiveMutexEnter(&TCPLock);
DeinitOskitTCP();
+ TcpipRecursiveMutexLeave(&TCPLock);
PortsShutdown( &TCPPorts );
TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n"));
- ASSERT_LOCKED(&TCPLock);
-
Status = AddrBuildAddress
((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress,
&RemoteAddress,
AddressToBind = AddressToConnect;
AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address;
+ TcpipRecursiveMutexEnter(&TCPLock);
+
Status = TCPTranslateError
( OskitTCPBind( Connection->SocketContext,
&AddressToBind,
}
}
+ TcpipRecursiveMutexLeave(&TCPLock);
+
return Status;
}
TI_DbgPrint(DEBUG_TCP,("started\n"));
+ TcpipRecursiveMutexEnter(&TCPLock);
+
if (Flags & TDI_DISCONNECT_RELEASE)
Status = TCPTranslateError(OskitTCPDisconnect(Connection->SocketContext));
if ((Flags & TDI_DISCONNECT_ABORT) || !Flags)
Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD));
+ TcpipRecursiveMutexLeave(&TCPLock);
+
TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status));
return Status;
TI_DbgPrint(DEBUG_TCP,("TCPClose started\n"));
- ASSERT_LOCKED(&TCPLock);
-
/* Make our code remove all pending IRPs */
Connection->SignalState |= SEL_FIN;
HandleSignalledConnection(Connection);
+ TcpipRecursiveMutexEnter(&TCPLock);
+
Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) );
if (Status == STATUS_SUCCESS)
Connection->SocketContext = NULL;
+ TcpipRecursiveMutexLeave(&TCPLock);
+
TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status));
return Status;
TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n",
ReceiveLength, Connection->SocketContext));
- ASSERT_LOCKED(&TCPLock);
-
ASSERT_KM_POINTER(Connection->SocketContext);
NdisQueryBuffer( Buffer, &DataBuffer, &DataLen );
TI_DbgPrint(DEBUG_TCP,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen));
+ TcpipRecursiveMutexEnter(&TCPLock);
+
Status = TCPTranslateError
( OskitTCPRecv
( Connection->SocketContext,
&Received,
ReceiveFlags ) );
+ TcpipRecursiveMutexLeave(&TCPLock);
+
TI_DbgPrint(DEBUG_TCP,("OskitTCPReceive: %x, %d\n", Status, Received));
/* Keep this request around ... there was no data yet */
TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n",
Connection->SocketContext));
+ TcpipRecursiveMutexEnter(&TCPLock);
Status = TCPTranslateError
( OskitTCPSend( Connection->SocketContext,
(OSK_PCHAR)BufferData, SendLength,
&Sent, 0 ) );
+ TcpipRecursiveMutexLeave(&TCPLock);
+
TI_DbgPrint(DEBUG_TCP,("OskitTCPSend: %x, %d\n", Status, Sent));
/* Keep this request around ... there was no data yet */
PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address;
NTSTATUS Status;
- ASSERT_LOCKED(&TCPLock);
+ TcpipRecursiveMutexEnter(&TCPLock);
Status = TCPTranslateError(OskitTCPGetAddress(Connection->SocketContext,
&LocalAddress, &LocalPort,
&RemoteAddress, &RemotePort));
+
+ TcpipRecursiveMutexLeave(&TCPLock);
+
if (!NT_SUCCESS(Status))
return Status;