pidgin3: comparison libpurple/protocols/jabber/jabber.c

-:54f0cc747958
+:52dc2d315d73
 				_("Unable to connect"));
 		return;
 	}
 }
-static void
-jabber_login_callback(gpointer data, gint source, const gchar *error)
-{
-	PurpleConnection *gc = data;
-	JabberStream *js = purple_connection_get_protocol_data(gc);
-	if (source < 0) {
-		GResolver *resolver = g_resolver_get_default();
-		gchar *name = g_strdup_printf("_xmppconnect.%s", js->user->domain);
-		purple_debug_info("jabber", "Couldn't connect directly to %s.  Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
-		g_resolver_lookup_records_async(resolver,
-		                                name,
-		                                G_RESOLVER_RECORD_TXT,
-		                                js->cancellable,
-		                                txt_resolved_cb,
-		                                js);
-		g_free(name);
-		g_object_unref(resolver);
-		return;
-	}
-	js->fd = source;
-	if(js->state == JABBER_STREAM_CONNECTING)
-		jabber_send_raw(js, "<?xml version='1.0' ?>", -1);
-	jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING);
-	js->inpa = purple_input_add(js->fd, PURPLE_INPUT_READ, jabber_recv_cb, gc);
-}
 /* Grabbed duplicate_fd() from GLib's testcases (gio/tests/socket.c).
 * Can be dropped once this prpl has been fully converted to Gio.
 */
 static int
 duplicate_fd(int fd)
 #endif
 }
 /* End function grabbed from GLib */
 static void
-jabber_login_callback_async(GObject *source_object, GAsyncResult *res,
+jabber_login_callback(GObject *source_object, GAsyncResult *res, gpointer data)
-gpointer data)
 {
 	GSocketClient *client = G_SOCKET_CLIENT(source_object);
 	JabberStream *js = data;
 	GSocketConnection *conn;
 	GSocket *socket;
 			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->certificate_CN, js->gc);
 	/* The fd is no longer our concern */
 	js->fd = -1;
 }
-static gboolean
-jabber_login_connect(JabberStream *js, const char *host, int port,
-gboolean fatal_failure)
-{
-	if (purple_proxy_connect(js->gc, purple_connection_get_account(js->gc),
-			host, port, jabber_login_callback, js->gc) == NULL) {
-		if (fatal_failure) {
-			purple_connection_error(js->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to connect"));
-		}
-		return FALSE;
-	}
-	return TRUE;
-}
 static void
-srv_resolved_cb(GObject *sender, GAsyncResult *result, gpointer data)
+srv_resolved_cb(GObject *source_object, GAsyncResult *result, gpointer data)
 {
+	GSocketClient *client = G_SOCKET_CLIENT(source_object);
 	GError *error = NULL;
-	GList *targets = NULL, *l = NULL;
+	GSocketConnection *conn;
+	GSocket *socket;
 	JabberStream *js = data;
-	targets = g_resolver_lookup_service_finish(G_RESOLVER(sender),
+	conn = g_socket_client_connect_to_service_finish(client, result, &error);
-			result, &error);
+	if (error) {
-	if(error) {
+		if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-		purple_debug_warning("jabber",
+			/* Do nothing; cancelled. */
-		                     "SRV lookup failed, proceeding with normal connection : %s",
-		                     error->message);
+		} else if (g_error_matches(error, G_RESOLVER_ERROR,
+		                           G_RESOLVER_ERROR_NOT_FOUND)) {
+			/* If there was no response, then attempt fallback behaviour of XMPP
+			 * Core 3.2.2. */
+			purple_debug_warning(
+			        "jabber",
+			        "SRV lookup failed, proceeding with normal connection : %s",
+			        error->message);
+			g_socket_client_connect_to_host_async(
+			        js->client, js->user->domain,
+			        purple_account_get_int(
+			                purple_connection_get_account(js->gc), "port",
+			                5222),
+			        js->cancellable, jabber_login_callback, js);
+		} else {
+			/* If resolving failed or connecting failed, then just error out, as
+			 * in XMPP Core 3.2.1 step 8. */
+			purple_connection_g_error(js->gc, error);
+		}
 		g_error_free(error);
+		return;
-		jabber_login_connect(
+	}
-		        js, js->user->domain,
-		        purple_account_get_int(purple_connection_get_account(js->gc),
+	socket = g_socket_connection_get_socket(conn);
-		                               "port", 5222),
+	g_assert(socket != NULL);
-		        TRUE);
+	/* Duplicate the file descriptor, and then free the connection.
-	} else {
+	 * libpurple's proxy code doesn't keep an object around for the
-		for(l = targets; l; l = l->next) {
+	 * lifetime of the connection. Therefore, in order to not leak
-			GSrvTarget *target = (GSrvTarget *)l->data;
+	 * memory, the GSocketConnection must be freed here. In order
-			const gchar *hostname = g_srv_target_get_hostname(target);
+	 * to avoid the double close/free of the file descriptor, the
-			guint port = g_srv_target_get_port(target);
+	 * file descriptor is duplicated.
+	 */
-			if (jabber_login_connect(js, hostname, port, FALSE)) {
+	js->fd = duplicate_fd(g_socket_get_fd(socket));
-				g_resolver_free_targets(targets);
+	g_object_unref(conn);
-				return;
+	if (js->state == JABBER_STREAM_CONNECTING) {
-			}
+		jabber_send_raw(js, "<?xml version='1.0' ?>", -1);
-		}
+	}
-		g_resolver_free_targets(targets);
+	jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING);
+	js->inpa =
-		jabber_login_connect(
+	        purple_input_add(js->fd, PURPLE_INPUT_READ, jabber_recv_cb, js->gc);
-		        js, js->user->domain,
-		        purple_account_get_int(purple_connection_get_account(js->gc),
-		                               "port", 5222),
-		        TRUE);
-	}
 }
 static JabberStream *
 jabber_stream_new(PurpleAccount *account)
 {
 	 * invoke the magic of SRV lookups, to figure out host and port */
 	if(connect_server[0]) {
 		g_socket_client_connect_to_host_async(
 		        js->client, connect_server,
 		        purple_account_get_int(account, "port", 5222), js->cancellable,
-		        jabber_login_callback_async, js);
+		        jabber_login_callback, js);
 	} else {
-		GResolver *resolver = g_resolver_get_default();
+		g_socket_client_connect_to_service_async(js->client, js->user->domain,
-		g_resolver_lookup_service_async(resolver,
+		                                         "xmpp-client", js->cancellable,
-		                                "xmpp-client",
+		                                         srv_resolved_cb, js);
-		                                "tcp",
-		                                js->user->domain,
-		                                js->cancellable,
-		                                srv_resolved_cb,
-		                                js);
-		g_object_unref(resolver);
 	}
 }
 void
 jabber_login(PurpleAccount *account)

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/jabber/jabber.c

libpurple/protocols/jabber/jabber.c