Attachment 49002 Details for Bug 38997 – Factor out _tp_create_local_socket() to tests/lib/util

[patch] Factor out _tp_create_local_socket() to tests/lib/util

Factor-out-tpcreatelocalsocket-to-testslibutil.patch (text/plain), 8.32 KB, created by Guillaume Desmottes on 2011-07-12 06:21:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2011-07-12 06:21:32 UTC

Size: 8.32 KB

patch

obsolete

>From 4bbba6fe804e6a1814d6ccbb2da4f1e9645b40e5 Mon Sep 17 00:00:00 2001
>From: Morten Mjelva <morten.mjelva@gmail.com>
>Date: Fri, 17 Jun 2011 14:28:58 +0100
>Subject: [PATCH] Factor out _tp_create_local_socket() to tests/lib/util
>
>https://bugs.freedesktop.org/show_bug.cgi?id=38997
>---
> tests/lib/stream-tube-chan.c |  102 ++------------------------------------
> tests/lib/util.c             |  111 ++++++++++++++++++++++++++++++++++++++++++
> tests/lib/util.h             |    6 ++
> 3 files changed, 122 insertions(+), 97 deletions(-)
>
>diff --git a/tests/lib/stream-tube-chan.c b/tests/lib/stream-tube-chan.c
>index 3d6b5b1..207f95d 100644
>--- a/tests/lib/stream-tube-chan.c
>+++ b/tests/lib/stream-tube-chan.c
>@@ -9,6 +9,7 @@
>  */
> 
> #include "stream-tube-chan.h"
>+#include "util.h"
> 
> #include <telepathy-glib/telepathy-glib.h>
> #include <telepathy-glib/channel-iface.h>
>@@ -448,102 +449,6 @@ service_incoming_cb (GSocketService *service,
>   g_signal_emit (self, signals[SIG_INCOMING_CONNECTION], 0, connection);
> }
> 
>-static GValue *
>-create_local_socket (TpTestsStreamTubeChannel *self,
>-    TpSocketAddressType address_type,
>-    TpSocketAccessControl access_control,
>-    GError **error)
>-{
>-  gboolean success;
>-  GSocketAddress *address, *effective_address;
>-  GValue *address_gvalue;
>-
>-  switch (access_control)
>-    {
>-      case TP_SOCKET_ACCESS_CONTROL_LOCALHOST:
>-      case TP_SOCKET_ACCESS_CONTROL_CREDENTIALS:
>-      case TP_SOCKET_ACCESS_CONTROL_PORT:
>-        break;
>-
>-      default:
>-        g_assert_not_reached ();
>-    }
>-
>-  switch (address_type)
>-    {
>-      case TP_SOCKET_ADDRESS_TYPE_UNIX:
>-        {
>-          address = g_unix_socket_address_new (tmpnam (NULL));
>-          break;
>-        }
>-
>-      case TP_SOCKET_ADDRESS_TYPE_IPV4:
>-      case TP_SOCKET_ADDRESS_TYPE_IPV6:
>-        {
>-          GInetAddress *localhost;
>-
>-          localhost = g_inet_address_new_loopback (
>-              address_type == TP_SOCKET_ADDRESS_TYPE_IPV4 ?
>-              G_SOCKET_FAMILY_IPV4 : G_SOCKET_FAMILY_IPV6);
>-          address = g_inet_socket_address_new (localhost, 0);
>-
>-          g_object_unref (localhost);
>-          break;
>-        }
>-
>-      default:
>-        g_assert_not_reached ();
>-    }
>-
>-  self->priv->service = g_socket_service_new ();
>-
>-  success = g_socket_listener_add_address (
>-      G_SOCKET_LISTENER (self->priv->service),
>-      address, G_SOCKET_TYPE_STREAM,
>-      G_SOCKET_PROTOCOL_DEFAULT,
>-      NULL, &effective_address, NULL);
>-  g_assert (success);
>-
>-  tp_g_signal_connect_object (self->priv->service, "incoming",
>-      G_CALLBACK (service_incoming_cb), self, 0);
>-
>-  switch (address_type)
>-    {
>-      case TP_SOCKET_ADDRESS_TYPE_UNIX:
>-        self->priv->unix_address = g_strdup (g_unix_socket_address_get_path (
>-              G_UNIX_SOCKET_ADDRESS (effective_address)));
>-        address_gvalue =  tp_g_value_slice_new_bytes (
>-            g_unix_socket_address_get_path_len (
>-              G_UNIX_SOCKET_ADDRESS (effective_address)),
>-            g_unix_socket_address_get_path (
>-              G_UNIX_SOCKET_ADDRESS (effective_address)));
>-        break;
>-
>-      case TP_SOCKET_ADDRESS_TYPE_IPV4:
>-      case TP_SOCKET_ADDRESS_TYPE_IPV6:
>-        address_gvalue = tp_g_value_slice_new_take_boxed (
>-            TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4,
>-            dbus_g_type_specialized_construct (
>-              TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4));
>-
>-        dbus_g_type_struct_set (address_gvalue,
>-            0, address_type == TP_SOCKET_ADDRESS_TYPE_IPV4 ?
>-              "127.0.0.1" : "::1",
>-            1, g_inet_socket_address_get_port (
>-              G_INET_SOCKET_ADDRESS (effective_address)),
>-            G_MAXUINT);
>-        break;
>-
>-      default:
>-        g_assert_not_reached ();
>-    }
>-
>-
>-  g_object_unref (address);
>-  g_object_unref (effective_address);
>-  return address_gvalue;
>-}
>-
> static void
> stream_tube_accept (TpSvcChannelTypeStreamTube *iface,
>     TpSocketAddressType address_type,
>@@ -569,7 +474,10 @@ stream_tube_accept (TpSvcChannelTypeStreamTube *iface,
>       goto fail;
>     }
> 
>-  address = create_local_socket (self, address_type, access_control, &error);
>+  address = _tp_create_local_socket (address_type, access_control,
>+      &self->priv->service, &self->priv->unix_address, &error);
>+  tp_g_signal_connect_object (self->priv->service, "incoming",
>+      G_CALLBACK (service_incoming_cb), self, 0);
> 
>   self->priv->access_control = access_control;
>   self->priv->access_control_param = tp_g_value_slice_dup (
>diff --git a/tests/lib/util.c b/tests/lib/util.c
>index fc2ecdb..224ceff 100644
>--- a/tests/lib/util.c
>+++ b/tests/lib/util.c
>@@ -8,12 +8,21 @@
>  * notice and this notice are preserved.
>  */
> 
>+#include "config.h"
>+
> #include "tests/lib/util.h"
> 
>+#include <glib/gstdio.h>
>+
> #ifdef G_OS_UNIX
> # include <unistd.h> /* for alarm() */
> #endif
> 
>+#ifdef HAVE_GIO_UNIX
>+#include <gio/gunixsocketaddress.h>
>+#include <gio/gunixconnection.h>
>+#endif
>+
> void
> tp_tests_proxy_run_until_prepared (gpointer proxy,
>     const GQuark *features)
>@@ -300,3 +309,105 @@ tp_tests_init (int *argc,
> 
>   g_test_init (argc, argv, NULL);
> }
>+
>+GValue *
>+_tp_create_local_socket (TpSocketAddressType address_type,
>+    TpSocketAccessControl access_control,
>+    GSocketService **service,
>+    gchar **unix_address,
>+    GError **error)
>+{
>+  gboolean success;
>+  GSocketAddress *address, *effective_address;
>+  GValue *address_gvalue;
>+
>+  g_assert (service != NULL);
>+  g_assert (unix_address != NULL);
>+
>+  switch (access_control)
>+    {
>+      case TP_SOCKET_ACCESS_CONTROL_LOCALHOST:
>+      case TP_SOCKET_ACCESS_CONTROL_CREDENTIALS:
>+      case TP_SOCKET_ACCESS_CONTROL_PORT:
>+        break;
>+
>+      default:
>+        g_assert_not_reached ();
>+    }
>+
>+  switch (address_type)
>+    {
>+#ifdef HAVE_GIO_UNIX
>+      case TP_SOCKET_ADDRESS_TYPE_UNIX:
>+        {
>+          address = g_unix_socket_address_new (tmpnam (NULL));
>+          break;
>+        }
>+#endif
>+
>+      case TP_SOCKET_ADDRESS_TYPE_IPV4:
>+      case TP_SOCKET_ADDRESS_TYPE_IPV6:
>+        {
>+          GInetAddress *localhost;
>+
>+          localhost = g_inet_address_new_loopback (
>+              address_type == TP_SOCKET_ADDRESS_TYPE_IPV4 ?
>+              G_SOCKET_FAMILY_IPV4 : G_SOCKET_FAMILY_IPV6);
>+          address = g_inet_socket_address_new (localhost, 0);
>+
>+          g_object_unref (localhost);
>+          break;
>+        }
>+
>+      default:
>+        g_assert_not_reached ();
>+    }
>+
>+  *service = g_socket_service_new ();
>+
>+  success = g_socket_listener_add_address (
>+      G_SOCKET_LISTENER (*service),
>+      address, G_SOCKET_TYPE_STREAM,
>+      G_SOCKET_PROTOCOL_DEFAULT,
>+      NULL, &effective_address, NULL);
>+  g_assert (success);
>+
>+  switch (address_type)
>+    {
>+#ifdef HAVE_GIO_UNIX
>+      case TP_SOCKET_ADDRESS_TYPE_UNIX:
>+        *unix_address = g_strdup (g_unix_socket_address_get_path (
>+              G_UNIX_SOCKET_ADDRESS (effective_address)));
>+        address_gvalue =  tp_g_value_slice_new_bytes (
>+            g_unix_socket_address_get_path_len (
>+              G_UNIX_SOCKET_ADDRESS (effective_address)),
>+            g_unix_socket_address_get_path (
>+              G_UNIX_SOCKET_ADDRESS (effective_address)));
>+        break;
>+#endif
>+
>+      case TP_SOCKET_ADDRESS_TYPE_IPV4:
>+      case TP_SOCKET_ADDRESS_TYPE_IPV6:
>+        *unix_address = NULL;
>+
>+        address_gvalue = tp_g_value_slice_new_take_boxed (
>+            TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4,
>+            dbus_g_type_specialized_construct (
>+              TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4));
>+
>+        dbus_g_type_struct_set (address_gvalue,
>+            0, address_type == TP_SOCKET_ADDRESS_TYPE_IPV4 ?
>+              "127.0.0.1" : "::1",
>+            1, g_inet_socket_address_get_port (
>+              G_INET_SOCKET_ADDRESS (effective_address)),
>+            G_MAXUINT);
>+        break;
>+
>+      default:
>+        g_assert_not_reached ();
>+    }
>+
>+  g_object_unref (address);
>+  g_object_unref (effective_address);
>+  return address_gvalue;
>+}
>diff --git a/tests/lib/util.h b/tests/lib/util.h
>index 689cf91..5a49c28 100644
>--- a/tests/lib/util.h
>+++ b/tests/lib/util.h
>@@ -57,4 +57,10 @@ void tp_tests_abort_after (guint sec);
> void tp_tests_init (int *argc,
>     char ***argv);
> 
>+GValue *_tp_create_local_socket (TpSocketAddressType address_type,
>+    TpSocketAccessControl access_control,
>+    GSocketService **service,
>+    gchar **unix_address,
>+    GError **error);
>+
> #endif /* #ifndef __TP_TESTS_LIB_UTIL_H__ */
>-- 
>1.7.4.1

Actions: View | Splinter Review

Attachments on bug 38997: 48809 | 48810 | 48811 | 49001 | 49002 | 49003 | 49004 | 49005 | 49006

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.