NetworkTools: Improve hostname lookup performance, Fix crash

dmex · dmex · commit f5f8e16592a5 · 2019-02-24T12:57:56.000+01:00
diff --git a/plugins/NetworkTools/NetworkTools.vcxproj b/plugins/NetworkTools/NetworkTools.vcxproj
@@ -56,27 +56,27 @@
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>comctl32.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <AdditionalDependencies>dnsapi.lib;iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>comctl32.dll;dnsapi.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <ClCompile />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>comctl32.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <AdditionalDependencies>dnsapi.lib;iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>comctl32.dll;dnsapi.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>comctl32.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <AdditionalDependencies>dnsapi.lib;iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>comctl32.dll;dnsapi.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>comctl32.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <AdditionalDependencies>dnsapi.lib;iphlpapi.lib;winhttp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>comctl32.dll;dnsapi.dll;gdi32.dll;iphlpapi.dll;winhttp.dll;ws2_32.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/NetworkTools/main.c b/plugins/NetworkTools/main.c
@@ -836,7 +836,7 @@ VOID ProcessesUpdatedCallback(
                 sizeof(TCP_ESTATS_PATH_ROD_v0)
                 ) == ERROR_SUCCESS)
             {
-                extension->NumberOfLostPackets = pathRod.FastRetran + pathRod.PktsRetrans;
+                extension->NumberOfLostPackets = UInt32Add32To64(pathRod.FastRetran, pathRod.PktsRetrans);
                 extension->SampleRtt = pathRod.SampleRtt;
 
                 if (extension->SampleRtt == ULONG_MAX) // HACK
@@ -883,7 +883,7 @@ VOID ProcessesUpdatedCallback(
                 sizeof(TCP_ESTATS_PATH_ROD_v0)
                 ) == ERROR_SUCCESS)
             {
-                extension->NumberOfLostPackets = pathRod.FastRetran + pathRod.PktsRetrans;
+                extension->NumberOfLostPackets = UInt32Add32To64(pathRod.FastRetran, pathRod.PktsRetrans);
                 extension->SampleRtt = pathRod.SampleRtt;
 
                 if (extension->SampleRtt == ULONG_MAX) // HACK
diff --git a/plugins/NetworkTools/ping.c b/plugins/NetworkTools/ping.c
@@ -49,7 +49,7 @@ NTSTATUS NetworkPingThreadStart(
     };
     //pingOptions.Flags |= IP_FLAG_REVERSE;
 
-    if (icmpRandString = PhCreateStringEx(NULL, PhGetIntegerSetting(SETTING_NAME_PING_SIZE) * 2 + 2))
+    if (icmpRandString = PhCreateStringEx(NULL, PhGetIntegerSetting(SETTING_NAME_PING_SIZE) * sizeof(WCHAR) + sizeof(UNICODE_NULL)))
     {
         PhGenerateRandomAlphaString(icmpRandString->Buffer, (ULONG)icmpRandString->Length / sizeof(WCHAR));
 
diff --git a/plugins/NetworkTools/tracert.c b/plugins/NetworkTools/tracert.c
@@ -54,88 +54,105 @@ PPH_STRING TracertGetErrorMessage(
     return message;
 }
 
+PPH_STRING PhpGetIp4ReverseNameFromAddress(
+    _In_ IN_ADDR Address
+    )
+{
+    return PhFormatString(L"%u.%u.%u.%u.%s",
+        Address.s_impno,
+        Address.s_lh,
+        Address.s_host,
+        Address.s_net,
+        DNS_IP4_REVERSE_DOMAIN_STRING_W
+        );
+}
+
+PPH_STRING PhpGetIp6ReverseNameFromAddress(
+    _In_ IN6_ADDR Address
+    )
+{
+    PH_STRING_BUILDER stringBuilder;
+
+    PhInitializeStringBuilder(&stringBuilder, 32);
+
+    for (INT i = sizeof(IN6_ADDR) - 1; i >= 0; i--)
+    {
+        PhAppendFormatStringBuilder(
+            &stringBuilder,
+            L"%x.%x.",
+            Address.s6_addr[i] & 0xF,
+            (Address.s6_addr[i] >> 4) & 0xF
+            );
+    }
+
+    PhAppendStringBuilder2(&stringBuilder, DNS_IP6_REVERSE_DOMAIN_STRING_W);
+
+    return PhFinalStringBuilderString(&stringBuilder);
+}
+
 NTSTATUS TracertHostnameLookupCallback(
     _In_ PVOID Parameter
     )
 {
     PTRACERT_RESOLVE_WORKITEM resolve = Parameter;
-    WSADATA winsockStartup;
+    DNS_STATUS status;
+    PPH_STRING addressHostName = NULL;
+    PPH_STRING addressReverse = NULL;
+    PDNS_RECORD dnsQueryResults = NULL;
 
-    if (WSAStartup(WINSOCK_VERSION, &winsockStartup) != ERROR_SUCCESS)
+    if (resolve->Type == PH_IPV4_NETWORK_TYPE)
+    {
+        addressReverse = PhpGetIp4ReverseNameFromAddress(((PSOCKADDR_IN)&resolve->SocketAddress)->sin_addr);
+    }
+    else if (resolve->Type == PH_IPV6_NETWORK_TYPE)
+    {
+        addressReverse = PhpGetIp6ReverseNameFromAddress(((PSOCKADDR_IN6)&resolve->SocketAddress)->sin6_addr);
+    }
+    else
+    {
         return STATUS_INVALID_PARAMETER;
+    }
 
-    if (resolve->Type == PH_IPV4_NETWORK_TYPE)
+    status = DnsQuery(
+        addressReverse->Buffer,
+        DNS_TYPE_PTR,
+        DNS_QUERY_BYPASS_CACHE | DNS_QUERY_NO_HOSTS_FILE,
+        NULL,
+        &dnsQueryResults,
+        NULL
+        );
+
+    if (dnsQueryResults)
     {
-        if (!GetNameInfo(
-            (PSOCKADDR)&resolve->SocketAddress,
-            sizeof(SOCKADDR_IN),
-            resolve->SocketAddressHostname,
-            sizeof(resolve->SocketAddressHostname),
-            NULL,
-            0,
-            NI_NAMEREQD
-            ))
-        {
-            SendMessage(
-                resolve->WindowHandle, 
-                WM_TRACERT_HOSTNAME, 
-                resolve->Index, 
-                (LPARAM)PhCreateString(resolve->SocketAddressHostname)
-                );
-        }
-        else
-        {
-            ULONG errorCode = WSAGetLastError();
-            if (errorCode != WSAHOST_NOT_FOUND && errorCode != WSATRY_AGAIN)
-            {
-                SendMessage(
-                    resolve->WindowHandle,
-                    WM_TRACERT_HOSTNAME,
-                    resolve->Index,
-                    (LPARAM)PhGetWin32Message(errorCode)
-                    );
-            }
+        addressHostName = PhCreateString(dnsQueryResults->Data.PTR.pNameHost); // Return the first result (dmex)
+        DnsRecordListFree(dnsQueryResults, DnsFreeRecordList);
+    }
 
-            PhDereferenceObject(resolve);
-        }
+    if (addressHostName)
+    {
+        SendMessage(
+            resolve->WindowHandle,
+            WM_TRACERT_HOSTNAME,
+            resolve->Index,
+            (LPARAM)addressHostName
+            );
     }
-    else if (resolve->Type == PH_IPV6_NETWORK_TYPE)
+    else
     {
-        if (!GetNameInfo(
-            (PSOCKADDR)&resolve->SocketAddress,
-            sizeof(SOCKADDR_IN6),
-            resolve->SocketAddressHostname,
-            sizeof(resolve->SocketAddressHostname),
-            NULL,
-            0,
-            NI_NAMEREQD
-            ))
+        if (status != DNS_ERROR_RCODE_NAME_ERROR)
         {
             SendMessage(
-                resolve->WindowHandle, 
-                WM_TRACERT_HOSTNAME, 
-                resolve->Index, 
-                (LPARAM)PhCreateString(resolve->SocketAddressHostname)
+                resolve->WindowHandle,
+                WM_TRACERT_HOSTNAME,
+                resolve->Index,
+                (LPARAM)PhGetWin32Message(status)
                 );
         }
-        else
-        {
-            ULONG errorCode = WSAGetLastError();
-            if (errorCode != WSAHOST_NOT_FOUND && errorCode != WSATRY_AGAIN)
-            {
-                SendMessage(
-                    resolve->WindowHandle,
-                    WM_TRACERT_HOSTNAME,
-                    resolve->Index,
-                    (LPARAM)PhGetWin32Message(errorCode)
-                    );
-            }
 
-            PhDereferenceObject(resolve);
-        }
+        PhDereferenceObject(resolve);
     }
 
-    WSACleanup();
+    PhDereferenceObject(addressReverse);
 
     return STATUS_SUCCESS;
 }
@@ -276,7 +293,7 @@ NTSTATUS NetworkTracertThreadStart(
         0
     };
 
-    if (icmpRandString = PhCreateStringEx(NULL, PhGetIntegerSetting(SETTING_NAME_PING_SIZE) * 2 + 2))
+    if (icmpRandString = PhCreateStringEx(NULL, PhGetIntegerSetting(SETTING_NAME_PING_SIZE) * sizeof(WCHAR) + sizeof(UNICODE_NULL)))
     {
         PhGenerateRandomAlphaString(icmpRandString->Buffer, (ULONG)icmpRandString->Length / sizeof(WCHAR));
 
@@ -485,7 +502,7 @@ VOID TracertMenuActionCallback(
             PWSTR terminator = NULL;
             PTRACERT_ROOT_NODE node;
 
-            if (node = GetSelectedTracertNode(Context))
+            if ((node = GetSelectedTracertNode(Context)) && !PhIsNullOrEmptyString(node->IpAddressString))
             {
                 if (NT_SUCCESS(RtlIpv4StringToAddress(
                     node->IpAddressString->Buffer, 
@@ -518,7 +535,7 @@ VOID TracertMenuActionCallback(
             PWSTR terminator = NULL;
             PTRACERT_ROOT_NODE node;
 
-            if (node = GetSelectedTracertNode(Context))
+            if ((node = GetSelectedTracertNode(Context)) && !PhIsNullOrEmptyString(node->IpAddressString))
             {
                 if (NT_SUCCESS(RtlIpv4StringToAddress(
                     node->IpAddressString->Buffer, 
@@ -551,7 +568,7 @@ VOID TracertMenuActionCallback(
             PWSTR terminator = NULL;
             PTRACERT_ROOT_NODE node;
 
-            if (node = GetSelectedTracertNode(Context))
+            if ((node = GetSelectedTracertNode(Context)) && !PhIsNullOrEmptyString(node->IpAddressString))
             {
                 if (NT_SUCCESS(RtlIpv4StringToAddress(
                     node->IpAddressString->Buffer, 
@@ -719,6 +736,13 @@ INT_PTR CALLBACK TracertDlgProc(
                         PhInsertEMenuItem(menu, PhCreateEMenuItem(0, MENU_ACTION_COPY, L"Copy", NULL, NULL), ULONG_MAX);
                         PhInsertCopyCellEMenuItem(menu, MENU_ACTION_COPY, context->TreeNewHandle, contextMenuEvent->Column);
 
+                        if (PhIsNullOrEmptyString(selectedNode->IpAddressString))
+                        {
+                            PhSetFlagsEMenuItem(menu, MAINMENU_ACTION_PING, PH_EMENU_DISABLED, PH_EMENU_DISABLED);
+                            PhSetFlagsEMenuItem(menu, NETWORK_ACTION_TRACEROUTE, PH_EMENU_DISABLED, PH_EMENU_DISABLED);
+                            PhSetFlagsEMenuItem(menu, NETWORK_ACTION_WHOIS, PH_EMENU_DISABLED, PH_EMENU_DISABLED);
+                        }
+
                         selectedItem = PhShowEMenu(
                             menu,
                             hwndDlg,
@@ -856,7 +880,12 @@ VOID ShowTracertWindow(
     memset(context, 0, sizeof(NETWORK_TRACERT_CONTEXT));
 
     context->MaximumHops = PhGetIntegerSetting(SETTING_NAME_TRACERT_MAX_HOPS);
-    context->RemoteEndpoint = NetworkItem->RemoteEndpoint;
+
+    RtlCopyMemory(
+        &context->RemoteEndpoint,
+        &NetworkItem->RemoteEndpoint,
+        sizeof(PH_IP_ENDPOINT)
+        );
 
     if (NetworkItem->RemoteEndpoint.Address.Type == PH_IPV4_NETWORK_TYPE)
     {
@@ -880,7 +909,12 @@ VOID ShowTracertWindowFromAddress(
     memset(context, 0, sizeof(NETWORK_TRACERT_CONTEXT));
 
     context->MaximumHops = PhGetIntegerSetting(SETTING_NAME_TRACERT_MAX_HOPS);
-    context->RemoteEndpoint = RemoteEndpoint;
+
+    RtlCopyMemory(
+        &context->RemoteEndpoint,
+        &RemoteEndpoint,
+        sizeof(PH_IP_ENDPOINT)
+        );
 
     if (RemoteEndpoint.Address.Type == PH_IPV4_NETWORK_TYPE)
     {
diff --git a/plugins/NetworkTools/tracetree.c b/plugins/NetworkTools/tracetree.c
@@ -193,7 +193,7 @@ VOID DestroyTracertNode(
     _In_ PTRACERT_ROOT_NODE Node
     )
 {
-   PhDereferenceObject(Node);
+    PhDereferenceObject(Node);
 }
 
 PTRACERT_ROOT_NODE AddTracertNode(
@@ -277,8 +277,8 @@ VOID UpdateTracertNodePingText(
     _In_ ULONG Index
     )
 {
-    if (Node->PingStatus[Index] == IP_HOP_LIMIT_EXCEEDED ||
-        Node->PingStatus[Index] == IP_SUCCESS)
+    if (Node->PingStatus[Index] == IP_SUCCESS ||
+        Node->PingStatus[Index] == IP_TTL_EXPIRED_TRANSIT) // IP_HOP_LIMIT_EXCEEDED
     {
         if (Node->PingList[Index])
         {
diff --git a/plugins/NetworkTools/whois.c b/plugins/NetworkTools/whois.c
@@ -573,7 +573,11 @@ VOID ShowWhoisWindow(
     context = (PNETWORK_WHOIS_CONTEXT)PhCreateAlloc(sizeof(NETWORK_WHOIS_CONTEXT));
     memset(context, 0, sizeof(NETWORK_WHOIS_CONTEXT));
 
-    context->RemoteEndpoint = NetworkItem->RemoteEndpoint;
+    RtlCopyMemory(
+        &context->RemoteEndpoint,
+        &NetworkItem->RemoteEndpoint,
+        sizeof(PH_IP_ENDPOINT)
+        );
 
     if (NetworkItem->RemoteEndpoint.Address.Type == PH_IPV4_NETWORK_TYPE)
     {
@@ -596,7 +600,11 @@ VOID ShowWhoisWindowFromAddress(
     context = (PNETWORK_WHOIS_CONTEXT)PhCreateAlloc(sizeof(NETWORK_WHOIS_CONTEXT));
     memset(context, 0, sizeof(NETWORK_WHOIS_CONTEXT));
 
-    context->RemoteEndpoint = RemoteEndpoint;
+    RtlCopyMemory(
+        &context->RemoteEndpoint,
+        &RemoteEndpoint,
+        sizeof(PH_IP_ENDPOINT)
+        );
 
     if (RemoteEndpoint.Address.Type == PH_IPV4_NETWORK_TYPE)
     {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ NTSTATUS NetworkPingThreadStart(`
`49`	`49`	`};`
`50`	`50`	`//pingOptions.Flags \|= IP_FLAG_REVERSE;`
`51`	`51`
`52`		`- if (icmpRandString = PhCreateStringEx(NULL, PhGetIntegerSetting(SETTING_NAME_PING_SIZE) * 2 + 2))`
	`52`	`+ if (icmpRandString = PhCreateStringEx(NULL, PhGetIntegerSetting(SETTING_NAME_PING_SIZE) * sizeof(WCHAR) + sizeof(UNICODE_NULL)))`
`53`	`53`	`{`
`54`	`54`	`PhGenerateRandomAlphaString(icmpRandString->Buffer, (ULONG)icmpRandString->Length / sizeof(WCHAR));`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ VOID DestroyTracertNode(`
`193`	`193`	`_In_ PTRACERT_ROOT_NODE Node`
`194`	`194`	`)`
`195`	`195`	`{`
`196`		`- PhDereferenceObject(Node);`
	`196`	`+ PhDereferenceObject(Node);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`PTRACERT_ROOT_NODE AddTracertNode(`
`@@ -277,8 +277,8 @@ VOID UpdateTracertNodePingText(`
`277`	`277`	`_In_ ULONG Index`
`278`	`278`	`)`
`279`	`279`	`{`
`280`		`- if (Node->PingStatus[Index] == IP_HOP_LIMIT_EXCEEDED \|\|`
`281`		`- Node->PingStatus[Index] == IP_SUCCESS)`
	`280`	`+ if (Node->PingStatus[Index] == IP_SUCCESS \|\|`
	`281`	`+ Node->PingStatus[Index] == IP_TTL_EXPIRED_TRANSIT) // IP_HOP_LIMIT_EXCEEDED`
`282`	`282`	`{`
`283`	`283`	`if (Node->PingList[Index])`
`284`	`284`	`{`