Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 871eb35068 into c5325f5016

Browse source
This commit is contained in:
Johannes Thoma 2025-03-30 23:38:34 +08:00 committed by GitHub
commit 1b491dce64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 1684 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/network/CMakeLists.txt
View file

@ -3,5 +3,6 @@ add_subdirectory(afd)
add_subdirectory(dd)
add_subdirectory(ndis)
add_subdirectory(ndisuio)
add_subdirectory(netio)
add_subdirectory(tcpip)
add_subdirectory(tdi)

5
drivers/network/afd/CMakeLists.txt
View file

@ -1,6 +1,7 @@
include_directories(
BEFORE include
../tdihelpers/include
${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
list(APPEND SOURCE
@ -13,8 +14,8 @@ list(APPEND SOURCE
afd/main.c
afd/read.c
afd/select.c
afd/tdi.c
afd/tdiconn.c
../tdihelpers/tdi.c
../tdihelpers/tdiconn.c
afd/write.c
include/afd.h)

65
drivers/network/afd/include/afd.h
View file

@ -337,71 +337,6 @@ VOID SignalSocket(
PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL,
PAFD_POLL_INFO PollReq, NTSTATUS Status);
/* tdi.c */
NTSTATUS TdiOpenAddressFile(
PUNICODE_STRING DeviceName,
PTRANSPORT_ADDRESS Name,
ULONG ShareType,
PHANDLE AddressHandle,
PFILE_OBJECT *AddressObject);
NTSTATUS TdiAssociateAddressFile(
HANDLE AddressHandle,
PFILE_OBJECT ConnectionObject);
NTSTATUS TdiDisassociateAddressFile(
PFILE_OBJECT ConnectionObject);
NTSTATUS TdiListen
( PIRP *Irp,
PFILE_OBJECT ConnectionObject,
PTDI_CONNECTION_INFORMATION *RequestConnectionInfo,
PTDI_CONNECTION_INFORMATION *ReturnConnectionInfo,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiReceive
( PIRP *Irp,
PFILE_OBJECT ConnectionObject,
USHORT Flags,
PCHAR Buffer,
UINT BufferLength,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiSend
( PIRP *Irp,
PFILE_OBJECT ConnectionObject,
USHORT Flags,
PCHAR Buffer,
UINT BufferLength,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiReceiveDatagram(
PIRP *Irp,
PFILE_OBJECT TransportObject,
USHORT Flags,
PCHAR Buffer,
UINT BufferLength,
PTDI_CONNECTION_INFORMATION From,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiSendDatagram(
PIRP *Irp,
PFILE_OBJECT TransportObject,
PCHAR Buffer,
UINT BufferLength,
PTDI_CONNECTION_INFORMATION To,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiQueryMaxDatagramLength(
PFILE_OBJECT FileObject,
PUINT MaxDatagramLength);
/* write.c */
NTSTATUS NTAPI

45
drivers/network/afd/include/tdi_proto.h
View file

@ -1,45 +0,0 @@
#pragma once
NTSTATUS TdiConnect( PIRP *PendingIrp,
PFILE_OBJECT ConnectionObject,
PTDI_CONNECTION_INFORMATION ConnectionCallInfo,
PTDI_CONNECTION_INFORMATION ConnectionReturnInfo,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext );
NTSTATUS TdiOpenConnectionEndpointFile(PUNICODE_STRING DeviceName,
PHANDLE ConnectionHandle,
PFILE_OBJECT *ConnectionObject);
NTSTATUS TdiCloseDevice(HANDLE Handle,
PFILE_OBJECT FileObject);
NTSTATUS TdiDisconnect
( PIRP *Irp,
PFILE_OBJECT TransportObject,
PLARGE_INTEGER Time,
USHORT Flags,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext,
PTDI_CONNECTION_INFORMATION RequestConnectionInfo,
PTDI_CONNECTION_INFORMATION ReturnConnectionInfo );
NTSTATUS TdiQueryInformation(
PFILE_OBJECT FileObject,
LONG QueryType,
PMDL MdlBuffer);
NTSTATUS TdiSetEventHandler(
PFILE_OBJECT FileObject,
LONG EventType,
PVOID Handler,
PVOID Context);
NTSTATUS TdiQueryDeviceControl(
PFILE_OBJECT FileObject,
ULONG IoControlCode,
PVOID InputBuffer,
ULONG InputBufferLength,
PVOID OutputBuffer,
ULONG OutputBufferLength,
PULONG Return);

20
drivers/network/afd/include/tdiconn.h
View file

@ -1,20 +0,0 @@
#pragma once
typedef VOID *PTDI_CONNECTION_INFO_PAIR;
PTRANSPORT_ADDRESS TaCopyTransportAddress( PTRANSPORT_ADDRESS OtherAddress );
PTRANSPORT_ADDRESS TaBuildNullTransportAddress(UINT AddressType);
UINT TaLengthOfAddress( PTA_ADDRESS Addr );
UINT TaLengthOfTransportAddress( PTRANSPORT_ADDRESS Addr );
VOID TaCopyTransportAddressInPlace( PTRANSPORT_ADDRESS Target,
PTRANSPORT_ADDRESS Source );
UINT TdiAddressSizeFromType( UINT Type );
UINT TdiAddressSizeFromName( PTRANSPORT_ADDRESS Name );
NTSTATUS TdiBuildConnectionInfoInPlace
( PTDI_CONNECTION_INFORMATION ConnInfo, PTRANSPORT_ADDRESS Name );
NTSTATUS TdiBuildConnectionInfo
( PTDI_CONNECTION_INFORMATION *ConnectionInfo, PTRANSPORT_ADDRESS Name );
NTSTATUS TdiBuildNullConnectionInfoInPlace
( PTDI_CONNECTION_INFORMATION ConnInfo, ULONG Type );
NTSTATUS TdiBuildNullConnectionInfo
( PTDI_CONNECTION_INFORMATION *ConnectionInfo, ULONG Type );

24
drivers/network/netio/CMakeLists.txt Normal file
View file

@ -0,0 +1,24 @@
spec2def(netio.sys netio.spec ADD_IMPORTLIB)
# TODO: dependency on afd.h should go away ...
include_directories(
BEFORE include
../afd/include
../tdihelpers/include
${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
list(APPEND SOURCE
netio.c
../tdihelpers/tdi.c
../tdihelpers/tdiconn.c
${CMAKE_CURRENT_BINARY_DIR}/netio.def
)
add_library(netio MODULE ${SOURCE})
target_link_libraries(netio ${PSEH_LIB})
set_module_type(netio kernelmodedriver)
add_importlibs(netio ntoskrnl hal)
add_cd_file(TARGET netio DESTINATION reactos/system32/drivers FOR all)
add_registry_inf(netio_reg.inf)

95
drivers/network/netio/include/netio_debug.h Normal file
View file

@ -0,0 +1,95 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Ancillary Function Driver
* FILE: include/netio_debug.h
* PURPOSE: Debugging support macros
* DEFINES: DBG - Enable debug output
* NASSERT - Disable assertions
*/
/* Question to reviewers: does mingw support this #pragma? */
#pragma once
#define NORMAL_MASK 0x000000FF
#define SPECIAL_MASK 0xFFFFFF00
#define MIN_TRACE 0x00000001
#define MID_TRACE 0x00000002
#define MAX_TRACE 0x00000003
#define DEBUG_CHECK 0x00000100
#define DEBUG_IRP 0x00000200
#define DEBUG_ULTRA 0xFFFFFFFF
#if DBG
extern ULONG DebugTraceLevel;
#ifdef _MSC_VER
#define NETIO_DbgPrint(_t_, _x_) \
if ((_t_ > NORMAL_MASK) \
? (DebugTraceLevel & _t_) > NORMAL_MASK \
: (DebugTraceLevel & NORMAL_MASK) >= _t_) { \
DbgPrint("(%s:%d) ", __FILE__, __LINE__); \
DbgPrint _x_ ; \
}
#else /* _MSC_VER */
#define NETIO_DbgPrint(_t_, _x_) \
if ((_t_ > NORMAL_MASK) \
? (DebugTraceLevel & _t_) > NORMAL_MASK \
: (DebugTraceLevel & NORMAL_MASK) >= _t_) { \
DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \
DbgPrint _x_; \
}
#endif /* _MSC_VER */
#ifdef ASSERT
#undef ASSERT
#endif
#ifdef NASSERT
#define ASSERT(x)
#else /* NASSERT */
#define ASSERT(x) if (!(x)) { NETIO_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); DbgBreakPoint(); }
#endif /* NASSERT */
#else /* DBG */
#define NETIO_DbgPrint(_t_, _x_)
#define ASSERTKM(x)
#ifndef ASSERT
#define ASSERT(x)
#endif
#endif /* DBG */
#undef assert
#define assert(x) ASSERT(x)
#ifdef _MSC_VER
#define UNIMPLEMENTED \
NETIO_DbgPrint(MIN_TRACE, ("The function at %s:%d is unimplemented, \
but come back another day.\n", __FILE__, __LINE__));
#else /* _MSC_VER */
#define UNIMPLEMENTED \
NETIO_DbgPrint(MIN_TRACE, ("%s at %s:%d is unimplemented, " \
"but come back another day.\n", __FUNCTION__, __FILE__, __LINE__));
#endif /* _MSC_VER */
#define CHECKPOINT \
NETIO_DbgPrint(DEBUG_CHECK, ("\n"));
#define CP CHECKPOINT
/* EOF */

1365
drivers/network/netio/netio.c Normal file
View file

File diff suppressed because it is too large Load diff

4
drivers/network/netio/netio.spec Normal file
View file

@ -0,0 +1,4 @@
@ stdcall WskRegister(ptr ptr)
@ stdcall WskCaptureProviderNPI(ptr long ptr)
@ stdcall WskReleaseProviderNPI(ptr)
@ stdcall WskDeregister(ptr)

7
drivers/network/netio/netio_reg.inf Normal file
View file

@ -0,0 +1,7 @@
; Netio driver
[AddReg]
HKLM,"SYSTEM\CurrentControlSet\Services\Netio","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Netio","Group",0x00000000,"TDI"
HKLM,"SYSTEM\CurrentControlSet\Services\Netio","ImagePath",0x00020000,"system32\drivers\netio.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\Netio","Start",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Netio","Type",0x00010001,0x00000001

39
drivers/network/tdihelpers/include/tdi_proto.h Normal file
View file

@ -0,0 +1,39 @@
#pragma once
NTSTATUS TdiConnect(
PIRP * PendingIrp,
PFILE_OBJECT ConnectionObject,
PTDI_CONNECTION_INFORMATION ConnectionCallInfo,
PTDI_CONNECTION_INFORMATION ConnectionReturnInfo,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiOpenConnectionEndpointFile(
PUNICODE_STRING DeviceName,
PHANDLE ConnectionHandle,
PFILE_OBJECT * ConnectionObject);
NTSTATUS TdiCloseDevice(HANDLE Handle, PFILE_OBJECT FileObject);
NTSTATUS TdiDisconnect(
PIRP * Irp,
PFILE_OBJECT TransportObject,
PLARGE_INTEGER Time,
USHORT Flags,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext,
PTDI_CONNECTION_INFORMATION RequestConnectionInfo,
PTDI_CONNECTION_INFORMATION ReturnConnectionInfo);
NTSTATUS TdiQueryInformation(PFILE_OBJECT FileObject, LONG QueryType, PMDL MdlBuffer);
NTSTATUS TdiSetEventHandler(PFILE_OBJECT FileObject, LONG EventType, PVOID Handler, PVOID Context);
NTSTATUS TdiQueryDeviceControl(
PFILE_OBJECT FileObject,
ULONG IoControlCode,
PVOID InputBuffer,
ULONG InputBufferLength,
PVOID OutputBuffer,
ULONG OutputBufferLength,
PULONG Return);

84
drivers/network/tdihelpers/include/tdiconn.h Normal file
View file

@ -0,0 +1,84 @@
#pragma once
typedef VOID *PTDI_CONNECTION_INFO_PAIR;
PTRANSPORT_ADDRESS TaCopyTransportAddress(PTRANSPORT_ADDRESS OtherAddress);
PTRANSPORT_ADDRESS TaBuildNullTransportAddress(UINT AddressType);
UINT TaLengthOfAddress(PTA_ADDRESS Addr);
UINT TaLengthOfTransportAddress(PTRANSPORT_ADDRESS Addr);
UINT TaLengthOfTransportAddressByType(UINT AddressType);
VOID TaCopyTransportAddressInPlace(PTRANSPORT_ADDRESS Target, PTRANSPORT_ADDRESS Source);
UINT TdiAddressSizeFromType(UINT Type);
UINT TdiAddressSizeFromName(PTRANSPORT_ADDRESS Name);
NTSTATUS TdiBuildConnectionInfoInPlace(PTDI_CONNECTION_INFORMATION ConnInfo, PTRANSPORT_ADDRESS Name);
NTSTATUS TdiBuildConnectionInfo(PTDI_CONNECTION_INFORMATION * ConnectionInfo, PTRANSPORT_ADDRESS Name);
NTSTATUS TdiBuildNullConnectionInfoInPlace(PTDI_CONNECTION_INFORMATION ConnInfo, ULONG Type);
NTSTATUS TdiBuildNullConnectionInfo(PTDI_CONNECTION_INFORMATION * ConnectionInfo, ULONG Type);
/* Taken from afd.h: */
/* tdi.c */
NTSTATUS TdiOpenAddressFile(PUNICODE_STRING DeviceName,
PTRANSPORT_ADDRESS Name,
ULONG ShareType,
PHANDLE AddressHandle,
PFILE_OBJECT * AddressObject);
NTSTATUS TdiAssociateAddressFile(HANDLE AddressHandle, PFILE_OBJECT ConnectionObject);
NTSTATUS TdiDisassociateAddressFile(PFILE_OBJECT ConnectionObject);
NTSTATUS TdiListen(
PIRP * Irp,
PFILE_OBJECT ConnectionObject,
PTDI_CONNECTION_INFORMATION * RequestConnectionInfo,
PTDI_CONNECTION_INFORMATION * ReturnConnectionInfo,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiAccept(
PIRP * Irp,
PFILE_OBJECT AcceptConnectionObject,
PTDI_CONNECTION_INFORMATION RequestConnectionInfo,
PTDI_CONNECTION_INFORMATION ReturnConnectionInfo,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiReceive(
PIRP * Irp,
PFILE_OBJECT ConnectionObject,
USHORT Flags,
PCHAR Buffer,
UINT BufferLength,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiSend(
PIRP * Irp,
PFILE_OBJECT ConnectionObject,
USHORT Flags,
PCHAR Buffer,
UINT BufferLength,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiReceiveDatagram(
PIRP * Irp,
PFILE_OBJECT TransportObject,
USHORT Flags,
PCHAR Buffer,
UINT BufferLength,
PTDI_CONNECTION_INFORMATION From,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiSendDatagram(
PIRP * Irp,
PFILE_OBJECT TransportObject,
PCHAR Buffer,
UINT BufferLength,
PTDI_CONNECTION_INFORMATION To,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext);
NTSTATUS TdiQueryMaxDatagramLength(PFILE_OBJECT FileObject, PUINT MaxDatagramLength);

59
drivers/network/afd/afd/tdi.c → drivers/network/tdihelpers/tdi.c
View file

@ -129,6 +129,7 @@ static NTSTATUS TdiOpenDevice(
OBJ_KERNEL_HANDLE,
NULL, /* Root directory */
NULL); /* Security descriptor */
DbgPrint("Into ZwCreateFile IRQL is %d...\n", KeGetCurrentIrql());
Status = ZwCreateFile(Handle, /* Return file handle */
GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, /* Desired access */
@ -141,6 +142,7 @@ static NTSTATUS TdiOpenDevice(
0, /* Create options */
EaInfo, /* EA buffer */
EaLength); /* EA length */
DbgPrint("Out of ZwCreateFile IRQL is %d...\n", KeGetCurrentIrql());
if (NT_SUCCESS(Status)) {
Status = ObReferenceObjectByHandle(*Handle, /* Handle to open file */
GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, /* Access mode */
@ -320,12 +322,14 @@ NTSTATUS TdiOpenConnectionEndpointFile(
ContextArea = (PVOID*)(EaInfo->EaName + TDI_CONNECTION_CONTEXT_LENGTH + 1); /* 0-terminated */
/* FIXME: Allocate context area */
*ContextArea = NULL;
DbgPrint("Into TdiOpenDevice ...\n");
Status = TdiOpenDevice(DeviceName,
EaLength,
EaInfo,
AFD_SHARE_UNIQUE,
ConnectionHandle,
ConnectionObject);
DbgPrint("Out of TdiOpenDevice ...\n");
ExFreePoolWithTag(EaInfo, TAG_AFD_EA_INFO);
return Status;
}
@ -542,6 +546,61 @@ NTSTATUS TdiListen(
return STATUS_PENDING;
}
NTSTATUS TdiAccept(
PIRP *Irp,
PFILE_OBJECT AcceptConnectionObject,
PTDI_CONNECTION_INFORMATION RequestConnectionInfo,
PTDI_CONNECTION_INFORMATION ReturnConnectionInfo,
PIO_COMPLETION_ROUTINE CompletionRoutine,
PVOID CompletionContext)
/*
* FUNCTION: Listen on a connection endpoint for a connection request from a remote peer
* ARGUMENTS:
* CompletionRoutine = Routine to be called when IRP is completed
* CompletionContext = Context for CompletionRoutine
* RETURNS:
* Status of operation
* May return STATUS_PENDING
*/
{
PDEVICE_OBJECT DeviceObject;
AFD_DbgPrint(MAX_TRACE, ("Called\n"));
ASSERT(*Irp == NULL); /* TODO: why at all? We are overwriting it anyway ... */
if (!AcceptConnectionObject) {
AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n"));
return STATUS_INVALID_PARAMETER;
}
DeviceObject = IoGetRelatedDeviceObject(AcceptConnectionObject);
if (!DeviceObject) {
AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n"));
return STATUS_INVALID_PARAMETER;
}
*Irp = TdiBuildInternalDeviceControlIrp(TDI_LISTEN, /* Sub function */
DeviceObject, /* Device object */
AcceptConnectionObject, /* File object */
NULL, /* Event */
NULL); /* Status */
if (*Irp == NULL)
return STATUS_INSUFFICIENT_RESOURCES;
TdiBuildAccept(*Irp, /* IRP */
DeviceObject, /* Device object */
AcceptConnectionObject, /* File object */
CompletionRoutine, /* Completion routine */
CompletionContext, /* Completion routine context */
RequestConnectionInfo, /* Request connection information */
ReturnConnectionInfo); /* Return connection information */
TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, NULL);
return STATUS_PENDING;
}
NTSTATUS TdiSetEventHandler(
PFILE_OBJECT FileObject,

3
drivers/network/afd/afd/tdiconn.c → drivers/network/tdihelpers/tdiconn.c
View file

@ -159,7 +159,8 @@ NTSTATUS TdiBuildNullConnectionInfoInPlace
sizeof(TDI_CONNECTION_INFORMATION) +
TdiAddressSize);
ConnInfo->OptionsLength = sizeof(ULONG);
/* TODO: !! */
// ConnInfo->OptionsLength = sizeof(ULONG);
ConnInfo->RemoteAddressLength = TdiAddressSize;
ConnInfo->RemoteAddress = TransportAddress =
(PTRANSPORT_ADDRESS)&ConnInfo[1];

1
sdk/include/psdk/netiodef.h
View file

@ -404,6 +404,7 @@ union _DL_EUI48 {
DL_EI48 Ei48;
};
};
typedef union _DL_EUI48 DL_EUI48, *PDL_EUI48;
C_ASSERT(DL_ADDRESS_LENGTH_MAXIMUM >= sizeof(DL_EUI48));

14
sdk/include/psdk/ws2def.h
View file

@ -360,11 +360,7 @@ typedef USHORT ADDRESS_FAMILY;
#define NI_MAXSERV 32
typedef struct sockaddr {
#if (_WIN32_WINNT < 0x0600)
u_short sa_family;
#else
ADDRESS_FAMILY sa_family;
#endif
CHAR sa_data[14];
} SOCKADDR, *PSOCKADDR, FAR *LPSOCKADDR;
@ -524,17 +520,9 @@ typedef struct _WSAMSG {
LPSOCKADDR name;
INT namelen;
LPWSABUF lpBuffers;
#if (_WIN32_WINNT >= 0x0600)
ULONG dwBufferCount;
#else
DWORD dwBufferCount;
#endif
WSABUF Control;
#if (_WIN32_WINNT >= 0x0600)
ULONG dwFlags;
#else
DWORD dwFlags;
#endif
} WSAMSG, *PWSAMSG, *FAR LPWSAMSG;
#if (_WIN32_WINNT >= 0x0600)
@ -547,9 +535,7 @@ typedef struct _WSACMSGHDR {
INT cmsg_type;
} WSACMSGHDR, *PWSACMSGHDR, FAR *LPWSACMSGHDR;
#if (_WIN32_WINNT >= 0x0600)
typedef WSACMSGHDR CMSGHDR, *PCMSGHDR;
#endif
#define WSA_CMSGHDR_ALIGN(length) (((length) + TYPE_ALIGNMENT(WSACMSGHDR)-1) & \
(~(TYPE_ALIGNMENT(WSACMSGHDR)-1)))