-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* dbus-server-unix.c Server implementation for Unix network protocols.
*
- * Copyright (C) 2002 Red Hat Inc.
+ * Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.1
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "dbus-internals.h"
#include "dbus-server-unix.h"
+#include "dbus-server-socket.h"
#include "dbus-transport-unix.h"
#include "dbus-connection-internal.h"
-#include <sys/types.h>
-#include <unistd.h>
+#include "dbus-sysdeps-unix.h"
+#include "dbus-string.h"
/**
* @defgroup DBusServerUnix DBusServer implementations for UNIX
*
* @{
*/
-/**
- *
- * Opaque object representing a Unix server implementation.
- */
-typedef struct DBusServerUnix DBusServerUnix;
/**
- * Implementation details of DBusServerUnix. All members
- * are private.
+ * Tries to interpret the address entry in a platform-specific
+ * way, creating a platform-specific server type if appropriate.
+ * Sets error if the result is not OK.
+ *
+ * @param entry an address entry
+ * @param server_p location to store a new DBusServer, or #NULL on failure.
+ * @param error location to store rationale for failure on bad address
+ * @returns the outcome
+ *
*/
-struct DBusServerUnix
+DBusServerListenResult
+_dbus_server_listen_platform_specific (DBusAddressEntry *entry,
+ DBusServer **server_p,
+ DBusError *error)
{
- DBusServer base; /**< Parent class members. */
- int fd; /**< File descriptor or -1 if disconnected. */
- DBusWatch *watch; /**< File descriptor watch. */
-};
+ const char *method;
-static void
-unix_finalize (DBusServer *server)
-{
- DBusServerUnix *unix_server = (DBusServerUnix*) server;
+ *server_p = NULL;
- _dbus_server_finalize_base (server);
+ method = dbus_address_entry_get_method (entry);
- if (unix_server->watch)
- _dbus_watch_unref (unix_server->watch);
-
- dbus_free (server);
-}
-
-static void
-handle_new_client_fd (DBusServer *server,
- int client_fd)
-{
- DBusConnection *connection;
- DBusTransport *transport;
-
- _dbus_verbose ("Creating new client connection with fd %d\n", client_fd);
-
- if (!_dbus_set_fd_nonblocking (client_fd, NULL))
- return;
-
- transport = _dbus_transport_new_for_fd (client_fd, TRUE);
- if (transport == NULL)
- {
- close (client_fd);
- return;
- }
-
- /* note that client_fd is now owned by the transport, and will be
- * closed on transport disconnection/finalization
- */
-
- connection = _dbus_connection_new_for_transport (transport);
- _dbus_transport_unref (transport);
-
- if (connection == NULL)
- return;
-
- _dbus_connection_set_connection_counter (connection,
- server->connection_counter);
-
- /* See if someone wants to handle this new connection,
- * self-referencing for paranoia
- */
- if (server->new_connection_function)
+ if (strcmp (method, "unix") == 0)
{
- dbus_server_ref (server);
-
- (* server->new_connection_function) (server, connection,
- server->new_connection_data);
- dbus_server_unref (server);
- }
-
- /* If no one grabbed a reference, the connection will die. */
- dbus_connection_unref (connection);
-}
-
-static void
-unix_handle_watch (DBusServer *server,
- DBusWatch *watch,
- unsigned int flags)
-{
- DBusServerUnix *unix_server = (DBusServerUnix*) server;
-
- _dbus_assert (watch == unix_server->watch);
+ const char *path = dbus_address_entry_get_value (entry, "path");
+ const char *tmpdir = dbus_address_entry_get_value (entry, "tmpdir");
+ const char *abstract = dbus_address_entry_get_value (entry, "abstract");
+
+ if (path == NULL && tmpdir == NULL && abstract == NULL)
+ {
+ _dbus_set_bad_address(error, "unix",
+ "path or tmpdir or abstract",
+ NULL);
+ return DBUS_SERVER_LISTEN_BAD_ADDRESS;
+ }
- _dbus_verbose ("Handling client connection, flags 0x%x\n", flags);
-
- if (flags & DBUS_WATCH_READABLE)
- {
- int client_fd;
- int listen_fd;
-
- listen_fd = dbus_watch_get_fd (watch);
+ if ((path && tmpdir) ||
+ (path && abstract) ||
+ (tmpdir && abstract))
+ {
+ _dbus_set_bad_address(error, NULL, NULL,
+ "cannot specify two of \"path\" and \"tmpdir\" and \"abstract\" at the same time");
+ return DBUS_SERVER_LISTEN_BAD_ADDRESS;
+ }
- client_fd = _dbus_accept (listen_fd);
-
- if (client_fd < 0)
+ if (tmpdir != NULL)
{
- /* EINTR handled for us */
-
- if (errno == EAGAIN || errno == EWOULDBLOCK)
- _dbus_verbose ("No client available to accept after all\n");
+ DBusString full_path;
+ DBusString filename;
+
+ if (!_dbus_string_init (&full_path))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+ }
+
+ if (!_dbus_string_init (&filename))
+ {
+ _dbus_string_free (&full_path);
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+ }
+
+ if (!_dbus_string_append (&filename,
+ "dbus-") ||
+ !_dbus_generate_random_ascii (&filename, 10) ||
+ !_dbus_string_append (&full_path, tmpdir) ||
+ !_dbus_concat_dir_and_file (&full_path, &filename))
+ {
+ _dbus_string_free (&full_path);
+ _dbus_string_free (&filename);
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+ }
+
+ /* Always use abstract namespace if possible with tmpdir */
+
+ *server_p =
+ _dbus_server_new_for_domain_socket (_dbus_string_get_const_data (&full_path),
+#ifdef HAVE_ABSTRACT_SOCKETS
+ TRUE,
+#else
+ FALSE,
+#endif
+ error);
+
+ _dbus_string_free (&full_path);
+ _dbus_string_free (&filename);
+ }
+ else
+ {
+ if (path)
+ *server_p = _dbus_server_new_for_domain_socket (path, FALSE, error);
else
- _dbus_verbose ("Failed to accept a client connection: %s\n",
- _dbus_strerror (errno));
+ *server_p = _dbus_server_new_for_domain_socket (abstract, TRUE, error);
+ }
+
+ if (*server_p != NULL)
+ {
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
+ return DBUS_SERVER_LISTEN_OK;
}
else
{
- _dbus_fd_set_close_on_exec (client_fd);
- handle_new_client_fd (server, client_fd);
+ _DBUS_ASSERT_ERROR_IS_SET(error);
+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
}
}
-
- if (flags & DBUS_WATCH_ERROR)
- _dbus_verbose ("Error on server listening socket\n");
-
- if (flags & DBUS_WATCH_HANGUP)
- _dbus_verbose ("Hangup on server listening socket\n");
-}
-
-static void
-unix_disconnect (DBusServer *server)
-{
- DBusServerUnix *unix_server = (DBusServerUnix*) server;
-
- if (unix_server->watch)
+ else
{
- _dbus_server_remove_watch (server,
- unix_server->watch);
- _dbus_watch_unref (unix_server->watch);
- unix_server->watch = NULL;
+ /* If we don't handle the method, we return NULL with the
+ * error unset
+ */
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
+ return DBUS_SERVER_LISTEN_NOT_HANDLED;
}
-
- close (unix_server->fd);
- unix_server->fd = -1;
}
-static DBusServerVTable unix_vtable = {
- unix_finalize,
- unix_handle_watch,
- unix_disconnect
-};
-
/**
- * Creates a new server listening on the given file descriptor. The
- * file descriptor should be nonblocking (use
- * _dbus_set_fd_nonblocking() to make it so). The file descriptor
- * should be listening for connections, that is, listen() should have
- * been successfully invoked on it. The server will use accept() to
- * accept new client connections.
+ * Creates a new server listening on the given Unix domain socket.
*
- * @param fd the file descriptor.
- * @returns the new server, or #NULL if no memory.
- *
+ * @param path the path for the domain socket.
+ * @param abstract #TRUE to use abstract socket namespace
+ * @param error location to store reason for failure.
+ * @returns the new server, or #NULL on failure.
*/
DBusServer*
-_dbus_server_new_for_fd (int fd)
+_dbus_server_new_for_domain_socket (const char *path,
+ dbus_bool_t abstract,
+ DBusError *error)
{
- DBusServerUnix *unix_server;
- DBusWatch *watch;
-
- watch = _dbus_watch_new (fd,
- DBUS_WATCH_READABLE);
- if (watch == NULL)
- return NULL;
+ DBusServer *server;
+ int listen_fd;
+ DBusString address;
+ char *path_copy;
+ DBusString path_str;
- unix_server = dbus_new0 (DBusServerUnix, 1);
- if (unix_server == NULL)
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+ if (!_dbus_string_init (&address))
{
- _dbus_watch_unref (watch);
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return NULL;
}
-
- if (!_dbus_server_init_base (&unix_server->base,
- &unix_vtable))
+
+ _dbus_string_init_const (&path_str, path);
+ if ((abstract &&
+ !_dbus_string_append (&address, "unix:abstract=")) ||
+ (!abstract &&
+ !_dbus_string_append (&address, "unix:path=")) ||
+ !_dbus_address_append_escaped (&address, &path_str))
{
- _dbus_watch_unref (watch);
- dbus_free (unix_server);
- return NULL;
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto failed_0;
}
- if (!_dbus_server_add_watch (&unix_server->base,
- watch))
+ path_copy = _dbus_strdup (path);
+ if (path_copy == NULL)
{
- _dbus_server_finalize_base (&unix_server->base);
- _dbus_watch_unref (watch);
- dbus_free (unix_server);
- return NULL;
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto failed_0;
}
- unix_server->fd = fd;
- unix_server->watch = watch;
-
- return (DBusServer*) unix_server;
-}
+ listen_fd = _dbus_listen_unix_socket (path, abstract, error);
-/**
- * Creates a new server listening on the given Unix domain socket.
- *
- * @param path the path for the domain socket.
- * @param result location to store reason for failure.
- * @returns the new server, or #NULL on failure.
- */
-DBusServer*
-_dbus_server_new_for_domain_socket (const char *path,
- DBusResultCode *result)
-{
- DBusServer *server;
- int listen_fd;
-
- listen_fd = _dbus_listen_unix_socket (path, result);
- _dbus_fd_set_close_on_exec (listen_fd);
-
if (listen_fd < 0)
- return NULL;
+ {
+ _DBUS_ASSERT_ERROR_IS_SET (error);
+ goto failed_1;
+ }
- server = _dbus_server_new_for_fd (listen_fd);
+ server = _dbus_server_new_for_socket (&listen_fd, 1, &address);
if (server == NULL)
{
- dbus_set_result (result, DBUS_RESULT_NO_MEMORY);
- close (listen_fd);
- return NULL;
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto failed_2;
}
+ _dbus_server_socket_own_filename(server, path_copy);
+
+ _dbus_string_free (&address);
+
return server;
+
+ failed_2:
+ _dbus_close_socket (listen_fd, NULL);
+ failed_1:
+ dbus_free (path_copy);
+ failed_0:
+ _dbus_string_free (&address);
+
+ return NULL;
}
/** @} */
projects / platform / upstream / dbus.git / blobdiff