comparison libpurple/protocols/jabber/jabber.c @ 16996:37a2d6eadd34

fix #699 People usually enter IP addresses into Connect Server, and that's not gonna be a FQDN, which we need for SASL to work correctly. If this causes problems for people (i.e. they were depending on the old behavior of assuming that the connect server was the fqdn), then we'll have to implement something smarter to detect IP addresses vs hostnames, and make TheRightDecision(TM)

16995:830c0cc9b9d4

	js->gc->inpa = 0;
	js->gsc = purple_ssl_connect_fd(js->gc->account, js->fd,
			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc);
}

static void jabber_login_connect(JabberStream *js, const char *server, int port)
{
#ifdef HAVE_CYRUS_SASL
	js->serverFQDN = g_strdup(server);
#endif

	if (purple_proxy_connect(js->gc, js->gc->account, server,
			port, jabber_login_callback, js->gc) == NULL)
		purple_connection_error(js->gc, _("Unable to create socket"));
}

static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data)

	js = data;
	js->srv_query_data = NULL;

	if(results) {
		jabber_login_connect(js, resp->hostname, resp->port);
		g_free(resp);
	} else {
		jabber_login_connect(js, js->user->domain,
			purple_account_get_int(js->gc->account, "port", 5222));
	}
}

void

	/* no old-ssl, so if they've specified a connect server, we'll use that, otherwise we'll
	 * invoke the magic of SRV lookups, to figure out host and port */
	if(!js->gsc) {
		if(connect_server[0]) {
			jabber_login_connect(js, connect_server, purple_account_get_int(account, "port", 5222));
		} else {
			js->srv_query_data = purple_srv_resolve("xmpp-client",
					"tcp", js->user->domain, srv_resolved_cb, js);
		}
	}

		}
	}

	if(!js->gsc) {
		if (connect_server[0]) {
			jabber_login_connect(js, server,
			                     purple_account_get_int(account,
			                                          "port", 5222));
		} else {
			js->srv_query_data = purple_srv_resolve("xmpp-client",
			                                      "tcp",

16996:37a2d6eadd34

	js->gc->inpa = 0;
	js->gsc = purple_ssl_connect_fd(js->gc->account, js->fd,
			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc);
}

static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
{
#ifdef HAVE_CYRUS_SASL
	js->serverFQDN = g_strdup(fqdn);
#endif

	if (purple_proxy_connect(js->gc, js->gc->account, host,
			port, jabber_login_callback, js->gc) == NULL)
		purple_connection_error(js->gc, _("Unable to create socket"));
}

static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data)

	js = data;
	js->srv_query_data = NULL;

	if(results) {
		jabber_login_connect(js, resp->hostname, resp->hostname, resp->port);
		g_free(resp);
	} else {
		jabber_login_connect(js, js->user->domain, js->user->domain,
			purple_account_get_int(js->gc->account, "port", 5222));
	}
}

void

	/* no old-ssl, so if they've specified a connect server, we'll use that, otherwise we'll
	 * invoke the magic of SRV lookups, to figure out host and port */
	if(!js->gsc) {
		if(connect_server[0]) {
			jabber_login_connect(js, js->user->domain, connect_server, purple_account_get_int(account, "port", 5222));
		} else {
			js->srv_query_data = purple_srv_resolve("xmpp-client",
					"tcp", js->user->domain, srv_resolved_cb, js);
		}
	}

		}
	}

	if(!js->gsc) {
		if (connect_server[0]) {
			jabber_login_connect(js, js->user->domain, server,
			                     purple_account_get_int(account,
			                                          "port", 5222));
		} else {
			js->srv_query_data = purple_srv_resolve("xmpp-client",
			                                      "tcp",