Changeset 0fbd3a6d for protocols/jabber/si.c

Timestamp:

2007-12-19T00:24:32Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

1ba7e8f

Parents:

793cc25 (diff), 2379566 (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:

Now with sending via a proxy. The proxy is automatically discovered from your
jabber server.

Also merged in revs 279..288 from upstream (e.g. PING)

File:

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

protocols/jabber/si.c

@@ -83 +83 @@
         struct jabber_transfer *tf;
         struct jabber_data *jd = ic->proto_data;
+        char *server  = jd->server;
 
         imcb_log( ic, "Trying to send %s(%zd bytes) to %s", ft->file_name, ft->file_size, who );
@@ -97 +98 @@
         jd->filetransfers = g_slist_prepend( jd->filetransfers, tf );
 
+        /* query the buddy's features */
+        jabber_iq_query_features( ic, who );
+
+        /* query proxies from the server */
+        if( !jd->have_streamhosts )
+                jabber_iq_query_server( ic, server, XMLNS_DISCO_ITEMS );
+
+        /* send the request to our buddy */
         jabber_si_send_request( ic, who, tf );
 
+        /* and start the receive logic */
         imcb_file_recv_start( ft );
 }