From 8027efc97b4bec85f674570f878919cb72456745 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 16 Sep 2006 17:38:24 +0000 Subject: voc Pennington * dbus/dbus-server.c (dbus_server_listen): change how this works to be able to delegate to a set of handlers that can succeed, fail, or choose not to handle. Allows us to have dbus_server_listen_platform_specific. * dbus/dbus-server-socket.c (_dbus_server_new_for_tcp_socket): factor out the tcp socket stuff to be used on windows, leaving unix domain socket only in dbus-socket-unix.c * dbus/dbus-transport-socket.c (_dbus_transport_new_for_tcp_socket): factor out the tcp socket stuff to be used on windows, leaving unix domain socket only in dbus-transport-unix.c * dbus/dbus-connection.c (dbus_connection_get_unix_user): insert temporary hack to be sure this fails on windows (dbus_connection_get_unix_process_id): ditto --- dbus/dbus-sysdeps.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'dbus/dbus-sysdeps.h') diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 6e301976..c1ed533a 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -100,8 +100,6 @@ typedef unsigned long dbus_gid_t; dbus_bool_t _dbus_open_tcp_socket (int *fd, DBusError *error); -dbus_bool_t _dbus_open_unix_socket (int *fd, - DBusError *error); dbus_bool_t _dbus_close_socket (int fd, DBusError *error); int _dbus_read_socket (int fd, @@ -118,15 +116,6 @@ int _dbus_write_socket_two (int fd, const DBusString *buffer2, int start2, int len2); - - - -int _dbus_connect_unix_socket (const char *path, - dbus_bool_t abstract, - DBusError *error); -int _dbus_listen_unix_socket (const char *path, - dbus_bool_t abstract, - DBusError *error); int _dbus_connect_tcp_socket (const char *host, dbus_uint32_t port, DBusError *error); @@ -145,6 +134,9 @@ typedef struct dbus_gid_t gid; /**< group ID or DBUS_GID_UNSET */ } DBusCredentials; +/* FIXME these read/send credentials should get moved to sysdeps-unix.h, + * or renamed to reflect what they mean cross-platform + */ dbus_bool_t _dbus_read_credentials_unix_socket (int client_fd, DBusCredentials *credentials, DBusError *error); -- cgit