* dbus/dbus-auth.c (client_try_next_mechanism): Remove logic to

[platform/upstream/dbus.git] / dbus / dbus-server-debug-pipe.c

diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c
index c6dc9f7..4340e15 100644 (file)
--- a/dbus/dbus-server-debug-pipe.c
+++ b/dbus/dbus-server-debug-pipe.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2003  CodeFactory AB
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include "dbus-transport-unix.h"
 #include "dbus-connection-internal.h"
 #include "dbus-hash.h"
+#include "dbus-string.h"
 
 #ifdef DBUS_BUILD_TESTS
 
@@ -108,15 +109,6 @@ debug_finalize (DBusServer *server)
   dbus_free (server);
 }
 
-static dbus_bool_t
-debug_handle_watch (DBusServer  *server,
-                   DBusWatch   *watch,
-                   unsigned int flags)
-{
-
-  return TRUE;
-}
-
 static void
 debug_disconnect (DBusServer *server)
 {
@@ -125,7 +117,6 @@ debug_disconnect (DBusServer *server)
 
 static DBusServerVTable debug_vtable = {
   debug_finalize,
-  debug_handle_watch,
   debug_disconnect
 };
 
@@ -141,7 +132,8 @@ _dbus_server_debug_pipe_new (const char     *server_name,
                              DBusError      *error)
 {
   DBusServerDebugPipe *debug_server;
-
+  DBusString address;
+  
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
   
   if (!pipe_hash_ref ())
@@ -155,52 +147,47 @@ _dbus_server_debug_pipe_new (const char     *server_name,
     }
   
   debug_server = dbus_new0 (DBusServerDebugPipe, 1);
-
   if (debug_server == NULL)
-    {
-      pipe_hash_unref ();
-      return NULL;
-    }
+    goto nomem_0;
+
+  if (!_dbus_string_init (&address))
+    goto nomem_1;
 
+  if (!_dbus_string_append (&address, "debug-pipe:name=") ||
+      !_dbus_string_append (&address, server_name))
+    goto nomem_2;
+  
   debug_server->name = _dbus_strdup (server_name);
   if (debug_server->name == NULL)
-    {
-      dbus_free (debug_server->name);
-      dbus_free (debug_server);
-
-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-
-      pipe_hash_unref ();
-      return NULL;
-    }
+    goto nomem_2;
   
   if (!_dbus_server_init_base (&debug_server->base,
-                              &debug_vtable))
-    {
-      dbus_free (debug_server->name);      
-      dbus_free (debug_server);
-
-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-
-      pipe_hash_unref ();
-      return NULL;
-    }
+                              &debug_vtable, &address))
+    goto nomem_3;
 
   if (!_dbus_hash_table_insert_string (server_pipe_hash,
                                       debug_server->name,
                                       debug_server))
-    {
-      _dbus_server_finalize_base (&debug_server->base);
-      dbus_free (debug_server->name);      
-      dbus_free (debug_server);
+    goto nomem_4;
 
-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+  _dbus_string_free (&address);
 
-      pipe_hash_unref ();
-      return NULL;
-    }
+  /* server keeps the pipe hash ref */
   
   return (DBusServer *)debug_server;
+
+ nomem_4:
+  _dbus_server_finalize_base (&debug_server->base);
+ nomem_3:
+  dbus_free (debug_server->name);
+ nomem_2:
+  _dbus_string_free (&address);
+ nomem_1:
+  dbus_free (debug_server);
+ nomem_0:
+  pipe_hash_unref ();
+  dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+  return NULL;
 }
 
 /**
@@ -221,23 +208,45 @@ _dbus_transport_debug_pipe_new (const char     *server_name,
   DBusConnection *connection;
   int client_fd, server_fd;
   DBusServer *server;
-
+  DBusString address;
+  
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+  if (server_pipe_hash == NULL)
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_SERVER, NULL);
+      return NULL;
+    }
   
   server = _dbus_hash_table_lookup_string (server_pipe_hash,
                                            server_name);
   if (server == NULL ||
       ((DBusServerDebugPipe*)server)->disconnected)
     {
-      dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS, NULL);
+      dbus_set_error (error, DBUS_ERROR_NO_SERVER, NULL);
+      return NULL;
+    }
+
+  if (!_dbus_string_init (&address))
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      return NULL;
+    }
+
+  if (!_dbus_string_append (&address, "debug-pipe:name=") ||
+      !_dbus_string_append (&address, server_name))
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      _dbus_string_free (&address);
       return NULL;
     }
   
-  if (!_dbus_full_duplex_pipe (&client_fd, &server_fd,
+  if (!_dbus_full_duplex_pipe (&client_fd, &server_fd, FALSE,
                                NULL))
     {
       _dbus_verbose ("failed to create full duplex pipe\n");
       dbus_set_error (error, DBUS_ERROR_FAILED, "Could not create full-duplex pipe");
+      _dbus_string_free (&address);
       return NULL;
     }
 
@@ -245,19 +254,22 @@ _dbus_transport_debug_pipe_new (const char     *server_name,
   _dbus_fd_set_close_on_exec (server_fd);
   
   client_transport = _dbus_transport_new_for_fd (client_fd,
-                                                 FALSE);
+                                                 FALSE, &address);
   if (client_transport == NULL)
     {
       _dbus_close (client_fd, NULL);
       _dbus_close (server_fd, NULL);
       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      _dbus_string_free (&address);
       return NULL;
     }
 
+  _dbus_string_free (&address);
+  
   client_fd = -1;
   
   server_transport = _dbus_transport_new_for_fd (server_fd,
-                                                 TRUE);
+                                                 TRUE, NULL);
   if (server_transport == NULL)
     {
       _dbus_transport_unref (client_transport);
@@ -268,6 +280,15 @@ _dbus_transport_debug_pipe_new (const char     *server_name,
 
   server_fd = -1;
 
+  if (!_dbus_transport_set_auth_mechanisms (server_transport,
+                                            (const char**) server->auth_mechanisms))
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      _dbus_transport_unref (server_transport);
+      _dbus_transport_unref (client_transport);
+      return FALSE;
+    }
+  
   connection = _dbus_connection_new_for_transport (server_transport);
   _dbus_transport_unref (server_transport);
   server_transport = NULL;