- Timestamp:
- 2015-02-22T18:53:21Z (10 years ago)
- Branches:
- master
- Children:
- 5ff4618
- Parents:
- da6f167
- git-author:
- dequis <dx@…> (22-02-15 06:50:48)
- git-committer:
- dequis <dx@…> (22-02-15 18:53:21)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/s5bytestream.c
rda6f167 r9216eff 253 253 } 254 254 255 void jabber_bs_remove_events(struct bs_transfer *bt) 256 { 257 struct jabber_transfer *tf = bt->tf; 258 259 if (tf->watch_out) { 260 b_event_remove(tf->watch_out); 261 tf->watch_out = 0; 262 } 263 264 if (tf->watch_in) { 265 b_event_remove(tf->watch_in); 266 tf->watch_in = 0; 267 } 268 269 if (tf->fd != -1) { 270 closesocket(tf->fd); 271 tf->fd = -1; 272 } 273 274 if (bt->connect_timeout) { 275 b_event_remove(bt->connect_timeout); 276 bt->connect_timeout = 0; 277 } 278 } 279 255 280 /* Bad luck */ 256 281 void jabber_bs_canceled(file_transfer_t *ft, char *reason) … … 555 580 if (shlist && shlist->next) { 556 581 bt->sh = shlist->next->data; 582 jabber_bs_remove_events(bt); 557 583 return jabber_bs_recv_handshake(bt, -1, 0); 558 584 } … … 764 790 /* using a proxy, abort listen */ 765 791 766 if (tf->watch_in) { 767 b_event_remove(tf->watch_in); 768 tf->watch_in = 0; 769 } 770 771 if (tf->fd != -1) { 772 closesocket(tf->fd); 773 tf->fd = -1; 774 } 775 776 if (bt->connect_timeout) { 777 b_event_remove(bt->connect_timeout); 778 bt->connect_timeout = 0; 779 } 792 jabber_bs_remove_events(bt); 780 793 781 794 GSList *shlist;
Note: See TracChangeset
for help on using the changeset viewer.