comparison libpurple/protocols/jabber/bosh.c @ 25667:bf7338765863

BOSH: Fix an off-by-one g_memdup that was missing the null terminator. Also, change some printf()s to purple_debug_* and a g_return_if_fail.

25666:7856dccb02fb

			printf("\njabber_bosh_connection_http_received_cb\n%s\n", txt);
			g_free(txt);
			conn->receive_cb(conn, node);
			xmlnode_free(node);
		} else {
			printf("\njabber_bosh_connection_http_received_cb: XML ERROR: %s\n", res->data); 
		}
	} else purple_debug_info("jabber", "missing receive_cb of PurpleBOSHConnection.\n");
}

void jabber_bosh_connection_send(PurpleBOSHConnection *conn, xmlnode *node) {
	xmlnode *packet = xmlnode_new("body");
	/* XEP-0124: The rid must not exceed 16 characters */

	cb = g_queue_pop_head(conn->requests);

#warning For a pure HTTP 1.1 stack, this would need to be handled elsewhere.
	if (bosh_conn->ready && g_queue_is_empty(conn->requests)) {
		jabber_bosh_connection_send(bosh_conn, NULL);
		printf("\n SEND AN EMPTY REQUEST \n");
	}

	if (cb) {
		conn->current_response->data_len = conn->body_len;
		conn->current_response->data = g_memdup(conn->buf->str + conn->handled_len, conn->body_len);

		cb(conn->current_response, conn->userdata);
	} else {
		purple_debug_warning("jabber", "Received HTTP response before POST\n");
	}

	                       "Content-Length: %d\r\n\r\n",
	                       req->path, conn->host, bosh_useragent, req->data_len);

	packet = g_string_append(packet, req->data);

	printf("Sending %s\n", packet->str);
	/* TODO: Better error handling, circbuffer or possible integration with
	 * low-level code in jabber.c */
	ret = write(conn->fd, packet->str, packet->len);

	g_string_free(packet, TRUE);

25667:bf7338765863

			printf("\njabber_bosh_connection_http_received_cb\n%s\n", txt);
			g_free(txt);
			conn->receive_cb(conn, node);
			xmlnode_free(node);
		} else {
			purple_debug_warning("jabber", "BOSH: Received invalid XML\n");
		}
	} else {
		g_return_if_reached();
	}
}

void jabber_bosh_connection_send(PurpleBOSHConnection *conn, xmlnode *node) {
	xmlnode *packet = xmlnode_new("body");
	/* XEP-0124: The rid must not exceed 16 characters */

	cb = g_queue_pop_head(conn->requests);

#warning For a pure HTTP 1.1 stack, this would need to be handled elsewhere.
	if (bosh_conn->ready && g_queue_is_empty(conn->requests)) {
		jabber_bosh_connection_send(bosh_conn, NULL);
		purple_debug_misc("jabber", "BOSH: Sending an empty request\n");
	}

	if (cb) {
		conn->current_response->data_len = conn->body_len;
		conn->current_response->data = g_memdup(conn->buf->str + conn->handled_len, conn->body_len + 1);

		cb(conn->current_response, conn->userdata);
	} else {
		purple_debug_warning("jabber", "Received HTTP response before POST\n");
	}

	                       "Content-Length: %d\r\n\r\n",
	                       req->path, conn->host, bosh_useragent, req->data_len);

	packet = g_string_append(packet, req->data);

	purple_debug_misc("jabber", "BOSH out: %s\n", packet->str);
	/* TODO: Better error handling, circbuffer or possible integration with
	 * low-level code in jabber.c */
	ret = write(conn->fd, packet->str, packet->len);

	g_string_free(packet, TRUE);