[IFMON] Implement the 'add dns' command in the 'interface ip' context

EricKohl · EricKohl · commit ab2393c0de92 · 2026-06-19T10:37:50.000+02:00
The index argument is not supported yet.
diff --git a/dll/win32/ifmon/ip.c b/dll/win32/ifmon/ip.c
@@ -32,6 +32,7 @@
 #define REGISTER_BOTH      3
 
 static FN_HANDLE_CMD IpAddAddress;
+static FN_HANDLE_CMD IpAddDns;
 static FN_HANDLE_CMD IpSetAddress;
 static FN_HANDLE_CMD IpSetDns;
 static FN_HANDLE_CMD IpShowAddresses;
@@ -43,7 +44,8 @@ static
 CMD_ENTRY
 IpAddCommands[] = 
 {
-    {L"address", IpAddAddress, IDS_HLP_IP_ADD_ADDRESS, IDS_HLP_IP_ADD_ADDRESS_EX, 0}
+    {L"address", IpAddAddress, IDS_HLP_IP_ADD_ADDRESS, IDS_HLP_IP_ADD_ADDRESS_EX, 0},
+    {L"dns", IpAddDns, IDS_HLP_IP_ADD_DNS, IDS_HLP_IP_ADD_DNS_EX, 0}
 };
 
 static
@@ -709,6 +711,186 @@ IpAddAddress(
 }
 
 
+static
+DWORD
+WINAPI
+IpAddDns(
+    LPCWSTR pwszMachine,
+    LPWSTR *argv,
+    DWORD dwCurrentIndex,
+    DWORD dwArgCount,
+    DWORD dwFlags,
+    LPCVOID pvData,
+    BOOL *pbDone)
+{
+    TAG_TYPE pttTags[] = {{L"name", NS_REQ_ZERO, FALSE},
+                          {L"addr", NS_REQ_ZERO, FALSE},
+                          {L"index", NS_REQ_ZERO, FALSE}};
+    GUID InterfaceGUID;
+    PDWORD pdwTagType = NULL;
+    DWORD i;
+    BOOL bHaveName = FALSE, bHaveAddress = FALSE/*, bHaveIndex = FALSE*/;
+    IN_ADDR Address;
+    PWSTR pszName = NULL, pszAddress = NULL;
+    PWSTR pszNewParameters = NULL;
+    DWORD dwIndex, dwLength;
+    PCWSTR Term;
+    PTCPIP_PROPERTIES pProperties = NULL;
+    TCPIP_PROPERTIES NewProperties;
+    HRESULT hr;
+    NTSTATUS Status;
+    DWORD dwError = ERROR_SUCCESS;
+
+    DPRINT1("IpAddDns()\n");
+
+    pdwTagType = HeapAlloc(GetProcessHeap(),
+                           0,
+                           (dwArgCount - dwCurrentIndex) * sizeof(DWORD));
+    if (pdwTagType == NULL)
+    {
+        return ERROR_NOT_ENOUGH_MEMORY;
+    }
+
+    dwError = MatchTagsInCmdLine(hDllInstance,
+                                 argv,
+                                 dwCurrentIndex,
+                                 dwArgCount,
+                                 pttTags,
+                                 ARRAYSIZE(pttTags),
+                                 pdwTagType);
+    if (dwError != ERROR_SUCCESS)
+    {
+        DPRINT1("MatchTagsInCmdLine() failed (Error %lu)\n", dwError);
+        HeapFree(GetProcessHeap(), 0, pdwTagType);
+        return dwError;
+    }
+
+    for (i = 0; i < (dwArgCount - dwCurrentIndex); i++)
+    {
+        DPRINT1("Tag %lu: %lu\n", i, pdwTagType[i]);
+
+        switch (pdwTagType[i])
+        {
+            case 0: /* name */
+                DPRINT1("Tag: name (%S)\n", argv[i + dwCurrentIndex]);
+                dwError = NhGetGuidFromInterfaceName(argv[i + dwCurrentIndex],
+                                                     &InterfaceGUID,
+                                                     0, 0);
+                if (dwError != ERROR_SUCCESS)
+                {
+                    DPRINT1("NhGetGuidFromInterfaceName() failed (Error %lu)\n", dwError);
+                    PrintMessageFromModule(hDllInstance,
+                                           IDS_ERROR_INVALID_INTERFACE,
+                                           argv[i + dwCurrentIndex]);
+                    dwError = ERROR_SUPPRESS_OUTPUT;
+                    break;
+                }
+                pszName = argv[i + dwCurrentIndex];
+                DPRINT1("Interface: {%08lx-%04hx-%04hx-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
+                       InterfaceGUID.Data1, InterfaceGUID.Data2, InterfaceGUID.Data3, InterfaceGUID.Data4[0], InterfaceGUID.Data4[1],
+                       InterfaceGUID.Data4[2], InterfaceGUID.Data4[3], InterfaceGUID.Data4[4], InterfaceGUID.Data4[5], InterfaceGUID.Data4[6], InterfaceGUID.Data4[7]);
+                bHaveName = TRUE;
+                break;
+
+            case 1: /* addr */
+                DPRINT1("Tag: addr (%S)\n", argv[i + dwCurrentIndex]);
+                Status = RtlIpv4StringToAddressW(argv[i + dwCurrentIndex],
+                                                 TRUE,
+                                                 &Term,
+                                                 &Address);
+                if (Status != 0 /*STATUS_SUCCESS*/)
+                {
+                    DPRINT1("RtlIpv4StringToAddressW() failed (Status 0x%08lx)\n", Status);
+                    PrintMessageFromModule(hDllInstance,
+                                           IDS_ERROR_BAD_VALUE,
+                                           argv[i + dwCurrentIndex],
+                                           pttTags[pdwTagType[i]].pwszTag);
+                    dwError = ERROR_SUPPRESS_OUTPUT;
+                    break;
+                }
+                DPRINT1("IP Address: %u.%u.%u.%u\n",
+                       Address.S_un.S_un_b.s_b1, Address.S_un.S_un_b.s_b2, Address.S_un.S_un_b.s_b3, Address.S_un.S_un_b.s_b4);
+                pszAddress = argv[i + dwCurrentIndex];
+                DPRINT1("IP Address: %S\n", pszAddress);
+                bHaveAddress = TRUE;
+                break;
+
+            case 2: /* index */
+                DPRINT1("Tag: index (%S)\n", argv[i + dwCurrentIndex]);
+                dwIndex = wcstoul(argv[i + dwCurrentIndex],
+                                  (wchar_t**)&Term,
+                                  10);
+                if ((dwIndex == 0) || (dwIndex > 999))
+                {
+                    dwError = ERROR_INVALID_PARAMETER;
+                    break;
+                }
+                DPRINT1("Index: %lu\n", dwIndex);
+//                bHaveIndex = TRUE;
+                break;
+
+            default:
+                DPRINT1("Unknown tag type %lu\n", pdwTagType[i]);
+                break;
+        }
+    }
+
+    if (pdwTagType)
+        HeapFree(GetProcessHeap(), 0, pdwTagType);
+
+    if (dwError != ERROR_SUCCESS)
+        return dwError;
+
+    /* Check parameters */
+
+    /* The interface name is mandatory */
+    if (bHaveName == FALSE)
+        return ERROR_INVALID_SYNTAX;
+
+    /* The address is mandatory */
+    if (!bHaveAddress)
+        return ERROR_INVALID_SYNTAX;
+
+    hr = GetInterfaceProperties(&InterfaceGUID, &pProperties);
+    if (FAILED(hr))
+    {
+        PrintMessageFromModule(hDllInstance,
+                               IDS_ERROR_GET_PROPERTIES,
+                               pszName);
+        return ERROR_SUPPRESS_OUTPUT;
+    }
+
+    dwLength = wcslen(pProperties->pszParameters) + wcslen(pszAddress) + 2;
+
+    pszNewParameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength * sizeof(WCHAR));
+    if (pszNewParameters == NULL)
+    {
+        dwError = ERROR_NOT_ENOUGH_MEMORY;
+        goto done;
+    }
+
+    wcscpy(pszNewParameters, pProperties->pszParameters);
+    AppendParameterValue(pszNewParameters, L"DNS", pszAddress);
+
+    NewProperties.dwDhcp = 0;
+    NewProperties.pszIpAddress = pProperties->pszIpAddress;
+    NewProperties.pszSubnetMask = pProperties->pszSubnetMask;
+    NewProperties.pszParameters = pszNewParameters;
+
+    SetInterfaceProperties(&InterfaceGUID, &NewProperties);
+
+done:
+    if (pszNewParameters)
+        HeapFree(GetProcessHeap(), 0, pszNewParameters);
+
+    CoTaskMemFree(pProperties);
+    pProperties = NULL;
+
+    DPRINT("IpAddDns() done (Error %lu)\n", dwError);
+    return dwError;
+}
+
+
 static
 DWORD
 WINAPI
diff --git a/dll/win32/ifmon/lang/en-US.rc b/dll/win32/ifmon/lang/en-US.rc
@@ -24,7 +24,25 @@ Examples:\n\n\
        The first command adds a static IP address of 10.0.0.2 with a subnet\n\
        mask of 255.0.0.0 to the Local Area Connection interface. The second\n\
        command adds the IP address of 10.0.0.3 as a second default gateway\n\
-       for this interface with a gateway metric of 2.\n\n"
+       for this interface with a gateway metric of 2.\n"
+
+    IDS_HLP_IP_ADD_DNS    "Adds a static DNS server address.\n"
+    IDS_HLP_IP_ADD_DNS_EX "\nUsage: %1!s! [name=]<string> [addr=]<IP address> [[index=]<integer>]\n\n\
+Parameters:\n\n\
+      Tag            Value\n\
+      name         - The name of the interface where DNS servers are added.\n\
+      addr         - The IP address for the DNS server you are adding.\n\
+      index        - Specifies the index (preference) for the specified\n\
+                     DNS server address.\n\n\
+Remarks: Adds a new DNS server IP address to the statically-configured list.\n\
+         By default, the DNS server is added to the end of the list.  If an\n\
+         index is specified, the DNS server will be placed in that position\n\
+         in the list, with other servers being moved down to make room.\n\
+         If DNS servers were previously obtained through DHCP, the new\n\
+         address will replace the old list.\n\n\
+Examples:\n\n\
+       %1!s! ""Local Area Connection"" 10.0.0.1\n\
+       %1!s! ""Local Area Connection"" 10.0.0.3 index=2\n"
 
     IDS_HLP_IP_SET             "Sets configuration information.\n"
     IDS_HLP_IP_SET_ADDRESS     "Sets the IP address or default gateway to the specified interface.\n"
@@ -54,7 +72,7 @@ Remarks: Used to change the IP address configuration mode from either DHCP to\n\
          interface with static IP address or adds default gateways.\n\n\
 Examples:\n\n\
        %1!s! name=""Local Area Connection"" source=dhcp\n\
-       %1!s! local static 10.0.0.9 255.0.0.0 10.0.0.1 1\n\n"
+       %1!s! local static 10.0.0.9 255.0.0.0 10.0.0.1 1\n"
 
     IDS_HLP_IP_SET_DNS         "Sets DNS server mode and addresses.\n"
     IDS_HLP_IP_SET_DNS_EX      "\nUsage: %1!s! [name=]<string> [source=]dhcp|static [addr=]<IP address>|none\n\
@@ -81,7 +99,7 @@ Remarks: Sets DNS server configuration to either DHCP or static mode. Only\n\
          specified interface.\n\n\
 Examples:\n\n\
        %1!s! name=""Local Area Connection"" source=dhcp\n\
-       %1!s! ""Local Area Connection"" static 10.0.0.1 primary\n\n"
+       %1!s! ""Local Area Connection"" static 10.0.0.1 primary\n"
 
     IDS_HLP_IP_SHOW      "Displays IP information.\n"
     IDS_HLP_ADDRESSES    "Displays IP address configuration.\n"
diff --git a/dll/win32/ifmon/resource.h b/dll/win32/ifmon/resource.h
@@ -6,6 +6,8 @@
 #define IDS_HLP_IP_ADD                      200
 #define IDS_HLP_IP_ADD_ADDRESS              201
 #define IDS_HLP_IP_ADD_ADDRESS_EX           202
+#define IDS_HLP_IP_ADD_DNS                  203
+#define IDS_HLP_IP_ADD_DNS_EX               204
 
 #define IDS_HLP_IP_SET                      205
 #define IDS_HLP_IP_SET_ADDRESS              206
