comparison libpurple/protocols/jabber/disco.c @ 31648:fa88dc1dcabb

merged from im.pidgin.pidgin

31508:c92bc01056ea

	purple_debug_info("jabber", "got %d SRV responses for STUN.\n", results);
	js->srv_query_data = NULL;

	if (results > 0) {
		purple_debug_info("jabber", "looking up IP for %s:%d\n", 
			resp[0].hostname, resp[0].port);
		js->stun_query = 
			purple_dnsquery_a(resp[0].hostname, resp[0].port, 
				jabber_disco_stun_lookup_cb, js);
	}
}

		    	purple_strequal(purple_network_get_stun_ip(), "")) {
				jabber_google_send_jingle_info(js);
			}
		} else if (purple_network_get_stun_ip() == NULL ||
		    purple_strequal(purple_network_get_stun_ip(), "")) {
			js->srv_query_data = 
				purple_srv_resolve("stun", "udp", js->user->domain,
					jabber_disco_stun_srv_resolve_cb, js);
			/* TODO: add TURN support later... */
		}
	}

31648:fa88dc1dcabb

	purple_debug_info("jabber", "got %d SRV responses for STUN.\n", results);
	js->srv_query_data = NULL;

	if (results > 0) {
		purple_debug_info("jabber", "looking up IP for %s:%d\n",
			resp[0].hostname, resp[0].port);
		js->stun_query =
			purple_dnsquery_a(resp[0].hostname, resp[0].port,
				jabber_disco_stun_lookup_cb, js);
	}
}

		    	purple_strequal(purple_network_get_stun_ip(), "")) {
				jabber_google_send_jingle_info(js);
			}
		} else if (purple_network_get_stun_ip() == NULL ||
		    purple_strequal(purple_network_get_stun_ip(), "")) {
			js->srv_query_data =
				purple_srv_resolve("stun", "udp", js->user->domain,
					jabber_disco_stun_srv_resolve_cb, js);
			/* TODO: add TURN support later... */
		}
	}