comparison libpurple/protocols/oscar/oscar.c @ 25022:f6ef3a9534db

Shuffle a few comments around to make it look like I did something

25021:951b7ff9a888

 * a TCP connection with an oscar host if an error occurred.
 */
static void
connection_common_error_cb(FlapConnection *conn, const gchar *error_message)
{
	PurpleConnection *gc;
	OscarData *od;

	od = conn->od;
	gc = od->gc;

	purple_debug_error("oscar", "unable to connect to FLAP "
			"server of type 0x%04hx\n", conn->type);
	if (conn->type == SNAC_FAMILY_AUTH)
	{
		gchar *msg;
		msg = g_strdup_printf(_("Could not connect to authentication server:\n%s"),
				error_message);

 * of host, we do a few different things here.
 */
static void
connection_common_established_cb(FlapConnection *conn)
{
	PurpleConnection *gc;
	OscarData *od;
	PurpleAccount *account;

	od = conn->od;
	gc = od->gc;
	account = purple_connection_get_account(gc);

	purple_debug_info("oscar", "connected to FLAP server of type 0x%04hx\n",
			conn->type);
	if (conn->cookie == NULL)
		flap_connection_send_version(od, conn);
	else
	{
		flap_connection_send_version_with_cookie(od, conn,

	newconn = flap_connection_new(od, SNAC_FAMILY_AUTH);
	if (od->use_ssl) {
		if (purple_ssl_is_supported()) {
			const char *server = purple_account_get_string(account, "server", OSCAR_DEFAULT_SSL_LOGIN_SERVER);
			/* If the account's server is what the oscar prpl has offered as
			 * the default login server through the vast eons (all two of
			 * said default options, AFAIK) and the user wants SSL, we'll
			 * do what we know is best for them and change the setting out
			 * from under them to the SSL login server.
			 */

					_("SSL support unavailable"));
		}
	} else {
		const char *server = purple_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);

		/* See the comment above. We do the reverse here. If they don't want
		 * SSL but their server is set to OSCAR_DEFAULT_SSL_LOGIN_SERVER,
		 * set it back to the default.
		 */
		if (!strcmp(server, OSCAR_DEFAULT_SSL_LOGIN_SERVER)) {
			purple_debug_info("oscar", "Account does not use SSL, so changing server back to non-SSL\n");

	}


	if (redir->use_ssl)
	{
		/* FIXME: It should be possible to specify a certificate common name
		 * distinct from the host we're passing to purple_ssl_connect. The
		 * way to work around that is to use purple_proxy_connect +
		 * purple_ssl_connect_with_host_fd */
		newconn->ssl_cert_cn = g_strdup(redir->ssl_cert_cn);
		newconn->connect_data = purple_proxy_connect(NULL, account, host, port,
				ssl_proxy_conn_established_cb, newconn);
	}
	else

25022:f6ef3a9534db

 * a TCP connection with an oscar host if an error occurred.
 */
static void
connection_common_error_cb(FlapConnection *conn, const gchar *error_message)
{
	OscarData *od;
	PurpleConnection *gc;

	od = conn->od;
	gc = od->gc;

	purple_debug_error("oscar", "unable to connect to FLAP "
			"server of type 0x%04hx\n", conn->type);

	if (conn->type == SNAC_FAMILY_AUTH)
	{
		gchar *msg;
		msg = g_strdup_printf(_("Could not connect to authentication server:\n%s"),
				error_message);

 * of host, we do a few different things here.
 */
static void
connection_common_established_cb(FlapConnection *conn)
{
	OscarData *od;
	PurpleConnection *gc;
	PurpleAccount *account;

	od = conn->od;
	gc = od->gc;
	account = purple_connection_get_account(gc);

	purple_debug_info("oscar", "connected to FLAP server of type 0x%04hx\n",
			conn->type);

	if (conn->cookie == NULL)
		flap_connection_send_version(od, conn);
	else
	{
		flap_connection_send_version_with_cookie(od, conn,

	newconn = flap_connection_new(od, SNAC_FAMILY_AUTH);
	if (od->use_ssl) {
		if (purple_ssl_is_supported()) {
			const char *server = purple_account_get_string(account, "server", OSCAR_DEFAULT_SSL_LOGIN_SERVER);
			/*
			 * If the account's server is what the oscar prpl has offered as
			 * the default login server through the vast eons (all two of
			 * said default options, AFAIK) and the user wants SSL, we'll
			 * do what we know is best for them and change the setting out
			 * from under them to the SSL login server.
			 */

					_("SSL support unavailable"));
		}
	} else {
		const char *server = purple_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);

		/*
		 * See the comment above. We do the reverse here. If they don't want
		 * SSL but their server is set to OSCAR_DEFAULT_SSL_LOGIN_SERVER,
		 * set it back to the default.
		 */
		if (!strcmp(server, OSCAR_DEFAULT_SSL_LOGIN_SERVER)) {
			purple_debug_info("oscar", "Account does not use SSL, so changing server back to non-SSL\n");

	}


	if (redir->use_ssl)
	{
		/*
		 * TODO: It should be possible to specify a certificate common name
		 * distinct from the host we're passing to purple_ssl_connect. The
		 * way to work around that is to use purple_proxy_connect +
		 * purple_ssl_connect_with_host_fd
		 */
		newconn->ssl_cert_cn = g_strdup(redir->ssl_cert_cn);
		newconn->connect_data = purple_proxy_connect(NULL, account, host, port,
				ssl_proxy_conn_established_cb, newconn);
	}
	else