comparison libpurple/protocols/msn/soap2.c @ 21130:4ea59c6e57cd

read as much from the fd as possible if we get a read event, hopefully will fix a problem for people on OS X

21129:aed98822d825

	MsnSoapConnection *conn = data;

	conn->connected = TRUE;

	if (conn->event_handle == 0)
		conn->event_handle = g_idle_add(msn_soap_connection_run, conn);
}

static void
msn_soap_error_cb(PurpleSslConnection *ssl, PurpleSslErrorType error,
		gpointer data)

static void
msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
{
    MsnSoapConnection *conn = data;
	int count;
	char buf[8192];
	char *linebreak;
	char *cursor;
	gboolean handled = FALSE;

	g_return_if_fail(cond == PURPLE_INPUT_READ);

	count = purple_ssl_read(conn->ssl, buf, sizeof(buf));
	purple_debug_info("soap", "read %d bytes\n", count);
	if (count < 0 && errno == EAGAIN)
		return;
	else if (count <= 0) {
		purple_debug_info("soap", "read: %s\n", g_strerror(errno));
		purple_ssl_close(conn->ssl);
		conn->ssl = NULL;
		msn_soap_connection_handle_next(conn);
		return;
	}

	if (conn->message == NULL) {
		conn->message = msn_soap_message_new(NULL, NULL);
	}

	if (conn->buf == NULL) {
		conn->buf = g_string_new_len(buf, count);
	} else {
		g_string_append_len(conn->buf, buf, count);
	}

	purple_debug_info("soap", "current %s\n", conn->buf->str);

	cursor = conn->buf->str + conn->handled_len;

21130:4ea59c6e57cd

	MsnSoapConnection *conn = data;

	conn->connected = TRUE;

	if (conn->event_handle == 0)
		conn->event_handle = purple_timeout_add(0, msn_soap_connection_run, conn);
}

static void
msn_soap_error_cb(PurpleSslConnection *ssl, PurpleSslErrorType error,
		gpointer data)

static void
msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
{
    MsnSoapConnection *conn = data;
	int count = 0, cnt;
	char buf[8192];
	char *linebreak;
	char *cursor;
	gboolean handled = FALSE;

	if (conn->message == NULL) {
		conn->message = msn_soap_message_new(NULL, NULL);
	}

	while ((cnt = purple_ssl_read(conn->ssl, buf, sizeof(buf))) > 0) {
		purple_debug_info("soap", "read %d bytes\n", cnt);
		count += cnt;
		if (conn->buf == NULL) {
			conn->buf = g_string_new_len(buf, cnt);
		} else {
			g_string_append_len(conn->buf, buf, cnt);
		}
	}

	if (cnt < 0) {
		if (errno != EAGAIN) {
			purple_debug_info("soap", "read: %s\n", g_strerror(errno));
			purple_ssl_close(conn->ssl);
			conn->ssl = NULL;
			msn_soap_connection_handle_next(conn);
			return;
		} else if (count == 0) {
			return;
		}
	}

	if (cnt == 0 && count == 0) {
		purple_debug_info("soap", "msn_soap_read_cb() called, but no data available?\n");
		purple_ssl_close(conn->ssl);
		conn->ssl = NULL;
		msn_soap_connection_handle_next(conn);
		return;
	}

	purple_debug_info("soap", "current %s\n", conn->buf->str);

	cursor = conn->buf->str + conn->handled_len;