diff options
| author | fiaxh <git@lightrise.org> | 2019-06-01 18:48:58 +0200 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2019-06-01 19:03:01 +0200 |
| commit | 8120203d62f52315f04364e70b3ac6beefe043de (patch) | |
| tree | c994364641429f50ae36b3e68bb5811326fcd488 /xmpp-vala | |
| parent | 8aab18c1ec37fd427e2dcaa2ee37be8467d15d16 (diff) | |
| download | dino-8120203d62f52315f04364e70b3ac6beefe043de.tar.gz dino-8120203d62f52315f04364e70b3ac6beefe043de.zip | |
Don't set timeouts on registration connection attempts
Diffstat (limited to 'xmpp-vala')
| -rw-r--r-- | xmpp-vala/src/core/xmpp_stream.vala | 5 | ||||
| -rw-r--r-- | xmpp-vala/src/module/xep/0368_srv_records_tls.vala | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/xmpp-vala/src/core/xmpp_stream.vala b/xmpp-vala/src/core/xmpp_stream.vala index aff0b216..4bf6e0db 100644 --- a/xmpp-vala/src/core/xmpp_stream.vala +++ b/xmpp-vala/src/core/xmpp_stream.vala @@ -60,6 +60,7 @@ public class XmppStream { stream = yield best_provider.connect(this); } if (stream == null) { + debug("Connecting to %s, xmpp-client, tcp (fallback)", this.remote_name.to_string()); stream = yield (new SocketClient()).connect_async(new NetworkService("xmpp-client", "tcp", this.remote_name.to_string())); } if (stream == null) { @@ -67,9 +68,10 @@ public class XmppStream { } reset_stream((!)stream); } catch (Error e) { - debug("[%p] Could not connect to server", this); + debug("[%p] Could not connect to server: %s", this, e.message); throw new IOStreamError.CONNECT(e.message); } + debug("Connected to %s", remote_name); yield loop(); } @@ -379,6 +381,7 @@ public class StartTlsConnectionProvider : ConnectionProvider { public async override IOStream? connect(XmppStream stream) { try { SocketClient client = new SocketClient(); + debug("Connecting to %s %i (starttls)", srv_target.get_hostname(), srv_target.get_port()); return yield client.connect_to_host_async(srv_target.get_hostname(), srv_target.get_port()); } catch (Error e) { return null; diff --git a/xmpp-vala/src/module/xep/0368_srv_records_tls.vala b/xmpp-vala/src/module/xep/0368_srv_records_tls.vala index a40d0bb5..3d0708fb 100644 --- a/xmpp-vala/src/module/xep/0368_srv_records_tls.vala +++ b/xmpp-vala/src/module/xep/0368_srv_records_tls.vala @@ -36,6 +36,7 @@ public class TlsConnectionProvider : ConnectionProvider { public async override IOStream? connect(XmppStream stream) { SocketClient client = new SocketClient(); try { + debug("Connecting to %s %i (tls)", srv_target.get_hostname(), srv_target.get_port()); IOStream? io_stream = yield client.connect_to_host_async(srv_target.get_hostname(), srv_target.get_port()); TlsConnection tls_connection = TlsClientConnection.new(io_stream, new NetworkAddress(stream.remote_name.to_string(), srv_target.get_port())); tls_connection.accept_certificate.connect(stream.get_module(Tls.Module.IDENTITY).on_invalid_certificate); |