Skip to content

Streamline SystemIPGlobalProperties #125002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MihaZupan merged 3 commits into from
Mar 12, 2026
Merged

Streamline SystemIPGlobalProperties #125002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c219896
Streamline SystemIPGlobalProperties
pentp Feb 28, 2026
730c127
Fix comments
pentp Feb 28, 2026
8e03f9f
Address PR feedback
pentp Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 41 additions & 59 deletions src/libraries/Common/src/Interop/Windows/IpHlpApi/Interop.NetworkInformation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Buffers.Binary;
using System.Net;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;

internal static partial class Interop
{
Expand Down Expand Up @@ -379,59 +380,48 @@ internal unsafe struct MibIcmpStatsEx
[StructLayout(LayoutKind.Sequential)]
internal struct MibTcpTable
{
internal uint numberOfEntries;
internal uint NumEntries;
internal MibTcpRow FirstEntry;
}

[StructLayout(LayoutKind.Sequential)]
internal struct MibTcpRow
{
internal TcpState state;
internal uint localAddr;
internal byte localPort1;
internal byte localPort2;
// Ports are only 16 bit values (in network WORD order, 3,4,1,2).
// There are reports where the high order bytes have garbage in them.
internal byte ignoreLocalPort3;
internal byte ignoreLocalPort4;
internal uint remoteAddr;
internal byte remotePort1;
internal byte remotePort2;
internal TcpState State;
internal uint LocalAddr;
internal uint LocalPort;
internal uint RemoteAddr;
internal uint RemotePort;

// Ports are only 16 bit values (in network WORD order, 3,4,1,2).
// There are reports where the high order bytes have garbage in them.
internal byte ignoreRemotePort3;
internal byte ignoreRemotePort4;
internal readonly IPEndPoint LocalEndPoint => new(LocalAddr, BinaryPrimitives.ReverseEndianness((ushort)LocalPort));
internal readonly IPEndPoint RemoteEndPoint => new(RemoteAddr, BinaryPrimitives.ReverseEndianness((ushort)RemotePort));
}

[StructLayout(LayoutKind.Sequential)]
internal struct MibTcp6TableOwnerPid
{
internal uint numberOfEntries;
internal uint NumEntries;
internal MibTcp6RowOwnerPid FirstEntry;
}

[StructLayout(LayoutKind.Sequential)]
internal unsafe struct MibTcp6RowOwnerPid
internal struct MibTcp6RowOwnerPid
{
internal fixed byte localAddr[16];
internal uint localScopeId;
internal byte localPort1;
internal byte localPort2;
// Ports are only 16 bit values (in network WORD order, 3,4,1,2).
// There are reports where the high order bytes have garbage in them.
internal byte ignoreLocalPort3;
internal byte ignoreLocalPort4;
internal fixed byte remoteAddr[16];
internal uint remoteScopeId;
internal byte remotePort1;
internal byte remotePort2;
internal InlineArray16<byte> LocalAddr;
internal uint LocalScopeId;
internal uint LocalPort;
internal InlineArray16<byte> RemoteAddr;
internal uint RemoteScopeId;
internal uint RemotePort;
internal TcpState State;
internal uint OwningPid;

// Ports are only 16 bit values (in network WORD order, 3,4,1,2).
// There are reports where the high order bytes have garbage in them.
internal byte ignoreRemotePort3;
internal byte ignoreRemotePort4;
internal TcpState state;
internal uint owningPid;

internal ReadOnlySpan<byte> localAddrAsSpan => MemoryMarshal.CreateSpan(ref localAddr[0], 16);
internal ReadOnlySpan<byte> remoteAddrAsSpan => MemoryMarshal.CreateSpan(ref remoteAddr[0], 16);
internal readonly IPEndPoint LocalEndPoint => new(new IPAddress(LocalAddr, LocalScopeId), BinaryPrimitives.ReverseEndianness((ushort)LocalPort));
internal readonly IPEndPoint RemoteEndPoint => new(new IPAddress(RemoteAddr, RemoteScopeId), BinaryPrimitives.ReverseEndianness((ushort)RemotePort));
}

internal enum TcpTableClass
Expand All @@ -450,19 +440,19 @@ internal enum TcpTableClass
[StructLayout(LayoutKind.Sequential)]
internal struct MibUdpTable
{
internal uint numberOfEntries;
internal uint NumEntries;
internal MibUdpRow FirstEntry;
}

[StructLayout(LayoutKind.Sequential)]
internal struct MibUdpRow
{
internal uint localAddr;
internal byte localPort1;
internal byte localPort2;
internal uint LocalAddr;
internal uint LocalPort;

// Ports are only 16 bit values (in network WORD order, 3,4,1,2).
// There are reports where the high order bytes have garbage in them.
internal byte ignoreLocalPort3;
internal byte ignoreLocalPort4;
internal readonly IPEndPoint LocalEndPoint => new(LocalAddr, BinaryPrimitives.ReverseEndianness((ushort)LocalPort));
}

internal enum UdpTableClass
Expand All @@ -475,23 +465,21 @@ internal enum UdpTableClass
[StructLayout(LayoutKind.Sequential)]
internal struct MibUdp6TableOwnerPid
{
internal uint numberOfEntries;
internal uint NumEntries;
internal MibUdp6RowOwnerPid FirstEntry;
}

[StructLayout(LayoutKind.Sequential)]
internal unsafe struct MibUdp6RowOwnerPid
internal struct MibUdp6RowOwnerPid
{
internal fixed byte localAddr[16];
internal uint localScopeId;
internal byte localPort1;
internal byte localPort2;
internal InlineArray16<byte> LocalAddr;
internal uint LocalScopeId;
internal uint LocalPort;
internal uint OwningPid;

// Ports are only 16 bit values (in network WORD order, 3,4,1,2).
// There are reports where the high order bytes have garbage in them.
internal byte ignoreLocalPort3;
internal byte ignoreLocalPort4;
internal uint owningPid;

internal ReadOnlySpan<byte> localAddrAsSpan => MemoryMarshal.CreateSpan(ref localAddr[0], 16);
internal readonly IPEndPoint LocalEndPoint => new(new IPAddress(LocalAddr, LocalScopeId), BinaryPrimitives.ReverseEndianness((ushort)LocalPort));
}

[LibraryImport(Interop.Libraries.IpHlpApi)]
Expand Down Expand Up @@ -523,16 +511,10 @@ internal static unsafe partial uint GetAdaptersAddresses(
[LibraryImport(Interop.Libraries.IpHlpApi)]
internal static partial uint GetIcmpStatisticsEx(out MibIcmpInfoEx statistics, AddressFamily family);

[LibraryImport(Interop.Libraries.IpHlpApi)]
internal static unsafe partial uint GetTcpTable(IntPtr pTcpTable, uint* dwOutBufLen, [MarshalAs(UnmanagedType.Bool)] bool order);

[LibraryImport(Interop.Libraries.IpHlpApi)]
internal static unsafe partial uint GetExtendedTcpTable(IntPtr pTcpTable, uint* dwOutBufLen, [MarshalAs(UnmanagedType.Bool)] bool order,
uint IPVersion, TcpTableClass tableClass, uint reserved);

[LibraryImport(Interop.Libraries.IpHlpApi)]
internal static unsafe partial uint GetUdpTable(IntPtr pUdpTable, uint* dwOutBufLen, [MarshalAs(UnmanagedType.Bool)] bool order);

[LibraryImport(Interop.Libraries.IpHlpApi)]
internal static unsafe partial uint GetExtendedUdpTable(IntPtr pUdpTable, uint* dwOutBufLen, [MarshalAs(UnmanagedType.Bool)] bool order,
uint IPVersion, UdpTableClass tableClass, uint reserved);
Expand Down
Loading
Loading