Attachment 83832 Details for Bug 66060 – Fixed bug of unsupported GetExtendedTcpTable() table option on Windows XP SP2 and earlier

[patch] Fixed bug of unsupported GetExtendedTcpTable() table option on Windows XP SP2 and earlier

0001-Fixed-bug-of-unsupported-GetExtendTcpTable-on-Window.patch (text/plain), 2.97 KB, created by Ralf Habacker on 2013-08-08 12:22:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2013-08-08 12:22:00 UTC

Size: 2.97 KB

patch

obsolete

>From 22054826d43c39fe1b1e2555e3cdf53f89547a8b Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 7 Aug 2013 20:47:55 +0200
>Subject: [PATCH] Fixed bug of unsupported GetExtendTcpTable() on Windows XP
> SP2 and earlier.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
>---
> dbus/dbus-sysdeps-win.c |   62 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 Datei geÃ¤ndert, 62 Zeilen hinzugefÃ¼gt(+)
>
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 9df1c2d..aa0f97e 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -104,6 +104,31 @@ _dbus_win_set_errno (int err)
> #endif
> }
> 
>+static BOOL is_winxp_sp3_or_lower();
>+
>+/*
>+ * _MIB_TCPROW_EX and friends are not available in system headers
>+ *  and are mapped to attribute identical ...OWNER_PID typedefs.
>+ */
>+typedef MIB_TCPROW_OWNER_PID _MIB_TCPROW_EX;
>+typedef MIB_TCPTABLE_OWNER_PID MIB_TCPTABLE_EX;
>+typedef PMIB_TCPTABLE_OWNER_PID PMIB_TCPTABLE_EX;
>+typedef DWORD (WINAPI *ProcAllocateAndGetTcpExtTableFromStack)(PMIB_TCPTABLE_EX*,BOOL,HANDLE,DWORD,DWORD);
>+static ProcAllocateAndGetTcpExtTableFromStack lpfnAllocateAndGetTcpExTableFromStack = NULL;
>+
>+static BOOL load_ex_ip_helper_procedures(void)
>+{
>+    HMODULE hModule = LoadLibrary ("iphlpapi.dll");
>+    if (hModule == NULL)
>+        return FALSE;
>+
>+    lpfnAllocateAndGetTcpExTableFromStack = (ProcAllocateAndGetTcpExtTableFromStack)GetProcAddress (hModule, "AllocateAndGetTcpExTableFromStack");
>+    if (lpfnAllocateAndGetTcpExTableFromStack == NULL)
>+        return FALSE;
>+
>+    return TRUE;
>+}
>+
> /**
>  * @brief return peer process id from tcp handle for localhost connections
>  * @param handle tcp socket descriptor
>@@ -160,6 +185,43 @@ _dbus_get_peer_pid_from_tcp_handle (int handle)
>       return 0;
>     }
> 
>+  if (is_winxp_sp3_or_lower ())
>+    {
>+      DWORD errorCode, dwSize;
>+      PMIB_TCPTABLE_EX lpBuffer = NULL;
>+
>+      if (!load_ex_ip_helper_procedures ())
>+        {
>+          _dbus_verbose
>+            ("Error not been able to load iphelper procedures\n");
>+          return 0;
>+        }
>+      errorCode = (*lpfnAllocateAndGetTcpExTableFromStack) (&lpBuffer, TRUE, GetProcessHeap(), 0, 2);
>+      if (errorCode != NO_ERROR)
>+        {
>+          _dbus_verbose
>+            ("Error not been able to call AllocateAndGetTcpExTableFromStack()\n");
>+          return 0;
>+        }
>+
>+      result = 0;
>+      for (dwSize = 0; dwSize < lpBuffer->dwNumEntries; dwSize++)
>+        {
>+          int local_port = ntohs (lpBuffer->table[dwSize].dwLocalPort);
>+          if (local_port == peer_port)
>+            {
>+              result = lpBuffer->table[dwSize].dwOwningPid;
>+              break;
>+            }
>+        }
>+
>+      if (lpBuffer)
>+          HeapFree (GetProcessHeap(), 0, lpBuffer);
>+
>+      _dbus_verbose ("got pid %d\n", (int)result);
>+      return result;
>+    }
>+
>   if ((result =
>        GetExtendedTcpTable (NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) == ERROR_INSUFFICIENT_BUFFER)
>     {
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 66060: 82667 | 82670 | 83797 | 83832 | 83843 | 83844 | 83862 | 83863 | 83864 | 83865 | 83866 | 83891

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.