Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/peer.c @ 25016:ff5e2356683f
propagate from branch 'im.pidgin.pidgin' (head 07f8d9c59020c1f69cc21b71f8252f13efd6a6e0)
to branch 'im.pidgin.cpw.darkrain42.oscar-ssl' (head 8a336a3d256ee3435232fad10bd222d3bab817ac)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 14 Jan 2009 06:29:47 +0000 |
| parents | 568b786c36f9 ea70a446dde4 |
| children | 8c8948b9f602 7f552614ec8a |
comparison
equal
deleted
inserted
replaced
| 24960:df25f88ff22a | 25016:ff5e2356683f |
|---|---|
| 688 /* Not good */ | 688 /* Not good */ |
| 689 peer_connection_trynext(conn); | 689 peer_connection_trynext(conn); |
| 690 return; | 690 return; |
| 691 } | 691 } |
| 692 | 692 |
| 693 listener_ip = purple_network_get_my_ip(bos_conn->fd); | 693 if (bos_conn->gsc) |
| 694 listener_ip = purple_network_get_my_ip(bos_conn->gsc->fd); | |
| 695 else | |
| 696 listener_ip = purple_network_get_my_ip(bos_conn->fd); | |
| 694 listener_port = purple_network_get_port_from_fd(conn->listenerfd); | 697 listener_port = purple_network_get_port_from_fd(conn->listenerfd); |
| 695 if (conn->type == OSCAR_CAPABILITY_DIRECTIM) | 698 if (conn->type == OSCAR_CAPABILITY_DIRECTIM) |
| 696 { | 699 { |
| 697 aim_im_sendch2_odc_requestdirect(od, | 700 aim_im_sendch2_odc_requestdirect(od, |
| 698 conn->cookie, conn->sn, purple_network_ip_atoi(listener_ip), | 701 conn->cookie, conn->sn, purple_network_ip_atoi(listener_ip), |