Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IPCONFIG] Improve the 'Autoconfiguration Enabled' information

Browse source 
- Show 'Autoconfiguration Enabled' only if DHCP is enabled for the adapter.
- Retrieve and display the autoconfiguration state.
This commit is contained in:
Eric Kohl 2019-09-20 09:24:49 +02:00
parent d2976ca58e
commit 5539ca8d7e
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
base/applications/network/ipconfig/ipconfig.c
View file

@ -407,6 +407,8 @@ VOID ShowInfo(BOOL bAll)
ULONG adaptOutBufLen = 0; ULONG adaptOutBufLen = 0;
PFIXED_INFO pFixedInfo = NULL; PFIXED_INFO pFixedInfo = NULL;
ULONG netOutBufLen = 0; ULONG netOutBufLen = 0;
PIP_PER_ADAPTER_INFO pPerAdapterInfo = NULL;
ULONG ulPerAdapterInfoLength = 0;
ULONG ret = 0; ULONG ret = 0;
/* call GetAdaptersInfo to obtain the adapter info */ /* call GetAdaptersInfo to obtain the adapter info */
@ -495,6 +497,15 @@ VOID ShowInfo(BOOL bAll)
if (myConType != NULL) HeapFree(ProcessHeap, 0, myConType); if (myConType != NULL) HeapFree(ProcessHeap, 0, myConType);
if (GetPerAdapterInfo(pAdapter->Index, pPerAdapterInfo, &ulPerAdapterInfoLength) == ERROR_BUFFER_OVERFLOW)
{
pPerAdapterInfo = (PIP_PER_ADAPTER_INFO)HeapAlloc(ProcessHeap, 0, ulPerAdapterInfoLength);
if (pPerAdapterInfo != NULL)
{
GetPerAdapterInfo(pAdapter->Index, pPerAdapterInfo, &ulPerAdapterInfoLength);
}
}
/* check if the adapter is connected to the media */ /* check if the adapter is connected to the media */
if (mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_CONNECTED && mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_OPERATIONAL) if (mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_CONNECTED && mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_OPERATIONAL)
{ {
@ -515,10 +526,20 @@ VOID ShowInfo(BOOL bAll)
if (bConnected) if (bConnected)
{ {
if (pAdapter->DhcpEnabled) if (pAdapter->DhcpEnabled)
{
_tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n"));
if (pPerAdapterInfo != NULL)
{
if (pPerAdapterInfo->AutoconfigEnabled)
_tprintf(_T("\tAutoconfiguration Enabled . . . . : Yes\n"));
else
_tprintf(_T("\tAutoconfiguration Enabled . . . . : No\n"));
}
}
else else
{
_tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : No\n")); _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : No\n"));
_tprintf(_T("\tAutoconfiguration Enabled . . . . : \n")); }
} }
} }
@ -565,8 +586,10 @@ VOID ShowInfo(BOOL bAll)
} }
_tprintf(_T("\n")); _tprintf(_T("\n"));
pAdapter = pAdapter->Next; HeapFree(ProcessHeap, 0, pPerAdapterInfo);
pPerAdapterInfo = NULL;
pAdapter = pAdapter->Next;
} }
HeapFree(ProcessHeap, 0, pFixedInfo); HeapFree(ProcessHeap, 0, pFixedInfo);