Changeset 8a90001 for protocols/jabber/si.c

Timestamp:

2008-07-22T12:37:49Z (15 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

4ac647d

Parents:

9afeefa

Message:

Added an account setting 'proxy'.

Note that this is only used for sending. The default <local>;<auto> means let
the receiver try a direct connection first and then the proxy discovered from
the server (if any). If you know you're firewalled you can remove the <local>.
If you want to provide your own proxy try something like
"<local>;JID,HOST,PORT". E.g.
"<local>;proxy.somewhere.org,123.123.123.123,7777".

File:

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

protocols/jabber/si.c

@@ -39 +39 @@
         jd->filetransfers = g_slist_remove( jd->filetransfers, tf );
 
-        if( tf->fd )
+        if( tf->fd != -1 )
         {
                 close( tf->fd );
-                tf->fd = 0;
+                tf->fd = -1;
         }
 
@@ -129 +129 @@
 
         if( tf->bud->features && jd->have_streamhosts==1 ) {
+                tf->disco_timeout = 0;
                 jabber_si_transfer_start( tf );
-                tf->disco_timeout = 0;
                 return FALSE;
         }
@@ -139 +139 @@
         
         if( !tf->bud->features && jd->have_streamhosts!=1 )
-                imcb_file_canceled( tf->ft, "Couldn't get buddy's features or the server's" );
+                imcb_log( tf->ic, "Couldn't get buddy's features nor discover all services of the server" );
         else if( !tf->bud->features )
-                imcb_file_canceled( tf->ft, "Couldn't get buddy's features" );
+                imcb_log( tf->ic, "Couldn't get buddy's features" );
         else
-                imcb_file_canceled( tf->ft, "Couldn't get server's features" );
+                imcb_log( tf->ic, "Couldn't discover some of the server's services" );
         
         tf->disco_timeout = 0;
+        jabber_si_transfer_start( tf );
         return FALSE;
 }
@@ -173 +174 @@
         tf->ic = ic;
         tf->ft = ft;
+        tf->fd = -1;
         tf->ft->data = tf;
         tf->ft->free = jabber_si_free_transfer;
@@ -186 +188 @@
                 jabber_iq_query_features( ic, bud->full_jid );
 
-        if( jd->have_streamhosts!=1 ) {
+        /* If <auto> is not set don't check for proxies */
+        if( ( jd->have_streamhosts!=1 ) && ( jd->streamhosts==NULL ) &&
+            ( strstr( set_getstr( &ic->acc->set, "proxy" ), "<auto>" ) != NULL ) ) {
                 jd->have_streamhosts = 0;
                 jabber_iq_query_server( ic, server, XMLNS_DISCO_ITEMS );
-        }
+        } else if ( jd->streamhosts!=NULL )
+                jd->have_streamhosts = 1;
 
         /* if we had to do a query, wait for the result. 
@@ -309 +314 @@
         tf->ic = ic;
         tf->ft = ft;
+        tf->fd = -1;
         tf->ft->data = tf;
         tf->ft->accept = jabber_si_answer_request;