Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/si.c @ 27822:1d012e75153f
propagate from branch 'im.pidgin.pidgin' (head 1b822949efa4354726f0d774f743e3417426728a)
to branch 'im.pidgin.pidgin.yaz' (head 07b6c247ee684e6ff132270b5424a7ed82d7fd33)
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 17 Apr 2008 17:04:20 +0000 |
parents | 0f3a131d23da 919074aa02ca |
children | 7b8f5dd30a82 |
comparison
equal
deleted
inserted
replaced
27821:3a305a4511ea | 27822:1d012e75153f |
---|---|
664 return; | 664 return; |
665 | 665 |
666 if(!(jid = xmlnode_get_attrib(streamhost_used, "jid"))) | 666 if(!(jid = xmlnode_get_attrib(streamhost_used, "jid"))) |
667 return; | 667 return; |
668 | 668 |
669 purple_debug_info("jabber", "jabber_si_connect_proxy_cb() will be looking at jsx %p: jsx->streamhosts is %p and jid is %p", | |
670 jsx, jsx->streamhosts, jid); | |
671 | |
669 if(!(matched = g_list_find_custom(jsx->streamhosts, jid, jabber_si_compare_jid))) | 672 if(!(matched = g_list_find_custom(jsx->streamhosts, jid, jabber_si_compare_jid))) |
670 { | 673 { |
671 gchar *my_jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node, | 674 gchar *my_jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node, |
672 jsx->js->user->domain, jsx->js->user->resource); | 675 jsx->js->user->domain, jsx->js->user->resource); |
673 if (!strcmp(jid, my_jid)) | 676 if (!strcmp(jid, my_jid)) |
780 } else | 783 } else |
781 portnum = 7777; | 784 portnum = 7777; |
782 | 785 |
783 g_snprintf(port, sizeof(port), "%hu", portnum); | 786 g_snprintf(port, sizeof(port), "%hu", portnum); |
784 | 787 |
788 purple_debug_info("jabber", "jabber_si_xfer_bytestreams_listen_cb() will be looking at jsx %p: jsx->streamhosts %p and ft_proxy_list[%i] %p", | |
789 jsx, jsx->streamhosts, i, ft_proxy_list[i]); | |
785 if(g_list_find_custom(jsx->streamhosts, ft_proxy_list[i], jabber_si_compare_jid) != NULL) | 790 if(g_list_find_custom(jsx->streamhosts, ft_proxy_list[i], jabber_si_compare_jid) != NULL) |
786 continue; | 791 continue; |
787 | 792 |
788 streamhost = xmlnode_new_child(query, "streamhost"); | 793 streamhost = xmlnode_new_child(query, "streamhost"); |
789 xmlnode_set_attrib(streamhost, "jid", ft_proxy_list[i]); | 794 xmlnode_set_attrib(streamhost, "jid", ft_proxy_list[i]); |
807 /* TODO: deal with zeroconf proxies */ | 812 /* TODO: deal with zeroconf proxies */ |
808 | 813 |
809 if (!(sh->jid && sh->host && sh->port > 0)) | 814 if (!(sh->jid && sh->host && sh->port > 0)) |
810 continue; | 815 continue; |
811 | 816 |
817 purple_debug_info("jabber", "jabber_si_xfer_bytestreams_listen_cb() will be looking at jsx %p: jsx->streamhosts %p and sh->jid %p", | |
818 jsx, jsx->streamhosts, sh->jid); | |
812 if(g_list_find_custom(jsx->streamhosts, sh->jid, jabber_si_compare_jid) != NULL) | 819 if(g_list_find_custom(jsx->streamhosts, sh->jid, jabber_si_compare_jid) != NULL) |
813 continue; | 820 continue; |
814 | 821 |
815 streamhost = xmlnode_new_child(query, "streamhost"); | 822 streamhost = xmlnode_new_child(query, "streamhost"); |
816 xmlnode_set_attrib(streamhost, "jid", sh->jid); | 823 xmlnode_set_attrib(streamhost, "jid", sh->jid); |
978 g_free(jsx->iq_id); | 985 g_free(jsx->iq_id); |
979 /* XXX: free other stuff */ | 986 /* XXX: free other stuff */ |
980 g_free(jsx->rxqueue); | 987 g_free(jsx->rxqueue); |
981 g_free(jsx); | 988 g_free(jsx); |
982 xfer->data = NULL; | 989 xfer->data = NULL; |
990 | |
991 purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p", jsx); | |
983 } | 992 } |
984 | 993 |
985 static void jabber_si_xfer_cancel_send(PurpleXfer *xfer) | 994 static void jabber_si_xfer_cancel_send(PurpleXfer *xfer) |
986 { | 995 { |
987 jabber_si_xfer_free(xfer); | 996 jabber_si_xfer_free(xfer); |