Changeset 537d9b9 for protocols/jabber/si.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• protocols/jabber/si.c (modified) (3 diffs)

protocols/jabber/si.c

@@ -393 +393 @@
         struct jabber_transfer *tf = NULL;
         struct jabber_data *jd = ic->proto_data;
+        struct jabber_error *err;
 
         if (!(tgt_jid = xt_find_attr(node, "from")) ||
-            !(ini_jid = xt_find_attr(node, "to"))) {
+            !(ini_jid = xt_find_attr(node, "to")) ||
+            !(iq_id   = xt_find_attr(node, "id"))) {
                 imcb_log(ic, "Invalid SI response from=%s to=%s", tgt_jid, ini_jid);
+                return XT_HANDLED;
+        }
+
+        /* Let's see if we can find out what this bytestream should be for... */
+
+        for (tflist = jd->filetransfers; tflist; tflist = g_slist_next(tflist)) {
+                struct jabber_transfer *tft = tflist->data;
+                if ((strcmp(tft->iq_id, iq_id) == 0)) {
+                        tf = tft;
+                        break;
+                }
+        }
+
+        if (!tf) {
+                imcb_log(ic, "WARNING: Received bytestream request from %s that doesn't match an SI request", ini_jid);
+                return XT_HANDLED;
+        }
+
+        err = jabber_error_parse(xt_find_node(node->children, "error"), XMLNS_STANZA_ERROR);
+
+        if (err) {
+                if (g_strcmp0(err->code, "forbidden") == 0) {
+                        imcb_log(ic, "File %s: %s rejected the transfer", tf->ft->file_name, tgt_jid);
+                } else {
+                        imcb_log(ic, "Error: Stream initiation request failed: %s (%s)", err->code, err->text);
+                }
+                imcb_file_canceled(ic, tf->ft, "Stream initiation request failed");
+                jabber_error_free(err);
                 return XT_HANDLED;
         }
@@ -409 +439 @@
          *                                      <value>
          */
-        if (!(tgt_jid = xt_find_attr(node, "from")) ||
-            !(ini_jid = xt_find_attr(node, "to")) ||
-            !(iq_id   = xt_find_attr(node, "id")) ||
-            !(c = xt_find_node(node->children, "si")) ||
+        if (!(c = xt_find_node(node->children, "si")) ||
             !(cmp = xt_find_attr(c, "xmlns")) ||
             !(strcmp(cmp, XMLNS_SI) == 0) ||
@@ -439 +466 @@
         }
 
-        /* Let's see if we can find out what this bytestream should be for... */
-
-        for (tflist = jd->filetransfers; tflist; tflist = g_slist_next(tflist)) {
-                struct jabber_transfer *tft = tflist->data;
-                if ((strcmp(tft->iq_id, iq_id) == 0)) {
-                        tf = tft;
-                        break;
-                }
-        }
-
-        if (!tf) {
-                imcb_log(ic, "WARNING: Received bytestream request from %s that doesn't match an SI request", ini_jid);
-                return XT_HANDLED;
-        }
-
         tf->ini_jid = g_strdup(ini_jid);
         tf->tgt_jid = g_strdup(tgt_jid);