comparison: libpurple/protocols/yahoo/yahoo_filexfer.c
libpurple/protocols/yahoo/yahoo_filexfer.c
- changeset 31680
- d3902c687705
- parent 30751
- f4dda55ea733
- child 32005
- d1970946b185
equal
deleted
inserted
replaced
| 31679:ceddbbed0f7e | 31680:d3902c687705 |
|---|---|
| 1658 purple_xfer_cancel_remote(xfer); | 1658 purple_xfer_cancel_remote(xfer); |
| 1659 return; | 1659 return; |
| 1660 } | 1660 } |
| 1661 if(val_222 == 3) | 1661 if(val_222 == 3) |
| 1662 { | 1662 { |
| 1663 PurpleAccount *account; | |
| 1663 xfer = g_hash_table_lookup(yd->xfer_peer_idstring_map, | 1664 xfer = g_hash_table_lookup(yd->xfer_peer_idstring_map, |
| 1664 xfer_peer_idstring); | 1665 xfer_peer_idstring); |
| 1665 if(!xfer) | 1666 if(!xfer) |
| 1666 return; | 1667 return; |
| 1667 /* | 1668 /* |
| 1677 /* send p2p file transfer information */ | 1678 /* send p2p file transfer information */ |
| 1678 yahoo_p2p_client_send_ft_info(gc, xfer); | 1679 yahoo_p2p_client_send_ft_info(gc, xfer); |
| 1679 return; | 1680 return; |
| 1680 } | 1681 } |
| 1681 | 1682 |
| 1683 account = purple_connection_get_account(gc); | |
| 1682 if (yd->jp) | 1684 if (yd->jp) |
| 1683 { | 1685 { |
| 1684 purple_dnsquery_a(YAHOOJP_XFER_RELAY_HOST, YAHOOJP_XFER_RELAY_PORT, | 1686 purple_dnsquery_a_account(account, YAHOOJP_XFER_RELAY_HOST, |
| 1687 YAHOOJP_XFER_RELAY_PORT, | |
| 1685 yahoo_xfer_dns_connected_15, xfer); | 1688 yahoo_xfer_dns_connected_15, xfer); |
| 1686 } | 1689 } |
| 1687 else | 1690 else |
| 1688 { | 1691 { |
| 1689 purple_dnsquery_a(YAHOO_XFER_RELAY_HOST, YAHOO_XFER_RELAY_PORT, | 1692 purple_dnsquery_a_account(account, YAHOO_XFER_RELAY_HOST, |
| 1693 YAHOO_XFER_RELAY_PORT, | |
| 1690 yahoo_xfer_dns_connected_15, xfer); | 1694 yahoo_xfer_dns_connected_15, xfer); |
| 1691 } | 1695 } |
| 1692 return; | 1696 return; |
| 1693 } | 1697 } |
| 1694 | 1698 |
| 1782 char *filename = NULL; | 1786 char *filename = NULL; |
| 1783 char *xfer_peer_idstring = NULL; | 1787 char *xfer_peer_idstring = NULL; |
| 1784 char *xfer_idstring_for_relay = NULL; | 1788 char *xfer_idstring_for_relay = NULL; |
| 1785 GSList *l; | 1789 GSList *l; |
| 1786 struct yahoo_packet *pkt_to_send; | 1790 struct yahoo_packet *pkt_to_send; |
| 1787 PurpleAccount *account; | |
| 1788 struct yahoo_p2p_data *p2p_data; | 1791 struct yahoo_p2p_data *p2p_data; |
| 1789 | 1792 |
| 1790 yd = gc->proto_data; | 1793 yd = gc->proto_data; |
| 1791 | 1794 |
| 1792 for (l = pkt->hash; l; l = l->next) { | 1795 for (l = pkt->hash; l; l = l->next) { |
| 1836 | 1839 |
| 1837 xfer_data = xfer->data; | 1840 xfer_data = xfer->data; |
| 1838 | 1841 |
| 1839 xfer_data->info_val_249 = val_249; | 1842 xfer_data->info_val_249 = val_249; |
| 1840 xfer_data->xfer_idstring_for_relay = g_strdup(xfer_idstring_for_relay); | 1843 xfer_data->xfer_idstring_for_relay = g_strdup(xfer_idstring_for_relay); |
| 1841 if(val_249 == 1 || val_249 == 3) { | 1844 if(val_249 == 1 || val_249 == 3) { |
| 1845 PurpleAccount *account; | |
| 1842 if (!purple_url_parse(url, &(xfer_data->host), &(xfer_data->port), &(xfer_data->path), NULL, NULL)) { | 1846 if (!purple_url_parse(url, &(xfer_data->host), &(xfer_data->port), &(xfer_data->path), NULL, NULL)) { |
| 1843 purple_xfer_cancel_remote(xfer); | 1847 purple_xfer_cancel_remote(xfer); |
| 1844 return; | 1848 return; |
| 1845 } | 1849 } |
| 1846 | 1850 |
