Changeset 2625d6d

Timestamp:

2008-02-20T20:55:38Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

6cac643

Parents:

506e61b

Message:

some fixes related to connection timeout

File:

• protocols/jabber/s5bytestream.c (modified) (5 diffs)

protocols/jabber/s5bytestream.c

@@ -101 +101 @@
         jabber_streamhost_t *sh;
 
+        if ( bt->connect_timeout )
+        {
+                b_event_remove( bt->connect_timeout );
+                bt->connect_timeout = 0;
+        }
+
         if ( tf->watch_in )
                 b_event_remove( tf->watch_in );
@@ -348 +354 @@
         short revents;
 
-        if ( !jabber_bs_poll( bt, fd, &revents ) )
+        if ( ( fd != 0 ) && !jabber_bs_poll( bt, fd, &revents ) )
                 return FALSE;
         
@@ -724 +730 @@
         } else
         {
-                /* using a proxy */
+                /* using a proxy, abort listen */
+
+                closesocket( tf->fd );
+                tf->fd = 0;
+
+                if ( bt->connect_timeout )
+                {
+                        b_event_remove( bt->connect_timeout );
+                        bt->connect_timeout = 0;
+                }
+
                 GSList *shlist;
                 for( shlist = jd->streamhosts ; shlist ; shlist = g_slist_next( shlist ) )
@@ -888 +904 @@
 {
         struct jabber_transfer *tf = bt->tf;
+        struct jabber_data *jd = tf->ic->proto_data;
 
         /* TODO: did the receiver get here somehow??? */
@@ -894 +911 @@
                   error );
 
-        imcb_file_canceled( tf->ft, error );
+        if( jd->streamhosts==NULL ) /* we're done here unless we have a proxy to try */
+                imcb_file_canceled( tf->ft, error );
 
         return FALSE;