comparison libpurple/protocols/jabber/bosh.c @ 25997:c605e5f2fc99

Use a PurpleCircBuffer for the queued stanzas

25996:349e411da2ce

 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 *
 */
#include "internal.h"
#include "core.h"
#include "cipher.h"
#include "debug.h"
#include "prpl.h"
#include "util.h"

	unsigned int inactivity_timer;
	int max_inactivity;
	int wait;

	GString *pending;
	int max_requests;
	int requests;

	PurpleBOSHConnectionConnectFunction connect_cb;
	PurpleBOSHConnectionReceiveFunction receive_cb;

	conn->js = js;
	/* FIXME: This doesn't seem very random */
	conn->rid = rand() % 100000 + 1728679472;

	conn->pending = g_string_new("");

	conn->ready = FALSE;

	conn->connections[0] = jabber_bosh_http_connection_init(conn);

	g_free(conn->path);

	if (conn->inactivity_timer)
		purple_timeout_remove(conn->inactivity_timer);

	if (conn->pending)
		g_string_free(conn->pending, TRUE);

	for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) {
		if (conn->connections[i])
			jabber_bosh_http_connection_destroy(conn->connections[i]);
	}

                                   xmlnode *node)
{
	PurpleHTTPConnection *chosen;
	GString *packet = NULL;
	char *buf = NULL;

	chosen = find_available_http_connection(conn);

	if (type != PACKET_NORMAL && !chosen) {
		/*

			purple_debug_warning("jabber", "First BOSH connection wasn't ready. Bad "
					"things may happen.\n");
	}

	if (node)
		buf = xmlnode_to_str(node, NULL);

	if (type == PACKET_NORMAL && (!chosen ||
	        (conn->max_requests > 0 && conn->requests == conn->max_requests))) {
		/*
		 * For normal data, send up to max_requests requests at a time or there is no
		 * connection ready (likely, we're currently opening a second connection and
		 * will send these packets when connected).
		 */
		if (buf) {
			conn->pending = g_string_append(conn->pending, buf);
			g_free(buf);
		}
		return;
	}

	                conn->js->user->domain);

	if (type == PACKET_STREAM_RESTART)
		packet = g_string_append(packet, " xmpp:restart='true'/>");
	else {
		if (type == PACKET_TERMINATE)
			packet = g_string_append(packet, " type='terminate'");

		g_string_append_printf(packet, ">%s%s</body>", conn->pending->str,
		                       buf ? buf : "");
		g_string_truncate(conn->pending, 0);
	}

	g_free(buf);

	http_connection_send_request(chosen, packet);

	conn->headers_done = FALSE;
	conn->handled_len = conn->body_len = 0;

	if (conn->bosh->ready) {
		purple_debug_info("jabber", "BOSH session already exists. Trying to reuse it.\n");
		if (conn->bosh->pending && conn->bosh->pending->len > 0) {
			/* Send the pending data */
			jabber_bosh_connection_send_native(conn->bosh, PACKET_NORMAL, NULL);
		}
#if 0
		conn->bosh->receive_cb = jabber_bosh_connection_received;

	http_received_cb(conn->buf->str + conn->handled_len, conn->body_len,
	                 conn->bosh);

	if (conn->bosh->ready &&
			(conn->bosh->requests == 0 || conn->bosh->pending->len)) {
		jabber_bosh_connection_send(conn->bosh, NULL);
		purple_debug_misc("jabber", "BOSH: Sending an empty request\n");
	}

	g_string_free(conn->buf, TRUE);

25997:c605e5f2fc99

 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 *
 */
#include "internal.h"
#include "circbuffer.h"
#include "core.h"
#include "cipher.h"
#include "debug.h"
#include "prpl.h"
#include "util.h"

	unsigned int inactivity_timer;
	int max_inactivity;
	int wait;

	PurpleCircBuffer *pending;
	int max_requests;
	int requests;

	PurpleBOSHConnectionConnectFunction connect_cb;
	PurpleBOSHConnectionReceiveFunction receive_cb;

	conn->js = js;
	/* FIXME: This doesn't seem very random */
	conn->rid = rand() % 100000 + 1728679472;

	conn->pending = purple_circ_buffer_new(0 /* default grow size */);

	conn->ready = FALSE;

	conn->connections[0] = jabber_bosh_http_connection_init(conn);

	g_free(conn->path);

	if (conn->inactivity_timer)
		purple_timeout_remove(conn->inactivity_timer);

	purple_circ_buffer_destroy(conn->pending);

	for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) {
		if (conn->connections[i])
			jabber_bosh_http_connection_destroy(conn->connections[i]);
	}

                                   xmlnode *node)
{
	PurpleHTTPConnection *chosen;
	GString *packet = NULL;
	char *buf = NULL;
	int len;

	chosen = find_available_http_connection(conn);

	if (type != PACKET_NORMAL && !chosen) {
		/*

			purple_debug_warning("jabber", "First BOSH connection wasn't ready. Bad "
					"things may happen.\n");
	}

	if (node)
		buf = xmlnode_to_str(node, &len);

	if (type == PACKET_NORMAL && (!chosen ||
	        (conn->max_requests > 0 && conn->requests == conn->max_requests))) {
		/*
		 * For normal data, send up to max_requests requests at a time or there is no
		 * connection ready (likely, we're currently opening a second connection and
		 * will send these packets when connected).
		 */
		if (buf) {
			purple_circ_buffer_append(conn->pending, buf, len); 
			g_free(buf);
		}
		return;
	}

	                conn->js->user->domain);

	if (type == PACKET_STREAM_RESTART)
		packet = g_string_append(packet, " xmpp:restart='true'/>");
	else {
		gsize read_amt;
		if (type == PACKET_TERMINATE)
			packet = g_string_append(packet, " type='terminate'");

		packet = g_string_append_c(packet, '>');

		while ((read_amt = purple_circ_buffer_get_max_read(conn->pending)) > 0) {
			packet = g_string_append_len(packet, conn->pending->outptr, read_amt);
			purple_circ_buffer_mark_read(conn->pending, read_amt);
		}

		if (buf)
			packet = g_string_append_len(packet, buf, len);
		packet = g_string_append(packet, "</body>");
	}

	g_free(buf);

	http_connection_send_request(chosen, packet);

	conn->headers_done = FALSE;
	conn->handled_len = conn->body_len = 0;

	if (conn->bosh->ready) {
		purple_debug_info("jabber", "BOSH session already exists. Trying to reuse it.\n");
		if (conn->bosh->pending->bufused > 0) {
			/* Send the pending data */
			jabber_bosh_connection_send_native(conn->bosh, PACKET_NORMAL, NULL);
		}
#if 0
		conn->bosh->receive_cb = jabber_bosh_connection_received;

	http_received_cb(conn->buf->str + conn->handled_len, conn->body_len,
	                 conn->bosh);

	if (conn->bosh->ready &&
			(conn->bosh->requests == 0 || conn->bosh->pending->bufused > 0)) {
		jabber_bosh_connection_send(conn->bosh, NULL);
		purple_debug_misc("jabber", "BOSH: Sending an empty request\n");
	}

	g_string_free(conn->buf, TRUE);