Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-28 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TCPIP] Define a enum to select which information to return

Browse source
This commit is contained in:
Pierre Schweitzer 2018-11-27 08:27:00 +01:00
parent 1d55f459d6
commit 655e66bdbd
No known key found for this signature in database
GPG key ID: 7545556C3D585B0B
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/network/tcpip/include/info.h
View file

@ -80,6 +80,12 @@ typedef union TDI_INFO {
TDI_PROVIDER_STATISTICS ProviderStats; TDI_PROVIDER_STATISTICS ProviderStats;
} TDI_INFO, *PTDI_INFO; } TDI_INFO, *PTDI_INFO;
typedef enum TDI_TCPUDP_CLASS_INFO {
TcpUdpClassBasic,
TcpUdpClassOwnerPid,
TcpUdpClassOwner
} TDI_TCPUDP_CLASS_INFO, *PTDI_TCPUDP_CLASS_INFO;
TDI_STATUS InfoCopyOut( PCHAR DataOut, UINT SizeOut, TDI_STATUS InfoCopyOut( PCHAR DataOut, UINT SizeOut,
PNDIS_BUFFER ClientBuf, PUINT ClientBufSize ); PNDIS_BUFFER ClientBuf, PUINT ClientBufSize );
@ -117,12 +123,12 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF,
TDI_STATUS InfoTdiQueryGetConnectionTcpTable( PADDRESS_FILE AddrFile, TDI_STATUS InfoTdiQueryGetConnectionTcpTable( PADDRESS_FILE AddrFile,
PNDIS_BUFFER Buffer, PNDIS_BUFFER Buffer,
PUINT BufferSize, PUINT BufferSize,
BOOLEAN Extended); TDI_TCPUDP_CLASS_INFO Class);
TDI_STATUS InfoTdiQueryGetConnectionUdpTable( PADDRESS_FILE AddrFile, TDI_STATUS InfoTdiQueryGetConnectionUdpTable( PADDRESS_FILE AddrFile,
PNDIS_BUFFER Buffer, PNDIS_BUFFER Buffer,
PUINT BufferSize, PUINT BufferSize,
BOOLEAN Extended); TDI_TCPUDP_CLASS_INFO Class);
TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF, TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF,
PVOID Buffer, PVOID Buffer,

8
drivers/network/tcpip/tcpip/info.c
View file

@ -268,12 +268,12 @@ TDI_STATUS InfoTdiQueryInformationEx(
return InfoTdiQueryGetAddrTable(ID->toi_entity, Buffer, BufferSize); return InfoTdiQueryGetAddrTable(ID->toi_entity, Buffer, BufferSize);
else if (ID->toi_entity.tei_entity == CO_TL_ENTITY) else if (ID->toi_entity.tei_entity == CO_TL_ENTITY)
if ((EntityListContext = GetContext(ID->toi_entity))) if ((EntityListContext = GetContext(ID->toi_entity)))
return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, TRUE); return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassOwnerPid);
else else
return TDI_INVALID_PARAMETER; return TDI_INVALID_PARAMETER;
else if (ID->toi_entity.tei_entity == CL_TL_ENTITY) else if (ID->toi_entity.tei_entity == CL_TL_ENTITY)
if ((EntityListContext = GetContext(ID->toi_entity))) if ((EntityListContext = GetContext(ID->toi_entity)))
return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, TRUE); return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassOwnerPid);
else else
return TDI_INVALID_PARAMETER; return TDI_INVALID_PARAMETER;
else else
@ -297,12 +297,12 @@ TDI_STATUS InfoTdiQueryInformationEx(
return TDI_INVALID_PARAMETER; return TDI_INVALID_PARAMETER;
else if (ID->toi_entity.tei_entity == CO_TL_ENTITY) else if (ID->toi_entity.tei_entity == CO_TL_ENTITY)
if ((EntityListContext = GetContext(ID->toi_entity))) if ((EntityListContext = GetContext(ID->toi_entity)))
return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, FALSE); return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassBasic);
else else
return TDI_INVALID_PARAMETER; return TDI_INVALID_PARAMETER;
else if (ID->toi_entity.tei_entity == CL_TL_ENTITY) else if (ID->toi_entity.tei_entity == CL_TL_ENTITY)
if ((EntityListContext = GetContext(ID->toi_entity))) if ((EntityListContext = GetContext(ID->toi_entity)))
return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, FALSE); return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassBasic);
else else
return TDI_INVALID_PARAMETER; return TDI_INVALID_PARAMETER;
else else

21
drivers/network/tcpip/tcpip/ninfo.c
View file

@ -182,7 +182,7 @@ TDI_STATUS InfoTdiQueryGetIPSnmpInfo( TDIEntityID ID,
TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile,
PNDIS_BUFFER Buffer, PNDIS_BUFFER Buffer,
PUINT BufferSize, PUINT BufferSize,
BOOLEAN Extended) TDI_TCPUDP_CLASS_INFO Class)
{ {
SIZE_T Size; SIZE_T Size;
MIB_TCPROW_OWNER_PID TcpRow; MIB_TCPROW_OWNER_PID TcpRow;
@ -191,12 +191,13 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile,
TI_DbgPrint(DEBUG_INFO, ("Called.\n")); TI_DbgPrint(DEBUG_INFO, ("Called.\n"));
TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId;
if (Extended) if (Class == TcpUdpClassOwnerPid)
{ {
Size = sizeof(MIB_TCPROW_OWNER_PID); Size = sizeof(MIB_TCPROW_OWNER_PID);
} }
else else
{ {
ASSERT(Class != TcpUdpClassOwner);
Size = sizeof(MIB_TCPROW); Size = sizeof(MIB_TCPROW);
} }
@ -255,20 +256,30 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile,
TDI_STATUS InfoTdiQueryGetConnectionUdpTable(PADDRESS_FILE AddrFile, TDI_STATUS InfoTdiQueryGetConnectionUdpTable(PADDRESS_FILE AddrFile,
PNDIS_BUFFER Buffer, PNDIS_BUFFER Buffer,
PUINT BufferSize, PUINT BufferSize,
BOOLEAN Extended) TDI_TCPUDP_CLASS_INFO Class)
{ {
SIZE_T Size;
MIB_UDPROW_OWNER_PID UdpRow; MIB_UDPROW_OWNER_PID UdpRow;
TDI_STATUS Status = TDI_INVALID_REQUEST; TDI_STATUS Status = TDI_INVALID_REQUEST;
TI_DbgPrint(DEBUG_INFO, ("Called.\n")); TI_DbgPrint(DEBUG_INFO, ("Called.\n"));
if (Class == TcpUdpClassOwnerPid)
{
Size = sizeof(MIB_UDPROW_OWNER_PID);
}
else
{
ASSERT(Class != TcpUdpClassOwner);
Size = sizeof(MIB_UDPROW);
}
UdpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; UdpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address;
UdpRow.dwLocalPort = AddrFile->Port; UdpRow.dwLocalPort = AddrFile->Port;
UdpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; UdpRow.dwOwningPid = (DWORD)AddrFile->ProcessId;
Status = InfoCopyOut( (PCHAR)&UdpRow, Status = InfoCopyOut( (PCHAR)&UdpRow,
(Extended ? sizeof(MIB_UDPROW_OWNER_PID) : sizeof(MIB_UDPROW)), Size, Buffer, BufferSize );
Buffer, BufferSize );
TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status));