#include "dbus-transport-protected.h"
#include "dbus-watch.h"
#include "dbus-credentials.h"
-#include <stdio.h> //todo to remove
-
/**
* @defgroup DBusTransportSocket DBusTransport implementations for sockets
_dbus_transport_ref (transport);
- if (_dbus_transport_get_is_authenticated (transport))
+ if (_dbus_transport_try_to_authenticate (transport))
needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection);
else
{
_dbus_transport_ref (transport);
- if (_dbus_transport_get_is_authenticated (transport))
+ if (_dbus_transport_try_to_authenticate (transport))
need_read_watch =
(_dbus_counter_get_size_value (transport->live_messages) < transport->max_live_messages_size) &&
(_dbus_counter_get_unix_fd_value (transport->live_messages) < transport->max_live_messages_unix_fds);
oom = FALSE;
- orig_auth_state = _dbus_transport_get_is_authenticated (transport);
+ orig_auth_state = _dbus_transport_try_to_authenticate (transport);
/* This is essential to avoid the check_write_watch() at the end,
* we don't want to add a write watch in do_iteration before
_dbus_transport_ref (transport);
- while (!_dbus_transport_get_is_authenticated (transport) &&
+ while (!_dbus_transport_try_to_authenticate (transport) &&
_dbus_transport_get_is_connected (transport))
{
if (!exchange_credentials (transport, do_reading, do_writing))
out:
if (auth_completed)
- *auth_completed = (orig_auth_state != _dbus_transport_get_is_authenticated (transport));
+ *auth_completed = (orig_auth_state != _dbus_transport_try_to_authenticate (transport));
check_read_watch (transport);
check_write_watch (transport);
dbus_bool_t oom;
/* No messages without authentication! */
- if (!_dbus_transport_get_is_authenticated (transport))
+ if (!_dbus_transport_try_to_authenticate (transport))
{
_dbus_verbose ("Not authenticated, not writing anything\n");
return TRUE;
int header_len, body_len;
int total_bytes_to_write;
-// int i;
-
if (total > socket_transport->max_bytes_written_per_iteration)
{
_dbus_verbose ("%d bytes exceeds %d bytes written per iteration, returning\n",
header_len = _dbus_string_get_length (header);
body_len = _dbus_string_get_length (body);
- /* fprintf (stderr, "\nheader:\n"); //todo for test - to remove together wit int i declaration above
- for(i=0; i < header_len; i++)
- {
- fprintf (stderr, "%02x", _dbus_string_get_byte(header,i));
- }
- fprintf (stderr,"\n");
- for(i=0; i < header_len; i++)
- {
- fprintf (stderr, "%c", _dbus_string_get_byte(header,i));
- }
- fprintf (stderr, "\nret size: %u, i: %u\n", header_len, i);
-
-
- fprintf (stderr, "\nbody:\n");
- for(i=0; i < body_len; i++)
- {
- fprintf (stderr, "%02x", _dbus_string_get_byte(body,i));
- }
- fprintf (stderr, "\nret size: %u, i: %u\n", body_len, i);
- fprintf (stderr,"\n");
- for(i=0; i < body_len; i++)
- {
- fprintf (stderr, "%c", _dbus_string_get_byte(body,i));
- }
- fprintf (stderr, "\nret size: %u, i: %u\n", body_len, i);*/
-
if (_dbus_auth_needs_encoding (transport->auth))
{
/* Does fd passing even make sense with encoded data? */
_dbus_verbose ("fd = %d\n",socket_transport->fd);
/* No messages without authentication! */
- if (!_dbus_transport_get_is_authenticated (transport))
+ if (!_dbus_transport_try_to_authenticate (transport))
return TRUE;
oom = FALSE;
poll_fd.fd = socket_transport->fd;
poll_fd.events = 0;
- if (_dbus_transport_get_is_authenticated (transport))
+ if (_dbus_transport_try_to_authenticate (transport))
{
/* This is kind of a hack; if we have stuff to write, then try
* to avoid the poll. This is probably about a 5% speedup on an
* @param host the host to connect to
* @param port the port to connect to
* @param family the address family to connect to
- * @param path to nonce file
+ * @param noncefile path to nonce file
* @param error location to store reason for failure.
* @returns a new transport, or #NULL on failure.
*/