GitHub-Mirror/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos synced 2025-10-06 16:32:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ROUTE] Sort network interfaces by index

Browse Source
This commit is contained in:
Eric Kohl
2025-08-20 21:41:24 +02:00
parent 05caf99940
commit fc84d6860a
1 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
base/applications/network/route/route.c
View File

@@ -332,18 +332,27 @@ GetFirstIPv4AddressFromIndex(
swprintf(pBuffer, L"%lx", IfIndex);
}
static
int
CompareAdapters(
_In_ const void *elem1,
_In_ const void *elem2)
{
return ((PIP_ADAPTER_ADDRESSES)elem2)->IfIndex - ((PIP_ADAPTER_ADDRESSES)elem1)->IfIndex;
}
static
DWORD
PrintActiveRoutes(
_In_ PWSTR DestinationPattern)
{
PMIB_IPFORWARDTABLE IpForwardTable = NULL;
PIP_ADAPTER_ADDRESSES pAdapterAddresses = NULL, Ptr;
PIP_ADAPTER_ADDRESSES pAdapterAddresses = NULL, Ptr, *pAdapterSortArray = NULL;
ULONG Size = 0;
DWORD Error = ERROR_SUCCESS;
ULONG adaptOutBufLen = 15000;
WCHAR Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], Interface[IPBUF];
unsigned int i;
unsigned int i, AdapterCount, AdapterIndex;
BOOL EntriesFound;
ULONG Flags = /*GAA_FLAG_SKIP_UNICAST |*/ GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST |
GAA_FLAG_SKIP_DNS_SERVER;
@@ -381,10 +390,36 @@ PrintActiveRoutes(
{
ConResPrintf(StdOut, IDS_SEPARATOR);
ConResPrintf(StdOut, IDS_INTERFACE_LIST);
/* FIXME - sort by the index! */
AdapterCount = 0;
Ptr = pAdapterAddresses;
while (Ptr)
{
AdapterCount++;
Ptr = Ptr->Next;
}
pAdapterSortArray = (PIP_ADAPTER_ADDRESSES*)malloc(AdapterCount * sizeof(PVOID));
if (pAdapterSortArray == NULL)
{
Error = ERROR_NOT_ENOUGH_MEMORY;
goto Error;
}
AdapterIndex = 0;
Ptr = pAdapterAddresses;
while (Ptr)
{
pAdapterSortArray[AdapterIndex] = Ptr;
AdapterIndex++;
Ptr = Ptr->Next;
}
qsort(pAdapterSortArray, AdapterCount, sizeof(PVOID), CompareAdapters);
for (AdapterIndex = 0; AdapterIndex < AdapterCount; AdapterIndex++)
{
Ptr = pAdapterSortArray[AdapterIndex];
if (Ptr->IfType == IF_TYPE_ETHERNET_CSMACD)
{
WCHAR PhysicalAddress[20];
@@ -395,8 +430,6 @@ PrintActiveRoutes(
{
ConResPrintf(StdOut, IDS_INTERFACE_ENTRY, Ptr->IfIndex, Ptr->Description);
}
Ptr = Ptr->Next;
}
ConResPrintf(StdOut, IDS_SEPARATOR);
@@ -441,6 +474,8 @@ PrintActiveRoutes(
}
Error:
if (pAdapterSortArray)
free(pAdapterSortArray);
if (pAdapterAddresses)
free(pAdapterAddresses);
if (IpForwardTable)