Attachment 110753 Details for Bug 46700 – Gabble patch against master

[patch] Gabble patch against master

0001-Report-unacked-stanzas-when-closing-the-connection.patch (text/plain), 2.09 KB, created by Ferdinand Stehle on 2014-12-11 20:04:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ferdinand Stehle

Created: 2014-12-11 20:04:10 UTC

Size: 2.09 KB

patch

obsolete

>From 1e4db2141966b7bb0b713350434a882cfac13e5d Mon Sep 17 00:00:00 2001
>From: Ferdinand Stehle <development@kondorgulasch.de>
>Date: Thu, 11 Dec 2014 13:49:09 +0100
>Subject: [PATCH] Report unacked stanzas when closing the connection
>
>---
> src/im-factory.c | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+), 0 deletions(-)
>
>diff --git a/src/im-factory.c b/src/im-factory.c
>index 4170d10..d0936c1 100644
>--- a/src/im-factory.c
>+++ b/src/im-factory.c
>@@ -450,9 +450,48 @@ get_channel_for_incoming_message (
>     return NULL;
> }
> 
>+/**
>+ * gabble_im_factory_report_unacked:
>+ *
>+ * @brief reports failed delivery for each unacked stanza
>+ *
>+ * Pops unacked stanzas from the stream management queue and reports failed delivery.
>+ */
>+static void gabble_im_factory_report_unacked(GabbleImFactory *self)
>+{
>+  WockyStanza      *stanza = NULL;
>+  WockyC2SPorter   *porter = WOCKY_C2S_PORTER (gabble_connection_dup_porter (self->priv->conn));
>+
>+  DEBUG ("Check for unacked stanzas");
>+
>+  while ((stanza = wocky_c2s_porter_pop_unacked_stanzas(porter)) != NULL)
>+  {
>+    const char* id = wocky_node_get_attribute (wocky_stanza_get_top_node (stanza), "id");
>+    const char* to = wocky_node_get_attribute (wocky_stanza_get_top_node (stanza), "to");
>+
>+    if ((id != NULL) && (to != NULL))
>+    {
>+      GabbleIMChannel *channel = get_channel_for_incoming_message (self, to, FALSE);
>+      if (channel != NULL)
>+      {
>+		/* Found channel and report permanently failed delivery */
>+        _gabble_im_channel_report_delivery (channel,
>+            TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL, 0, id, NULL,
>+            GABBLE_TEXT_CHANNEL_SEND_NO_ERROR, TP_DELIVERY_STATUS_PERMANENTLY_FAILED);
>+      }
>+      else
>+        g_warning ("no existing channel with '%s'; ignoring", to);
>+    }
>+  }
>+
>+  g_object_unref (porter);
>+}
>+
> static void
> gabble_im_factory_close_all (GabbleImFactory *self)
> {
>+  gabble_im_factory_report_unacked(self);
>+
>   /* Use a temporary variable (the macro does this) because we don't want
>    * im_channel_closed_cb to remove the channel from the hash table a
>    * second time */
>--
>libgit2 0.21.0
>

Actions: View | Splinter Review

Attachments on bug 46700: 108321 | 108322 | 108461 | 110749 | 110753 | 111628 | 121565

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.