* dbus/dbus-sysdeps-unix.c (_dbus_open_tcp_socket)
(_dbus_open_unix_socket, _dbus_open_socket): change API for
_dbus_open_socket so the domain/type/protocol from system headers
are not required. This is kind of pointless though unless we move
part of _dbus_connect_tcp_socket into sysdeps.c instead of
sysdeps-unix.c, which would mean adding a wrapper around
bind/listen/etc.
Also, add DBusError to the socket-opening functions so they
don't require use of errno.
2006-09-16 Havoc Pennington <hp@redhat.com>
2006-09-16 Havoc Pennington <hp@redhat.com>
+ * dbus/dbus-sysdeps-unix.c (_dbus_open_tcp_socket)
+ (_dbus_open_unix_socket, _dbus_open_socket): change API for
+ _dbus_open_socket so the domain/type/protocol from system headers
+ are not required. This is kind of pointless though unless we move
+ part of _dbus_connect_tcp_socket into sysdeps.c instead of
+ sysdeps-unix.c, which would mean adding a wrapper around
+ bind/listen/etc.
+ Also, add DBusError to the socket-opening functions so they
+ don't require use of errno.
+
+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-unix.h: small change to Peter's patch to make
dbus-sysdeps-unix-util.c build, add unix-specific sysdeps header.
_dbus_open_socket (int *fd,
int domain,
int type,
_dbus_open_socket (int *fd,
int domain,
int type,
+ int protocol,
+ DBusError *error)
{
*fd = socket (domain, type, protocol);
{
*fd = socket (domain, type, protocol);
+ if (fd >= 0)
+ {
+ return TRUE;
+ }
+ else
+ {
+ dbus_set_error(error,
+ _dbus_error_from_errno (errno),
+ "Failed to open socket: %s",
+ _dbus_strerror (errno));
+ return FALSE;
+ }
+}
+
+dbus_bool_t
+_dbus_open_tcp_socket (int *fd,
+ DBusError *error)
+{
+ return _dbus_open_socket(fd, AF_INET, SOCK_STREAM, 0, error);
+}
+
+dbus_bool_t
+_dbus_open_unix_socket (int *fd,
+ DBusError *error)
+{
+ return _dbus_open_socket(fd, PF_UNIX, SOCK_STREAM, 0, error);
- if (!_dbus_open_socket (&fd, PF_UNIX, SOCK_STREAM, 0))
+ if (!_dbus_open_unix_socket (&fd, error))
- dbus_set_error (error,
- _dbus_error_from_errno (errno),
- "Failed to create socket: %s",
- _dbus_strerror (errno));
-
+ _DBUS_ASSERT_ERROR_IS_SET(error);
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
_DBUS_ZERO (addr);
addr.sun_family = AF_UNIX;
_DBUS_ZERO (addr);
addr.sun_family = AF_UNIX;
_dbus_verbose ("listening on unix socket %s abstract=%d\n",
path, abstract);
_dbus_verbose ("listening on unix socket %s abstract=%d\n",
path, abstract);
- if (!_dbus_open_socket (&listen_fd, PF_UNIX, SOCK_STREAM, 0))
+ if (!_dbus_open_unix_socket (&listen_fd, error))
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to create socket \"%s\": %s",
- path, _dbus_strerror (errno));
+ _DBUS_ASSERT_ERROR_IS_SET(error);
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
_DBUS_ZERO (addr);
addr.sun_family = AF_UNIX;
_DBUS_ZERO (addr);
addr.sun_family = AF_UNIX;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
- if (!_dbus_open_socket (&fd, AF_INET, SOCK_STREAM, 0))
+ if (!_dbus_open_tcp_socket (&fd, error))
- dbus_set_error (error,
- _dbus_error_from_errno (errno),
- "Failed to create socket: %s",
- _dbus_strerror (errno));
+ _DBUS_ASSERT_ERROR_IS_SET(error);
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
+
if (host == NULL)
host = "localhost";
if (host == NULL)
host = "localhost";
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
- if (!_dbus_open_socket (&listen_fd, AF_INET, SOCK_STREAM, 0))
+ if (!_dbus_open_tcp_socket (&listen_fd, error))
- dbus_set_error (error, _dbus_error_from_errno (errno),
- "Failed to create socket \"%s:%d\": %s",
- host, port, _dbus_strerror (errno));
+ _DBUS_ASSERT_ERROR_IS_SET(error);
+ _DBUS_ASSERT_ERROR_IS_CLEAR(error);
he = gethostbyname (host);
if (he == NULL)
he = gethostbyname (host);
if (he == NULL)
-dbus_bool_t _dbus_open_socket (int *fd,
- int domain,
- int type,
- int protocol);
+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,
dbus_bool_t _dbus_close_socket (int fd,
DBusError *error);
int _dbus_read_socket (int fd,