Attachment 83864 Details for Bug 66060 – Fix for broken wine implementation

[patch] Fix for broken wine implementation

0001-Fix-for-broken-wine-AllocateAndGetTcpExTableFromStac.patch (text/plain), 6.14 KB, created by Ralf Habacker on 2013-08-08 21:13:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2013-08-08 21:13:10 UTC

Size: 6.14 KB

patch

obsolete

>From 9dad94597b099f70ee7ba42ebaf10c2ce3f8fd31 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 8 Aug 2013 22:42:35 +0200
>Subject: [PATCH 1/2] Fix for broken wine AllocateAndGetTcpExTableFromStack()
> implementation.
>
>On wine (tested with 1.5.6) the mentioned function could not be located in
>iphlpapi.dll using LoadLibrary()/GetProcAddress(), which is the prefered
>method to get a tcp peer pid on WinXP <= SP2.
>To workaround this limitation we use GetExtendedTcpTable() first to get the peer pid.
>If this fails (which happens at least on real WinXP SP2) we then use
>AllocateAndGetTcpExTableFromStack() to get the pid.
>---
> dbus/dbus-sysdeps-win.c |  156 +++++++++++++++++++++++++----------------------
> 1 Datei geÃ¤ndert, 84 Zeilen hinzugefÃ¼gt(+), 72 Zeilen entfernt(-)
>
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 767fbd2..dae75c7 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -134,6 +134,86 @@ static BOOL load_ex_ip_helper_procedures(void)
>     return TRUE;
> }
> 
>+
>+dbus_pid_t get_pid_from_extended_tcp_table(int peer_port)
>+{
>+  dbus_pid_t result;
>+  DWORD size;
>+  MIB_TCPTABLE_OWNER_PID *tcp_table;
>+  DWORD i;
>+
>+  if ((result =
>+       GetExtendedTcpTable (NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) == ERROR_INSUFFICIENT_BUFFER)
>+    {
>+      tcp_table = (MIB_TCPTABLE_OWNER_PID *) dbus_malloc (size);
>+      if (tcp_table == NULL)
>+        {
>+          _dbus_verbose ("Error allocating memory\n");
>+          return 0;
>+        }
>+    }
>+
>+  if ((result = GetExtendedTcpTable (tcp_table, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) != NO_ERROR)
>+    {
>+      _dbus_verbose ("Error fetching tcp table %d\n", (int)result);
>+      dbus_free (tcp_table);
>+      return 0;
>+    }
>+
>+  result = 0;
>+  for (i = 0; i < tcp_table->dwNumEntries; i++)
>+    {
>+      MIB_TCPROW_OWNER_PID *p = &tcp_table->table[i];
>+      int local_address = ntohl (p->dwLocalAddr);
>+      int local_port = ntohs (p->dwLocalPort);
>+      if (p->dwState == MIB_TCP_STATE_ESTAB
>+          && local_address == INADDR_LOOPBACK && local_port == peer_port)
>+         result = p->dwOwningPid;
>+    }
>+
>+  _dbus_verbose ("got pid %d\n", (int)result);
>+  dbus_free (tcp_table);
>+  return result;
>+}
>+
>+dbus_pid_t get_pid_from_tcp_ex_table(int peer_port)
>+{
>+  dbus_pid_t result;
>+  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);
>+      int local_address = ntohl (lpBuffer->table[dwSize].dwLocalAddr);
>+      if (local_address == INADDR_LOOPBACK && 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;
>+}
>+
> /**
>  * @brief return peer process id from tcp handle for localhost connections
>  * @param handle tcp socket descriptor
>@@ -147,9 +227,6 @@ _dbus_get_peer_pid_from_tcp_handle (int handle)
>   int peer_port;
> 
>   dbus_pid_t result;
>-  DWORD size;
>-  MIB_TCPTABLE_OWNER_PID *tcp_table;
>-  DWORD i;
>   dbus_bool_t is_localhost = FALSE;
> 
>   getpeername (handle, (struct sockaddr *) &addr, &len);
>@@ -190,77 +267,12 @@ _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);
>+  _dbus_verbose ("\n");
> 
>-      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);
>-          int local_address = ntohl (lpBuffer->table[dwSize].dwLocalAddr);
>-          if (local_address == INADDR_LOOPBACK && local_port == peer_port)
>-            {
>-              result = lpBuffer->table[dwSize].dwOwningPid;
>-              break;
>-            }
>-        }
>-
>-      if (lpBuffer)
>-          HeapFree (GetProcessHeap(), 0, lpBuffer);
>-
>-      _dbus_verbose ("got pid %d\n", (int)result);
>+  result = get_pid_from_extended_tcp_table(peer_port);
>+  if (result > 0)
>       return result;
>-    }
>-
>-  if ((result =
>-       GetExtendedTcpTable (NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) == ERROR_INSUFFICIENT_BUFFER)
>-    {
>-      tcp_table = (MIB_TCPTABLE_OWNER_PID *) dbus_malloc (size);
>-      if (tcp_table == NULL)
>-        {
>-          _dbus_verbose ("Error allocating memory\n");
>-          return 0;
>-        }
>-    }
>-
>-  if ((result = GetExtendedTcpTable (tcp_table, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) != NO_ERROR)
>-    {
>-      _dbus_verbose ("Error fetching tcp table %d\n", result);
>-      dbus_free (tcp_table);
>-      return 0;
>-    }
>-
>-  result = 0;
>-  for (i = 0; i < tcp_table->dwNumEntries; i++)
>-    {
>-      MIB_TCPROW_OWNER_PID *p = &tcp_table->table[i];
>-      int local_address = ntohl (p->dwLocalAddr);
>-      int local_port = ntohs (p->dwLocalPort);
>-      if (p->dwState == MIB_TCP_STATE_ESTAB
>-          && local_address == INADDR_LOOPBACK && local_port == peer_port)
>-        result = p->dwOwningPid;
>-    }
>-
>-  _dbus_verbose ("got pid %d\n", result);
>-  dbus_free (tcp_table);
>+  result = get_pid_from_tcp_ex_table(peer_port);
>   return result;
> }
> 
>-- 
>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.