+2006-09-16 Havoc Pennington <hp@redhat.com>
+
+ * dbus/dbus-sysdeps-unix.h: small change to Peter's patch to make
+ dbus-sysdeps-unix-util.c build, add unix-specific sysdeps header.
+
+ * dbus/dbus-sysdeps.h, dbus-sysdeps-unix.c: patch from Peter
+ Kümmel bug #8249 to make the sysdeps.h read/write/open/close
+ functions specifically for sockets only, and move generic
+ read/write/open/close into unix-specific code.
+
2006-09-14 Havoc Pennington <hp@redhat.com>
* dbus/dbus-transport-unix.c (unix_do_iteration): fix a valgrind
}
bytes = _dbus_string_get_length (&addr);
- if (_dbus_write (print_addr_fd, &addr, 0, bytes) != bytes)
+ if (_dbus_write_socket (print_addr_fd, &addr, 0, bytes) != bytes)
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Printing message bus address: %s\n",
}
if (print_addr_fd > 2)
- _dbus_close (print_addr_fd, NULL);
+ _dbus_close_socket (print_addr_fd, NULL);
_dbus_string_free (&addr);
}
}
bytes = _dbus_string_get_length (&pid);
- if (_dbus_write (print_pid_fd, &pid, 0, bytes) != bytes)
+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Printing message bus PID: %s\n",
}
if (print_pid_fd > 2)
- _dbus_close (print_pid_fd, NULL);
+ _dbus_close_socket (print_pid_fd, NULL);
_dbus_string_free (&pid);
}
#endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
case SIGHUP:
_dbus_string_init_const (&str, "foo");
- if (!_dbus_write (reload_pipe[RELOAD_WRITE_END], &str, 0, 1))
+ if (!_dbus_write_socket (reload_pipe[RELOAD_WRITE_END], &str, 0, 1))
{
_dbus_warn ("Unable to write to reload pipe.\n");
exit (1);
DBusError error;
DBusString str;
_dbus_string_init (&str);
- if (_dbus_read (reload_pipe[RELOAD_READ_END], &str, 1) != 1)
+ if (_dbus_read_socket (reload_pipe[RELOAD_READ_END], &str, 1) != 1)
{
_dbus_warn ("Couldn't read from reload pipe.\n");
exit (1);
dbus-string.h \
dbus-string-private.h \
dbus-sysdeps.c \
- dbus-sysdeps-unix.c \
dbus-sysdeps.h \
+ dbus-sysdeps-unix.c \
+ dbus-sysdeps-unix.h \
dbus-userdb.c \
dbus-userdb.h
NULL, &address);
if (client_transport == NULL)
{
- _dbus_close (client_fd, NULL);
- _dbus_close (server_fd, NULL);
+ _dbus_close_socket (client_fd, NULL);
+ _dbus_close_socket (server_fd, NULL);
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
_dbus_string_free (&address);
return NULL;
if (server_transport == NULL)
{
_dbus_transport_unref (client_transport);
- _dbus_close (server_fd, NULL);
+ _dbus_close_socket (server_fd, NULL);
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return NULL;
}
transport = _dbus_transport_new_for_fd (client_fd, &server->guid_hex, NULL);
if (transport == NULL)
{
- _dbus_close (client_fd, NULL);
+ _dbus_close_socket (client_fd, NULL);
SERVER_UNLOCK (server);
return FALSE;
}
unix_server->watch = NULL;
}
- _dbus_close (unix_server->fd, NULL);
+ _dbus_close_socket (unix_server->fd, NULL);
unix_server->fd = -1;
if (unix_server->socket_name != NULL)
return server;
failed_2:
- _dbus_close (listen_fd, NULL);
+ _dbus_close_socket (listen_fd, NULL);
failed_1:
dbus_free (path_copy);
failed_0:
if (server == NULL)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
- _dbus_close (listen_fd, NULL);
+ _dbus_close_socket (listen_fd, NULL);
_dbus_string_free (&address);
return NULL;
}
* a hangup and then the babysitter will
* quit itself.
*/
- _dbus_close (sitter->socket_to_babysitter, NULL);
+ _dbus_close_socket (sitter->socket_to_babysitter, NULL);
sitter->socket_to_babysitter = -1;
}
if (sitter->error_pipe_from_child >= 0)
{
- _dbus_close (sitter->error_pipe_from_child, NULL);
+ _dbus_close_socket (sitter->error_pipe_from_child, NULL);
sitter->error_pipe_from_child = -1;
}
close_socket_to_babysitter (DBusBabysitter *sitter)
{
_dbus_verbose ("Closing babysitter\n");
- _dbus_close (sitter->socket_to_babysitter, NULL);
+ _dbus_close_socket (sitter->socket_to_babysitter, NULL);
sitter->socket_to_babysitter = -1;
}
close_error_pipe_from_child (DBusBabysitter *sitter)
{
_dbus_verbose ("Closing child error\n");
- _dbus_close (sitter->error_pipe_from_child, NULL);
+ _dbus_close_socket (sitter->error_pipe_from_child, NULL);
sitter->error_pipe_from_child = -1;
}
return -1;
else
{
- ret = _dbus_close (*fd, NULL);
+ ret = _dbus_close_socket (*fd, NULL);
*fd = -1;
}
#include "dbus-internals.h"
#include "dbus-sysdeps.h"
+#include "dbus-sysdeps-unix.h"
#include "dbus-threads.h"
#include "dbus-protocol.h"
#include "dbus-string.h"
* @{
*/
+dbus_bool_t
+_dbus_open_socket (int *fd,
+ int domain,
+ int type,
+ int protocol)
+{
+ *fd = socket (domain, type, protocol);
+ return fd >= 0;
+}
+
+dbus_bool_t
+_dbus_close_socket (int fd,
+ DBusError *error)
+{
+ return _dbus_close (fd, error);
+}
+
+int
+_dbus_read_socket (int fd,
+ DBusString *buffer,
+ int count)
+{
+ return _dbus_read (fd, buffer, count);
+}
+
+int
+_dbus_write_socket (int fd,
+ const DBusString *buffer,
+ int start,
+ int len)
+{
+ return _dbus_write (fd, buffer, start, len);
+}
+
+int
+_dbus_write_socket_two (int fd,
+ const DBusString *buffer1,
+ int start1,
+ int len1,
+ const DBusString *buffer2,
+ int start2,
+ int len2)
+{
+ return _dbus_write_two (fd, buffer1, start1, len1,
+ buffer2, start2, len2);
+}
+
+
/**
* Thin wrapper around the read() system call that appends
* the data it reads to the DBusString buffer. It appends
_dbus_verbose ("connecting to unix socket %s abstract=%d\n",
path, abstract);
- fd = socket (PF_UNIX, SOCK_STREAM, 0);
- if (fd < 0)
+ if (!_dbus_open_socket (&fd, PF_UNIX, SOCK_STREAM, 0))
{
dbus_set_error (error,
_dbus_error_from_errno (errno),
_dbus_verbose ("listening on unix socket %s abstract=%d\n",
path, abstract);
- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
-
- if (listen_fd < 0)
+ if (!_dbus_open_socket (&listen_fd, PF_UNIX, SOCK_STREAM, 0))
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Failed to create socket \"%s\": %s",
struct in_addr *haddr;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
- fd = socket (AF_INET, SOCK_STREAM, 0);
-
- if (fd < 0)
+ if (!_dbus_open_socket (&fd, AF_INET, SOCK_STREAM, 0))
{
dbus_set_error (error,
_dbus_error_from_errno (errno),
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
- listen_fd = socket (AF_INET, SOCK_STREAM, 0);
- if (listen_fd < 0)
+ if (!_dbus_open_socket (&listen_fd, AF_INET, SOCK_STREAM, 0))
{
dbus_set_error (error, _dbus_error_from_errno (errno),
"Failed to create socket \"%s:%d\": %s",
*
*/
#include "dbus-sysdeps.h"
+#include "dbus-sysdeps-unix.h"
#include "dbus-internals.h"
#include "dbus-protocol.h"
#include "dbus-string.h"
}
bytes = _dbus_string_get_length (&pid);
- if (_dbus_write (print_pid_fd, &pid, 0, bytes) != bytes)
+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Printing message bus PID: %s\n",
dbus_bool_t _dbus_setenv (const char *varname,
const char *value);
-int _dbus_read (int fd,
- DBusString *buffer,
- int count);
-int _dbus_write (int fd,
- const DBusString *buffer,
- int start,
- int len);
-int _dbus_write_two (int fd,
- const DBusString *buffer1,
- int start1,
- int len1,
- const DBusString *buffer2,
- int start2,
- int len2);
typedef unsigned long dbus_pid_t;
typedef unsigned long dbus_uid_t;
#define DBUS_UID_FORMAT "%lu"
#define DBUS_GID_FORMAT "%lu"
+
/**
- * Struct representing socket credentials
+ * Socket interface
+ *
+ * @todo Use for the file descriptors a struct
+ * - struct DBusSocket{ int d; }; -
+ * instead of int to get type-safety which
+ * will be checked by the compiler.
+ *
*/
-typedef struct
-{
- dbus_pid_t pid; /**< process ID or DBUS_PID_UNSET */
- dbus_uid_t uid; /**< user ID or DBUS_UID_UNSET */
- dbus_gid_t gid; /**< group ID or DBUS_GID_UNSET */
-} DBusCredentials;
+
+dbus_bool_t _dbus_open_socket (int *fd,
+ int domain,
+ int type,
+ int protocol);
+dbus_bool_t _dbus_close_socket (int fd,
+ DBusError *error);
+int _dbus_read_socket (int fd,
+ DBusString *buffer,
+ int count);
+int _dbus_write_socket (int fd,
+ const DBusString *buffer,
+ int start,
+ int len);
+int _dbus_write_socket_two (int fd,
+ const DBusString *buffer1,
+ int start1,
+ int len1,
+ const DBusString *buffer2,
+ int start2,
+ int len2);
+
+
int _dbus_connect_unix_socket (const char *path,
dbus_bool_t abstract,
DBusError *error);
int _dbus_accept (int listen_fd);
+/**
+ * Struct representing socket credentials
+ */
+typedef struct
+{
+ dbus_pid_t pid; /**< process ID or DBUS_PID_UNSET */
+ dbus_uid_t uid; /**< user ID or DBUS_UID_UNSET */
+ dbus_gid_t gid; /**< group ID or DBUS_GID_UNSET */
+} DBusCredentials;
+
dbus_bool_t _dbus_read_credentials_unix_socket (int client_fd,
DBusCredentials *credentials,
DBusError *error);
void _dbus_get_current_time (long *tv_sec,
long *tv_usec);
-
+/**
+ * File/directory interface
+ */
+dbus_bool_t _dbus_file_exists (const char *file);
dbus_bool_t _dbus_file_get_contents (DBusString *str,
const DBusString *filename,
DBusError *error);
dbus_bool_t _dbus_check_dir_is_private_to_user (DBusString *dir,
DBusError *error);
+void _dbus_fd_set_close_on_exec (int fd);
+
+const char* _dbus_get_tmpdir (void);
+
+/**
+ * Random numbers
+ */
void _dbus_generate_pseudorandom_bytes_buffer (char *buffer,
int n_bytes);
void _dbus_generate_random_bytes_buffer (char *buffer,
void _dbus_disable_sigpipe (void);
-void _dbus_fd_set_close_on_exec (int fd);
void _dbus_exit (int code) _DBUS_GNUC_NORETURN;
int *fd2,
dbus_bool_t blocking,
DBusError *error);
-dbus_bool_t _dbus_close (int fd,
- DBusError *error);
void _dbus_print_backtrace (void);
void _dbus_set_signal_handler (int sig,
DBusSignalHandler handler);
-dbus_bool_t _dbus_file_exists (const char *file);
dbus_bool_t _dbus_user_at_console (const char *username,
DBusError *error);
-const char* _dbus_get_tmpdir (void);
/* Define DBUS_VA_COPY() to do the right thing for copying va_list variables.
* config.h may have already defined DBUS_VA_COPY as va_copy or __va_copy.
_dbus_auth_get_buffer (transport->auth, &buffer);
- bytes_read = _dbus_read (unix_transport->fd,
- buffer, unix_transport->max_bytes_read_per_iteration);
+ bytes_read = _dbus_read_socket (unix_transport->fd,
+ buffer, unix_transport->max_bytes_read_per_iteration);
_dbus_auth_return_buffer (transport->auth, buffer,
bytes_read > 0 ? bytes_read : 0);
&buffer))
return FALSE;
- bytes_written = _dbus_write (unix_transport->fd,
- buffer,
- 0, _dbus_string_get_length (buffer));
+ bytes_written = _dbus_write_socket (unix_transport->fd,
+ buffer,
+ 0, _dbus_string_get_length (buffer));
if (bytes_written > 0)
{
#endif
bytes_written =
- _dbus_write (unix_transport->fd,
- &unix_transport->encoded_outgoing,
- unix_transport->message_bytes_written,
- total_bytes_to_write - unix_transport->message_bytes_written);
+ _dbus_write_socket (unix_transport->fd,
+ &unix_transport->encoded_outgoing,
+ unix_transport->message_bytes_written,
+ total_bytes_to_write - unix_transport->message_bytes_written);
}
else
{
if (unix_transport->message_bytes_written < header_len)
{
bytes_written =
- _dbus_write_two (unix_transport->fd,
- header,
- unix_transport->message_bytes_written,
- header_len - unix_transport->message_bytes_written,
- body,
- 0, body_len);
+ _dbus_write_socket_two (unix_transport->fd,
+ header,
+ unix_transport->message_bytes_written,
+ header_len - unix_transport->message_bytes_written,
+ body,
+ 0, body_len);
}
else
{
bytes_written =
- _dbus_write (unix_transport->fd,
- body,
- (unix_transport->message_bytes_written - header_len),
- body_len -
- (unix_transport->message_bytes_written - header_len));
+ _dbus_write_socket (unix_transport->fd,
+ body,
+ (unix_transport->message_bytes_written - header_len),
+ body_len -
+ (unix_transport->message_bytes_written - header_len));
}
}
if (_dbus_string_get_length (&unix_transport->encoded_incoming) > 0)
bytes_read = _dbus_string_get_length (&unix_transport->encoded_incoming);
else
- bytes_read = _dbus_read (unix_transport->fd,
- &unix_transport->encoded_incoming,
- unix_transport->max_bytes_read_per_iteration);
+ bytes_read = _dbus_read_socket (unix_transport->fd,
+ &unix_transport->encoded_incoming,
+ unix_transport->max_bytes_read_per_iteration);
_dbus_assert (_dbus_string_get_length (&unix_transport->encoded_incoming) ==
bytes_read);
_dbus_message_loader_get_buffer (transport->loader,
&buffer);
- bytes_read = _dbus_read (unix_transport->fd,
- buffer, unix_transport->max_bytes_read_per_iteration);
+ bytes_read = _dbus_read_socket (unix_transport->fd,
+ buffer, unix_transport->max_bytes_read_per_iteration);
_dbus_message_loader_return_buffer (transport->loader,
buffer,
free_watches (transport);
- _dbus_close (unix_transport->fd, NULL);
+ _dbus_close_socket (unix_transport->fd, NULL);
unix_transport->fd = -1;
}
return transport;
failed_1:
- _dbus_close (fd, NULL);
+ _dbus_close_socket (fd, NULL);
failed_0:
_dbus_string_free (&address);
return NULL;
if (transport == NULL)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
- _dbus_close (fd, NULL);
+ _dbus_close_socket (fd, NULL);
_dbus_string_free (&address);
fd = -1;
}
projects / platform / upstream / dbus.git / commitdiff