Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge aicom-network-fixes up to 35260

Browse source 
svn path=/trunk/; revision=35267
This commit is contained in:
Art Yerkes 2008-08-11 00:02:26 +00:00
parent a4bc397498
commit 30b9ab966f
3 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/drivers/network/afd/afd/select.c
View file

@ -85,6 +85,7 @@ static VOID SignalSocket(
PollReq->Handles[i].Status)); PollReq->Handles[i].Status));
} }
UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount );
if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) );
AFD_DbgPrint(MID_TRACE,("Completing\n")); AFD_DbgPrint(MID_TRACE,("Completing\n"));
IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT );
AFD_DbgPrint(MID_TRACE,("Done\n")); AFD_DbgPrint(MID_TRACE,("Done\n"));
@ -391,6 +392,11 @@ VOID PollReeval( PAFD_DEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject ) {
/* Take care of any event select signalling */ /* Take care of any event select signalling */
FCB = (PAFD_FCB)FileObject->FsContext; FCB = (PAFD_FCB)FileObject->FsContext;
if( !FCB ) {
KeReleaseSpinLock( &DeviceExt->Lock, OldIrql );
return;
}
/* Not sure if i can do this at DISPATCH_LEVEL ... try it at passive */ /* Not sure if i can do this at DISPATCH_LEVEL ... try it at passive */
AFD_DbgPrint(MID_TRACE,("Current State: %x, Events Fired: %x, " AFD_DbgPrint(MID_TRACE,("Current State: %x, Events Fired: %x, "
"Select Triggers %x\n", "Select Triggers %x\n",
@ -401,11 +407,6 @@ VOID PollReeval( PAFD_DEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject ) {
EventSelect = FCB->EventSelect; EventSelect = FCB->EventSelect;
} }
if( !FCB ) {
KeReleaseSpinLock( &DeviceExt->Lock, OldIrql );
return;
}
/* Now signal normal select irps */ /* Now signal normal select irps */
ThePollEnt = DeviceExt->Polls.Flink; ThePollEnt = DeviceExt->Polls.Flink;

2
reactos/drivers/network/afd/afd/tdi.c
View file

@ -631,7 +631,6 @@ NTSTATUS TdiQueryInformation(
return Status; return Status;
} }
#if 0
NTSTATUS TdiQueryInformationEx( NTSTATUS TdiQueryInformationEx(
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
ULONG Entity, ULONG Entity,
@ -807,7 +806,6 @@ NTSTATUS TdiQueryAddress(
return Status; return Status;
} }
#endif
NTSTATUS TdiSend NTSTATUS TdiSend
( PIRP *Irp, ( PIRP *Irp,

49
reactos/drivers/network/afd/include/afd.h
View file

@ -28,6 +28,55 @@
#define MIN(x,y) (((x)<(y))?(x):(y)) #define MIN(x,y) (((x)<(y))?(x):(y))
#endif #endif
#define IOCTL_TCP_QUERY_INFORMATION_EX \
CTL_CODE(FILE_DEVICE_NETWORK, 0, METHOD_NEITHER, FILE_ANY_ACCESS)
#define TL_INSTANCE 0
#define IP_MIB_STATS_ID 1
#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102
typedef struct IPSNMP_INFO {
ULONG Forwarding;
ULONG DefaultTTL;
ULONG InReceives;
ULONG InHdrErrors;
ULONG InAddrErrors;
ULONG ForwDatagrams;
ULONG InUnknownProtos;
ULONG InDiscards;
ULONG InDelivers;
ULONG OutRequests;
ULONG RoutingDiscards;
ULONG OutDiscards;
ULONG OutNoRoutes;
ULONG ReasmTimeout;
ULONG ReasmReqds;
ULONG ReasmOks;
ULONG ReasmFails;
ULONG FragOks;
ULONG FragFails;
ULONG FragCreates;
ULONG NumIf;
ULONG NumAddr;
ULONG NumRoutes;
} IPSNMP_INFO, *PIPSNMP_INFO;
typedef struct IPADDR_ENTRY {
ULONG Addr;
ULONG Index;
ULONG Mask;
ULONG BcastAddr;
ULONG ReasmSize;
USHORT Context;
USHORT Pad;
} IPADDR_ENTRY, *PIPADDR_ENTRY;
#define DN2H(dw) \
((((dw) & 0xFF000000L) >> 24) | \
(((dw) & 0x00FF0000L) >> 8) | \
(((dw) & 0x0000FF00L) << 8) | \
(((dw) & 0x000000FFL) << 24))
#define SOCKET_STATE_INVALID_TRANSITION ((DWORD)-1) #define SOCKET_STATE_INVALID_TRANSITION ((DWORD)-1)
#define SOCKET_STATE_CREATED 0 #define SOCKET_STATE_CREATED 0
#define SOCKET_STATE_BOUND 1 #define SOCKET_STATE_BOUND 1