telepathy-idle: TLSManager: treat unhandled channels as rejected.

Simon McVittie smcv at kemper.freedesktop.org
Wed May 1 09:01:42 PDT 2013


Module: telepathy-idle
Branch: master
Commit: af34b5de9f32289a73af3e90d68f776d7166f7dd
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=af34b5de9f32289a73af3e90d68f776d7166f7dd

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Mon Apr 29 16:56:46 2013 +0100

TLSManager: treat unhandled channels as rejected.

This was incorrectly adapted from the Gabble code.

---

 src/server-tls-manager.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
index 5073c82..b14cecd 100644
--- a/src/server-tls-manager.c
+++ b/src/server-tls-manager.c
@@ -164,6 +164,12 @@ server_tls_channel_closed_cb (IdleServerTLSChannel *channel,
 
   if (channel == self->priv->channel)
     {
+      IDLE_DEBUG ("Channel closed before being handled. Failing verification");
+
+      g_simple_async_result_set_error (self->priv->async_result,
+          IDLE_SERVER_TLS_ERROR, 0, "TLS verification channel closed");
+
+      self->priv->channel = NULL;
       complete_verify (self);
     }
   else



More information about the telepathy-commits mailing list