diff options
| author | Havoc Pennington <hp@redhat.com> | 2006-09-16 17:38:24 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2006-09-16 17:38:24 +0000 |
| commit | 8027efc97b4bec85f674570f878919cb72456745 (patch) | |
| tree | 441ffafa5367bdb93c8bfa7f8ec51acfeb432b0b /dbus/dbus-transport.c | |
| parent | a0a12210e1f5aa5bd185a57d4394b8eb51cbe472 (diff) | |
voc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'dbus/dbus-transport.c')
| -rw-r--r-- | dbus/dbus-transport.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index e155cc46..fd44595f 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -23,6 +23,7 @@ #include "dbus-transport-protected.h" #include "dbus-transport-unix.h" +#include "dbus-transport-socket.h" #include "dbus-connection-internal.h" #include "dbus-watch.h" #include "dbus-auth.h" @@ -655,19 +656,19 @@ _dbus_transport_set_connection (DBusTransport *transport, } /** - * Get the UNIX file descriptor, if any. + * Get the socket file descriptor, if any. * * @param transport the transport * @param fd_p pointer to fill in with the descriptor * @returns #TRUE if a descriptor was available */ dbus_bool_t -_dbus_transport_get_unix_fd (DBusTransport *transport, - int *fd_p) +_dbus_transport_get_socket_fd (DBusTransport *transport, + int *fd_p) { dbus_bool_t retval; - if (transport->vtable->get_unix_fd == NULL) + if (transport->vtable->get_socket_fd == NULL) return FALSE; if (transport->disconnected) @@ -675,8 +676,8 @@ _dbus_transport_get_unix_fd (DBusTransport *transport, _dbus_transport_ref (transport); - retval = (* transport->vtable->get_unix_fd) (transport, - fd_p); + retval = (* transport->vtable->get_socket_fd) (transport, + fd_p); _dbus_transport_unref (transport); |