comparison libpurple/protocols/msn/soap2.c @ 23328:f06adc198c1d

Patch from tomgr and Maiku that workarounds some OS X issue, References #5212

23325:8c315f969600

	MsnSoapMessage *message, const char *host, const char *path,
	MsnSoapCallback cb, gpointer cb_data, gboolean first);

static void msn_soap_request_destroy(MsnSoapRequest *req);
static void msn_soap_connection_sanitize(MsnSoapConnection *conn, gboolean disconnect);

static gboolean
msn_soap_cleanup_each(gpointer key, gpointer value, gpointer data)
{
	MsnSoapConnection *conn = value;

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;

23328:f06adc198c1d

	MsnSoapMessage *message, const char *host, const char *path,
	MsnSoapCallback cb, gpointer cb_data, gboolean first);

static void msn_soap_request_destroy(MsnSoapRequest *req);
static void msn_soap_connection_sanitize(MsnSoapConnection *conn, gboolean disconnect);
static void msn_soap_process(MsnSoapConnection *conn);

static gboolean
msn_soap_cleanup_each(gpointer key, gpointer value, gpointer data)
{
	MsnSoapConnection *conn = value;

static void
msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
{
	MsnSoapConnection *conn = data;
	int count = 0, cnt, perrno;
	/* This buffer needs to be larger than any packets received from
		login.live.com or Adium will fail to receive the packet
		(something weird with the login.live.com server). With NSS it works
		fine, so I believe it's some bug with OS X */ 
	char buf[16 * 1024];

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

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

	/* && count is necessary for Adium, on OS X the last read always
	   return an error, so we want to proceed anyway. See #5212 for
	   discussion on this and the above buffer size issues */
	if(cnt < 0 && errno == EAGAIN && count == 0)
		return;

	// msn_soap_process could alter errno
	perrno = errno;
	msn_soap_process(conn);
	
	if (cnt < 0 && perrno != EAGAIN) {
		purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
		// It's possible msn_soap_process closed the ssl connection
		if (conn->ssl) {
			purple_ssl_close(conn->ssl);
			conn->ssl = NULL;
			msn_soap_connection_handle_next(conn);
		}
	}
}

static void
msn_soap_process(MsnSoapConnection *conn) {
	gboolean handled = FALSE;
	char *cursor;
	char *linebreak;

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

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