diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-10 08:04:39 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-10 08:04:39 +0000 |
| commit | f3fd4d60ad5de9f0c6576f6e100f944792fed255 (patch) | |
| tree | b2abe52ed1e403466996f9e14657770521647d4a /dbus/dbus-server-socket.c | |
| parent | 4350f5798e50e25729f7f2db21999870026977dc (diff) | |
* dbus/dbus-sysdeps.h (_dbus_listen_tcp_socket): changed type or port to pointer, because the port is given back.
* dbus/dbus-server-socket.c (_dbus_server_new_for_tcp_socket): implemented returning tcp port. Skipping port parameter and non integer port values in config <listen> statement needs more effort.
* dbus/dbus-sysdeps-unix.c, dbus/dbus-sysdeps-win.c (_dbus_listen_tcp_socket): return the real used tcp port.
* bus/dbus-daemon.1.in: added <listen> tcp examples
Diffstat (limited to 'dbus/dbus-server-socket.c')
| -rw-r--r-- | dbus/dbus-server-socket.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index 5c11e145..3a0da35f 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -323,6 +323,9 @@ _dbus_server_new_for_tcp_socket (const char *host, if (host == NULL) host = "localhost"; + + listen_fd = _dbus_listen_tcp_socket (host, &port, error); + _dbus_fd_set_close_on_exec (listen_fd); _dbus_string_init_const (&host_str, host); if (!_dbus_string_append (&address, "tcp:host=") || @@ -334,9 +337,7 @@ _dbus_server_new_for_tcp_socket (const char *host, dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); return NULL; } - - listen_fd = _dbus_listen_tcp_socket (host, port, error); - _dbus_fd_set_close_on_exec (listen_fd); + if (listen_fd < 0) { @@ -401,7 +402,7 @@ _dbus_server_listen_socket (DBusAddressEntry *entry, sresult = _dbus_string_parse_int (&str, 0, &lport, NULL); _dbus_string_free (&str); - if (sresult == FALSE || lport <= 0 || lport > 65535) + if (sresult == FALSE || lport < 0 || lport > 65535) { _dbus_set_bad_address(error, NULL, NULL, "Port is not an integer between 0 and 65535"); |