- Timestamp:
- 2008-02-20T20:55:38Z (17 years ago)
- Branches:
- master
- Children:
- 6cac643
- Parents:
- 506e61b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/s5bytestream.c
r506e61b r2625d6d 101 101 jabber_streamhost_t *sh; 102 102 103 if ( bt->connect_timeout ) 104 { 105 b_event_remove( bt->connect_timeout ); 106 bt->connect_timeout = 0; 107 } 108 103 109 if ( tf->watch_in ) 104 110 b_event_remove( tf->watch_in ); … … 348 354 short revents; 349 355 350 if ( !jabber_bs_poll( bt, fd, &revents ) )356 if ( ( fd != 0 ) && !jabber_bs_poll( bt, fd, &revents ) ) 351 357 return FALSE; 352 358 … … 724 730 } else 725 731 { 726 /* using a proxy */ 732 /* using a proxy, abort listen */ 733 734 closesocket( tf->fd ); 735 tf->fd = 0; 736 737 if ( bt->connect_timeout ) 738 { 739 b_event_remove( bt->connect_timeout ); 740 bt->connect_timeout = 0; 741 } 742 727 743 GSList *shlist; 728 744 for( shlist = jd->streamhosts ; shlist ; shlist = g_slist_next( shlist ) ) … … 888 904 { 889 905 struct jabber_transfer *tf = bt->tf; 906 struct jabber_data *jd = tf->ic->proto_data; 890 907 891 908 /* TODO: did the receiver get here somehow??? */ … … 894 911 error ); 895 912 896 imcb_file_canceled( tf->ft, error ); 913 if( jd->streamhosts==NULL ) /* we're done here unless we have a proxy to try */ 914 imcb_file_canceled( tf->ft, error ); 897 915 898 916 return FALSE;
Note: See TracChangeset
for help on using the changeset viewer.