comparison libpurple/protocols/oscar/peer.c @ 32502:967354280e86

We don't need to abort the file transfer attempt entirely when this happens. We can just try the next connection method (both users connect to a 3rd party proxy)
author Mark Doliner <mark@kingant.net>
date Mon, 13 Feb 2012 03:11:11 +0000
parents b9ae9bcf252d
children 0f1367d534a6
comparison
equal deleted inserted replaced
32501:b9ae9bcf252d 32502:967354280e86
706 } 706 }
707 else if (conn->type == OSCAR_CAPABILITY_SENDFILE) 707 else if (conn->type == OSCAR_CAPABILITY_SENDFILE)
708 { 708 {
709 const guchar *ip_atoi = purple_network_ip_atoi(listener_ip); 709 const guchar *ip_atoi = purple_network_ip_atoi(listener_ip);
710 if (ip_atoi == NULL) { 710 if (ip_atoi == NULL) {
711 purple_debug_error("oscar", "Cannot send file. " 711 purple_debug_error("oscar", "Can't ask peer to connect to us "
712 "purple_network_ip_atoi(%s) returned NULL. " 712 "because purple_network_ip_atoi(%s) returned NULL. "
713 "fd=%d. is_ssl=%d\n", 713 "fd=%d. is_ssl=%d\n",
714 listener_ip ? listener_ip : "(null!)", 714 listener_ip ? listener_ip : "(null)",
715 bos_conn->gsc ? bos_conn->gsc->fd : bos_conn->fd, 715 bos_conn->gsc ? bos_conn->gsc->fd : bos_conn->fd,
716 bos_conn->gsc ? 1 : 0); 716 bos_conn->gsc ? 1 : 0);
717 purple_xfer_cancel_local(conn->xfer); 717 peer_connection_trynext(conn);
718 return; 718 return;
719 } 719 }
720 aim_im_sendch2_sendfile_requestdirect(od, 720 aim_im_sendch2_sendfile_requestdirect(od,
721 conn->cookie, conn->bn, 721 conn->cookie, conn->bn,
722 ip_atoi, 722 ip_atoi,