Attachment 135874 Details for Bug 61922 – Fix IPV6 support in _dbus_get_peer_pid_from_tcp_handle() on Windows

[patch] Fix IPV6 support in _dbus_get_peer_pid_from_tcp_handle() on Windows

Fix-IPV6-support-in-dbusgetpeerpidfromtcphandle-on.patch (text/plain), 5.22 KB, created by Ralf Habacker on 2017-12-02 00:50:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2017-12-02 00:50:45 UTC

Size: 5.22 KB

patch

obsolete

>From 6a21b6bbbd831cac67236afdd088a2b8702b734b Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Sat, 2 Dec 2017 01:50:23 +0100
>Subject: [PATCH] Fix IPV6 support in _dbus_get_peer_pid_from_tcp_handle() on
> Windows
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61922
>---
> dbus/dbus-sysdeps-win.c | 84 +++++++++++++++++++++++++++++++------------------
> 1 file changed, 54 insertions(+), 30 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 90a55a7c..3b47d1d4 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -139,50 +139,79 @@ load_ex_ip_helper_procedures(void)
>  * get pid from localhost tcp connection using peer_port
>  * This function is available on WinXP >= SP3
>  * @param peer_port peers tcp port
>+ * @param family adress family - AF_INET or AF_INET6
>  * @return process id or 0 if connection has not been found
>  */
> static dbus_pid_t
>-get_pid_from_extended_tcp_table(int peer_port)
>+get_pid_from_extended_tcp_table(int peer_port, int family)
> {
>   dbus_pid_t result;
>   DWORD errorCode, size = 0, i;
>-  MIB_TCPTABLE_OWNER_PID *tcp_table;
> 
>   if ((errorCode =
>-       GetExtendedTcpTable (NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) == ERROR_INSUFFICIENT_BUFFER)
>+       GetExtendedTcpTable (NULL, &size, TRUE, family, TCP_TABLE_OWNER_PID_ALL, 0)) != ERROR_INSUFFICIENT_BUFFER)
>     {
>-      tcp_table = (MIB_TCPTABLE_OWNER_PID *) dbus_malloc (size);
>+      _dbus_win_warn_win_error ("unexpected error returned from GetExtendedTcpTable", errorCode);
>+      return 0;
>+    }
>+
>+  if (family == AF_INET6)
>+    {
>+      MIB_TCP6TABLE_OWNER_PID *tcp_table;
>+      tcp_table = (MIB_TCP6TABLE_OWNER_PID *) dbus_malloc (size);
>       if (tcp_table == NULL)
>         {
>           _dbus_verbose ("Error allocating memory\n");
>           return 0;
>         }
>+
>+      if ((errorCode = GetExtendedTcpTable (tcp_table, &size, TRUE, family, TCP_TABLE_OWNER_PID_ALL, 0)) != NO_ERROR)
>+        {
>+          _dbus_verbose ("Error fetching tcp table %d\n", (int)errorCode);
>+          dbus_free (tcp_table);
>+          return 0;
>+        }
>+
>+      result = 0;
>+      for (i = 0; i < tcp_table->dwNumEntries; i++)
>+        {
>+          dbus_bool_t is_localhost;
>+          MIB_TCP6ROW_OWNER_PID *p = &tcp_table->table[i];
>+          int local_port = ntohs (p->dwLocalPort);
>+          is_localhost = (memcmp(p->ucLocalAddr, in6addr_loopback.s6_addr, 16) == 0);
>+          if (p->dwState == MIB_TCP_STATE_ESTAB && is_localhost && local_port == peer_port)
>+            result = p->dwOwningPid;
>+        }
>+      dbus_free (tcp_table);
>     }
>   else
>     {
>-      _dbus_win_warn_win_error ("unexpected error returned from GetExtendedTcpTable", errorCode);
>-      return 0;
>-    }
>+      MIB_TCPTABLE_OWNER_PID *tcp_table;
>+      tcp_table = (MIB_TCPTABLE_OWNER_PID *) dbus_malloc (size);
>+      if (tcp_table == NULL)
>+        {
>+          _dbus_verbose ("Error allocating memory\n");
>+           return 0;
>+        }
>+      if ((errorCode = GetExtendedTcpTable (tcp_table, &size, TRUE, family, TCP_TABLE_OWNER_PID_ALL, 0)) != NO_ERROR)
>+        {
>+          _dbus_verbose ("Error fetching tcp table %d\n", (int)errorCode);
>+          dbus_free (tcp_table);
>+          return 0;
>+        }
> 
>-  if ((errorCode = GetExtendedTcpTable (tcp_table, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0)) != NO_ERROR)
>-    {
>-      _dbus_verbose ("Error fetching tcp table %d\n", (int)errorCode);
>+      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_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_free (tcp_table);
>   _dbus_verbose ("got pid %lu\n", result);
>   return result;
> }
>@@ -260,14 +289,9 @@ _dbus_get_peer_pid_from_tcp_handle (int handle)
>     }
>   else if (addr.ss_family == AF_INET6)
>     {
>-      _dbus_verbose ("FIXME [61922]: IPV6 support not working on windows\n");
>-      return 0;
>-      /*
>          struct sockaddr_in6 *s = (struct sockaddr_in6 * )&addr;
>          peer_port = ntohs (s->sin6_port);
>          is_localhost = (memcmp(s->sin6_addr.s6_addr, in6addr_loopback.s6_addr, 16) == 0);
>-         _dbus_verbose ("IPV6 %08x %08x\n", s->sin6_addr.s6_addr, in6addr_loopback.s6_addr);
>-       */
>     }
>   else
>     {
>@@ -290,7 +314,7 @@ _dbus_get_peer_pid_from_tcp_handle (int handle)
> 
>   _dbus_verbose ("trying to get peer's pid\n");
> 
>-  result = get_pid_from_extended_tcp_table (peer_port);
>+  result = get_pid_from_extended_tcp_table (peer_port, addr.ss_family);
>   if (result > 0)
>       return result;
>   result = get_pid_from_tcp_ex_table (peer_port);
>-- 
>2.12.3

Actions: View | Splinter Review

Attachments on bug 61922: 112995 | 135874 | 137355 | 137356 | 137863 | 137882 | 137883 | 137884 | 137885 | 137891 | 137892 | 137893 | 137894 | 137895 | 137896 | 137897 | 137907 | 137917 | 137918 | 137919 | 137927 | 137928 | 137929 | 137930 | 137931 | 137932 | 137933 | 137962 | 137963 | 137964 | 137965 | 137966 | 137967 | 138019 | 138023 | 138024 | 138025 | 138026 | 138212

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.