fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* dbus/dbus-sysdeps.c: Make tcp socket connection error somewhat more

Browse source 
clear:
  "Failed to connect to socket <host>:<port> <error>" instead of
  "Failed to connect to socket <host>: <error>:<port>"

  * dbus/dbus-transport-unix.c: Fix crash when no host option is given
  for a tcp transport.
This commit is contained in:
Sjoerd Simons 2006-05-30 15:34:10 +00:00
parent 26ab02e916
commit 435c7af9b6
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-05-30 Sjoerd Simons <sjoerd@luon.net>
* dbus/dbus-sysdeps.c: Make tcp socket connection error somewhat more
clear:
"Failed to connect to socket <host>:<port> <error>" instead of
"Failed to connect to socket <host>: <error>:<port>"
* dbus/dbus-transport-unix.c: Fix crash when no host option is given
for a tcp transport.
2006-05-29 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/*: Update the QtDBus bindings up to revision 546310 in

4
dbus/dbus-sysdeps.c
View file

@ -678,8 +678,8 @@ _dbus_connect_tcp_socket (const char *host,
{
dbus_set_error (error,
_dbus_error_from_errno (errno),
"Failed to connect to socket %s: %s:%d",
host, _dbus_strerror (errno), port);
"Failed to connect to socket %s:%d %s",
host, port, _dbus_strerror (errno));
close (fd);
fd = -1;

25
dbus/dbus-transport-unix.c
View file

@ -1272,16 +1272,18 @@ _dbus_transport_new_for_tcp_socket (const char *host,
return NULL;
}
if (!_dbus_string_append (&address, "tcp:host=") ||
!_dbus_string_append (&address, host) ||
!_dbus_string_append (&address, ",port=") ||
if (!_dbus_string_append (&address, "tcp:"))
goto error;
if (host != NULL &&
(!_dbus_string_append (&address, "host=") ||
!_dbus_string_append (&address, host)))
goto error;
if (!_dbus_string_append (&address, ",port=") ||
!_dbus_string_append_int (&address, port))
{
_dbus_string_free (&address);
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return NULL;
}
goto error;
fd = _dbus_connect_tcp_socket (host, port, error);
if (fd < 0)
{
@ -1307,6 +1309,11 @@ _dbus_transport_new_for_tcp_socket (const char *host,
_dbus_string_free (&address);
return transport;
error:
_dbus_string_free (&address);
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return NULL;
}
/** @} */