comparison libpurple/protocols/jabber/bosh.c @ 26273:79ca1cf55d9d

Because BOSH works over connections that may die non-fatally, we need to limit the number of failed re-connection attempts before we declare the session lost. Reset the failures each time we process a full read from the server, which is a little hacky, but indicates that we have a *working* connection.

26272:fcee93c74230

#include "xmlnode.h"

#include "bosh.h"

#define MAX_HTTP_CONNECTIONS      2

typedef struct _PurpleHTTPConnection PurpleHTTPConnection;

typedef void (*PurpleBOSHConnectionConnectFunction)(PurpleBOSHConnection *conn);
typedef void (*PurpleBOSHConnectionReceiveFunction)(PurpleBOSHConnection *conn, xmlnode *node);

struct _PurpleBOSHConnection {
	JabberStream *js;
	gboolean pipelining;
	PurpleHTTPConnection *connections[MAX_HTTP_CONNECTIONS];

	gboolean ready;
	gboolean ssl;

	/* decoded URL */

}

static void
http_received_cb(const char *data, int len, PurpleBOSHConnection *conn)
{
	if (conn->receive_cb) {
		xmlnode *node = xmlnode_from_str(data, len);
		if (node) {
			char *txt = xmlnode_to_formatted_str(node, NULL);
			printf("\nhttp_received_cb\n%s\n", txt);

	if (conn->bosh->pipelining)
		/* Hmmmm, fall back to multiple connections */
		conn->bosh->pipelining = FALSE;

	/* No! Please! Take me back. It was me, not you! I was weak! */
	http_connection_connect(conn);
}

void jabber_bosh_connection_connect(PurpleBOSHConnection *bosh) {
	PurpleHTTPConnection *conn = bosh->connections[0];
	http_connection_connect(conn);

		 */
		http_connection_disconnected(conn);

		/* Process what we do have */
	}

	jabber_bosh_http_connection_process(conn);
}

static void

26273:79ca1cf55d9d

#include "xmlnode.h"

#include "bosh.h"

#define MAX_HTTP_CONNECTIONS      2
#define MAX_FAILED_CONNECTIONS    3

typedef struct _PurpleHTTPConnection PurpleHTTPConnection;

typedef void (*PurpleBOSHConnectionConnectFunction)(PurpleBOSHConnection *conn);
typedef void (*PurpleBOSHConnectionReceiveFunction)(PurpleBOSHConnection *conn, xmlnode *node);

struct _PurpleBOSHConnection {
	JabberStream *js;
	gboolean pipelining;
	PurpleHTTPConnection *connections[MAX_HTTP_CONNECTIONS];
	unsigned short failed_connections;

	gboolean ready;
	gboolean ssl;

	/* decoded URL */

}

static void
http_received_cb(const char *data, int len, PurpleBOSHConnection *conn)
{
	if (conn->failed_connections)
		/* We've got some data, so reset the number of failed connections */
		conn->failed_connections = 0;

	if (conn->receive_cb) {
		xmlnode *node = xmlnode_from_str(data, len);
		if (node) {
			char *txt = xmlnode_to_formatted_str(node, NULL);
			printf("\nhttp_received_cb\n%s\n", txt);

	if (conn->bosh->pipelining)
		/* Hmmmm, fall back to multiple connections */
		conn->bosh->pipelining = FALSE;

	if (++conn->bosh->failed_connections == MAX_FAILED_CONNECTIONS) {
		purple_connection_error_reason(conn->bosh->js->gc,
				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
				_("Unable to establish a connection with the server"));
	} else {
		/* No! Please! Take me back. It was me, not you! I was weak! */
		http_connection_connect(conn);
	}
}

void jabber_bosh_connection_connect(PurpleBOSHConnection *bosh) {
	PurpleHTTPConnection *conn = bosh->connections[0];
	http_connection_connect(conn);

		 */
		http_connection_disconnected(conn);

		/* Process what we do have */
	}


	jabber_bosh_http_connection_process(conn);
}

static void