[Gaim-commits] SF.net SVN: gaim: [16705] trunk/src/protocols/yahoo

[<the...@us...>]

Revision: 16705
Author:   thekingant
Date:     2006-08-11 01:08:19 -0700 (Fri, 11 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16705&view=rev

Log Message:
-----------
Don't use the same callback for both gaim_proxy_connect() and
gaim_input_add(). Aside from being a little confusing, it's
hindering some changes I want to make to gaim_proxy_connect().

Modified Paths:
--------------
    trunk/src/protocols/yahoo/yahoo.c
    trunk/src/protocols/yahoo/yahoo_filexfer.c
    trunk/src/protocols/yahoo/yahoochat.c
Modified: trunk/src/protocols/yahoo/yahoo.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo.c	2006-08-11 08:01:16 UTC (rev 16704)
+++ trunk/src/protocols/yahoo/yahoo.c	2006-08-11 08:08:19 UTC (rev 16705)
@@ -2354,19 +2354,17 @@
 	}
 }
 
-static void yahoo_got_cookies(gpointer data, gint source, GaimInputCondition cond)
+static void yahoo_got_cookies_send_cb(gpointer data, gint source, GaimInputCondition cond)
 {
-	GaimConnection *gc = data;
-	struct yahoo_data *yd = gc->proto_data;
-	int written, total_len;
+	GaimConnection *gc;
+	struct yahoo_data *yd;
+	int written, remaining;
 
-	if (source < 0) {
-		gaim_connection_error(gc, _("Unable to connect."));
-		return;
-	}
+	gc = data;
+	yd = gc->proto_data;
 
-	total_len = strlen(yd->auth) - yd->auth_written;
-	written = write(source, yd->auth + yd->auth_written, total_len);
+	remaining = strlen(yd->auth) - yd->auth_written;
+	written = write(source, yd->auth + yd->auth_written, remaining);
 
 	if (written < 0 && errno == EAGAIN)
 		written = 0;
@@ -2380,22 +2378,35 @@
 		return;
 	}
 
-	if (written < total_len) {
+	if (written < remaining) {
 		yd->auth_written += written;
-		if (!gc->inpa)
-			gc->inpa = gaim_input_add(source, GAIM_INPUT_WRITE,
-				yahoo_got_cookies, gc);
 		return;
 	}
 
 	g_free(yd->auth);
 	yd->auth = NULL;
 	yd->auth_written = 0;
-	if (gc->inpa)
-		gaim_input_remove(gc->inpa);
+	gaim_input_remove(gc->inpa);
 	gc->inpa = gaim_input_add(source, GAIM_INPUT_READ, yahoo_web_pending, gc);
 }
 
+static void yahoo_got_cookies(gpointer data, gint source, GaimInputCondition cond)
+{
+	GaimConnection *gc = data;
+
+	if (source < 0) {
+		gaim_connection_error(gc, _("Unable to connect."));
+		return;
+	}
+
+	if (gc->inpa == 0)
+	{
+		gc->inpa = gaim_input_add(source, GAIM_INPUT_WRITE,
+			yahoo_got_cookies_send_cb, gc);
+		yahoo_got_cookies_send_cb(gc, source, GAIM_INPUT_WRITE);
+	}
+}
+
 static void yahoo_login_page_hash_iter(const char *key, const char *val, GString *url)
 {
 	if (!strcmp(key, "passwd"))

Modified: trunk/src/protocols/yahoo/yahoo_filexfer.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-08-11 08:01:16 UTC (rev 16704)
+++ trunk/src/protocols/yahoo/yahoo_filexfer.c	2006-08-11 08:08:19 UTC (rev 16705)
@@ -57,11 +57,45 @@
 	g_free(xd);
 }
 
+static void yahoo_receivefile_send_cb(gpointer data, gint source, GaimInputCondition condition)
+{
+	GaimXfer *xfer;
+	struct yahoo_xfer_data *xd;
+	int remaining, written;
+
+	xfer = data;
+	xd = xfer->data;
+
+	remaining = xd->txbuflen - xd->txbuf_written;
+	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, remaining);
+
+	if (written < 0 && errno == EAGAIN)
+		written = 0;
+	else if (written <= 0) {
+		gaim_debug_error("yahoo", "Unable to write in order to start ft errno = %d\n", errno);
+		gaim_xfer_cancel_remote(xfer);
+		return;
+	}
+
+	if (written < remaining) {
+		xd->txbuf_written += written;
+		return;
+	}
+
+	gaim_input_remove(xd->tx_handler);
+	xd->tx_handler = 0;
+	g_free(xd->txbuf);
+	xd->txbuf = NULL;
+	xd->txbuflen = 0;
+
+	gaim_xfer_start(xfer, source, NULL, 0);
+
+}
+
 static void yahoo_receivefile_connected(gpointer data, gint source, GaimInputCondition condition)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;
-	int total_len, written;
 
 	gaim_debug(GAIM_DEBUG_INFO, "yahoo",
 			   "AAA - in yahoo_receivefile_connected\n");
@@ -76,6 +110,8 @@
 		return;
 	}
 
+	xfer->fd = source;
+
 	/* The first time we get here, assemble the tx buffer */
 	if (xd->txbuflen == 0) {
 		xd->txbuf = g_strdup_printf("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
@@ -84,12 +120,26 @@
 		xd->txbuf_written = 0;
 	}
 
-	total_len = xd->txbuflen - xd->txbuf_written;
+	if (!xd->tx_handler)
+	{
+		xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
+			yahoo_receivefile_send_cb, xfer);
+		yahoo_receivefile_send_cb(xfer, source, GAIM_INPUT_WRITE);
+	}
+}
 
-	xfer->fd = source;
+static void yahoo_sendfile_send_cb(gpointer data, gint source, GaimInputCondition condition)
+{
+	GaimXfer *xfer;
+	struct yahoo_xfer_data *xd;
+	int written, remaining;
 
-	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, total_len);
+	xfer = data;
+	xd = xfer->data;
 
+	remaining = xd->txbuflen - xd->txbuf_written;
+	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, remaining);
+
 	if (written < 0 && errno == EAGAIN)
 		written = 0;
 	else if (written <= 0) {
@@ -98,31 +148,33 @@
 		return;
 	}
 
-	if (written < total_len) {
-		if (!xd->tx_handler)
-			xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
-				yahoo_receivefile_connected, xfer);
+	if (written < remaining) {
 		xd->txbuf_written += written;
 		return;
 	}
 
-	if (xd->tx_handler)
-		gaim_input_remove(xd->tx_handler);
+	gaim_input_remove(xd->tx_handler);
 	xd->tx_handler = 0;
 	g_free(xd->txbuf);
 	xd->txbuf = NULL;
 	xd->txbuflen = 0;
 
 	gaim_xfer_start(xfer, source, NULL, 0);
-
 }
 
-
 static void yahoo_sendfile_connected(gpointer data, gint source, GaimInputCondition condition)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;
-	int written, total_len;
+	struct yahoo_packet *pkt;
+	gchar *size, *filename, *encoded_filename, *header;
+	guchar *pkt_buf;
+	const char *host;
+	int port;
+	size_t content_length, header_len, pkt_buf_len;
+	GaimConnection *gc;
+	GaimAccount *account;
+	struct yahoo_data *yd;
 
 	gaim_debug(GAIM_DEBUG_INFO, "yahoo",
 			   "AAA - in yahoo_sendfile_connected\n");
@@ -131,7 +183,6 @@
 	if (!(xd = xfer->data))
 		return;
 
-
 	if (source < 0) {
 		gaim_xfer_error(GAIM_XFER_RECEIVE, gaim_xfer_get_account(xfer),
 				xfer->who, _("Unable to connect."));
@@ -139,96 +190,61 @@
 		return;
 	}
 
-	/* The first time we get here, assemble the tx buffer */
-	if (xd->txbuflen == 0) {
-		struct yahoo_packet *pkt;
-		gchar *size, *filename, *encoded_filename, *header;
-		guchar *pkt_buf;
-		const char *host;
-		int port;
-		size_t content_length, header_len, pkt_buf_len;
-		GaimConnection *gc;
-		GaimAccount *account;
-		struct yahoo_data *yd;
+	xfer->fd = source;
 
-		gc = xd->gc;
-		account = gaim_connection_get_account(gc);
-		yd = gc->proto_data;
+	/* Assemble the tx buffer */
+	gc = xd->gc;
+	account = gaim_connection_get_account(gc);
+	yd = gc->proto_data;
 
-		pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANSFER,
-			YAHOO_STATUS_AVAILABLE, yd->session_id);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANSFER,
+		YAHOO_STATUS_AVAILABLE, yd->session_id);
 
-		size = g_strdup_printf("%" G_GSIZE_FORMAT, gaim_xfer_get_size(xfer));
-		filename = g_path_get_basename(gaim_xfer_get_local_filename(xfer));
-		encoded_filename = yahoo_string_encode(gc, filename, NULL);
+	size = g_strdup_printf("%" G_GSIZE_FORMAT, gaim_xfer_get_size(xfer));
+	filename = g_path_get_basename(gaim_xfer_get_local_filename(xfer));
+	encoded_filename = yahoo_string_encode(gc, filename, NULL);
 
-		yahoo_packet_hash(pkt, "sssss", 0, gaim_connection_get_display_name(gc),
-			  5, xfer->who, 14, "", 27, encoded_filename, 28, size);
-		g_free(size);
-		g_free(encoded_filename);
-		g_free(filename);
+	yahoo_packet_hash(pkt, "sssss", 0, gaim_connection_get_display_name(gc),
+	  5, xfer->who, 14, "", 27, encoded_filename, 28, size);
+	g_free(size);
+	g_free(encoded_filename);
+	g_free(filename);
 
-		content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);
+	content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);
 
-		pkt_buf_len = yahoo_packet_build(pkt, 8, FALSE, &pkt_buf);
-		yahoo_packet_free(pkt);
+	pkt_buf_len = yahoo_packet_build(pkt, 8, FALSE, &pkt_buf);
+	yahoo_packet_free(pkt);
 
-		host = gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
-		port = gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
-		header = g_strdup_printf(
-			"POST http://%s:%d/notifyft HTTP/1.0\r\n"
-			"Content-length: %" G_GSIZE_FORMAT "\r\n"
-			"Host: %s:%d\r\n"
-			"Cookie: Y=%s; T=%s\r\n"
-			"\r\n",
-			host, port, content_length + 4 + gaim_xfer_get_size(xfer),
-			host, port, yd->cookie_y, yd->cookie_t);
+	host = gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
+	port = gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
+	header = g_strdup_printf(
+		"POST http://%s:%d/notifyft HTTP/1.0\r\n"
+		"Content-length: %" G_GSIZE_FORMAT "\r\n"
+		"Host: %s:%d\r\n"
+		"Cookie: Y=%s; T=%s\r\n"
+		"\r\n",
+		host, port, content_length + 4 + gaim_xfer_get_size(xfer),
+		host, port, yd->cookie_y, yd->cookie_t);
 
+	header_len = strlen(header);
 
-		header_len = strlen(header);
+	xd->txbuflen = header_len + pkt_buf_len + 4;
+	xd->txbuf = g_malloc(xd->txbuflen);
 
-		xd->txbuflen = header_len + pkt_buf_len + 4;
-		xd->txbuf = g_malloc(xd->txbuflen);
+	memcpy(xd->txbuf, header, header_len);
+	g_free(header);
+	memcpy(xd->txbuf + header_len, pkt_buf, pkt_buf_len);
+	g_free(pkt_buf);
+	memcpy(xd->txbuf + header_len + pkt_buf_len, "29\xc0\x80", 4);
 
-		memcpy(xd->txbuf, header, header_len);
-		g_free(header);
-		memcpy(xd->txbuf + header_len, pkt_buf, pkt_buf_len);
-		g_free(pkt_buf);
-		memcpy(xd->txbuf + header_len + pkt_buf_len, "29\xc0\x80", 4);
+	xd->txbuf_written = 0;
 
-		xd->txbuf_written = 0;
+	if (xd->tx_handler == 0)
+	{
+		xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
+										yahoo_sendfile_send_cb, xfer);
+		yahoo_sendfile_send_cb(xfer, source, GAIM_INPUT_WRITE);
 	}
-
-	total_len = xd->txbuflen - xd->txbuf_written;
-
-	xfer->fd = source;
-
-	written = write(xfer->fd, xd->txbuf + xd->txbuf_written, total_len);
-
-	if (written < 0 && errno == EAGAIN)
-		written = 0;
-	else if (written <= 0) {
-		gaim_debug_error("yahoo", "Unable to write in order to start ft errno = %d\n", errno);
-		gaim_xfer_cancel_remote(xfer);
-		return;
-	}
-
-	if (written < total_len) {
-		if (!xd->tx_handler)
-			xd->tx_handler = gaim_input_add(source, GAIM_INPUT_WRITE,
-				yahoo_sendfile_connected, xfer);
-		xd->txbuf_written += written;
-		return;
-	}
-
-	if (xd->tx_handler)
-		gaim_input_remove(xd->tx_handler);
-	xd->tx_handler = 0;
-	g_free(xd->txbuf);
-	xd->txbuf = NULL;
-	xd->txbuflen = 0;
-
-	gaim_xfer_start(xfer, source, NULL, 0);
 }
 
 static void yahoo_xfer_init(GaimXfer *xfer)

Modified: trunk/src/protocols/yahoo/yahoochat.c
===================================================================
--- trunk/src/protocols/yahoo/yahoochat.c	2006-08-11 08:01:16 UTC (rev 16704)
+++ trunk/src/protocols/yahoo/yahoochat.c	2006-08-11 08:08:19 UTC (rev 16705)
@@ -1335,38 +1335,22 @@
 	yrl->rxlen = 0;
 }
 
-static void yahoo_roomlist_got_connected(gpointer data, gint source, GaimInputCondition cond)
+static void yahoo_roomlist_send_cb(gpointer data, gint source, GaimInputCondition cond)
 {
-	struct yahoo_roomlist *yrl = data;
-	GaimRoomlist *list = yrl->list;
-	struct yahoo_data *yd = gaim_account_get_connection(list->account)->proto_data;
-	int written, total_len;
+	struct yahoo_roomlist *yrl;
+	GaimRoomlist *list;
+	int written, remaining;
 
-	if (source < 0) {
-		gaim_notify_error(gaim_account_get_connection(list->account), NULL, _("Unable to connect"), _("Fetching the room list failed."));
-		yahoo_roomlist_cleanup(list, yrl);
-		return;
-	}
+	yrl = data;
+	list = yrl->list;
 
-	if (yrl->txbuf == NULL) {
-		yrl->fd = source;
+	remaining = strlen(yrl->txbuf) - yrl->tx_written;
+	written = write(yrl->fd, yrl->txbuf + yrl->tx_written, remaining);
 
-		yrl->txbuf = g_strdup_printf(
-			"GET http://%s/%s HTTP/1.0\r\n"
-			"Host: %s\r\n"
-			"Cookie: Y=%s; T=%s\r\n\r\n",
-			yrl->host, yrl->path, yrl->host, yd->cookie_y,
-			yd->cookie_t);
-	}
-
-	total_len = strlen(yrl->txbuf) - yrl->tx_written;
-	written = write(yrl->fd, yrl->txbuf + yrl->tx_written, total_len);
-
 	if (written < 0 && errno == EAGAIN)
 		written = 0;
 	else if (written <= 0) {
-		if (yrl->inpa)
-			gaim_input_remove(yrl->inpa);
+		gaim_input_remove(yrl->inpa);
 		yrl->inpa = 0;
 		g_free(yrl->txbuf);
 		yrl->txbuf = NULL;
@@ -1375,24 +1359,47 @@
 		return;
 	}
 
-	if (written < total_len) {
-		if (!yrl->inpa)
-			yrl->inpa = gaim_input_add(yrl->fd,
-				GAIM_INPUT_WRITE, yahoo_roomlist_got_connected,
-				yrl);
+	if (written < remaining) {
 		yrl->tx_written += written;
 		return;
 	}
 
 	g_free(yrl->txbuf);
 	yrl->txbuf = NULL;
-	if (yrl->inpa)
-		gaim_input_remove(yrl->inpa);
+
+	gaim_input_remove(yrl->inpa);
 	yrl->inpa = gaim_input_add(yrl->fd, GAIM_INPUT_READ,
-		yahoo_roomlist_pending, yrl);
+							   yahoo_roomlist_pending, yrl);
 
 }
 
+static void yahoo_roomlist_got_connected(gpointer data, gint source, GaimInputCondition cond)
+{
+	struct yahoo_roomlist *yrl = data;
+	GaimRoomlist *list = yrl->list;
+	struct yahoo_data *yd = gaim_account_get_connection(list->account)->proto_data;
+
+	if (source < 0) {
+		gaim_notify_error(gaim_account_get_connection(list->account), NULL, _("Unable to connect"), _("Fetching the room list failed."));
+		yahoo_roomlist_cleanup(list, yrl);
+		return;
+	}
+
+	yrl->fd = source;
+
+	yrl->txbuf = g_strdup_printf(
+		"GET http://%s/%s HTTP/1.0\r\n"
+		"Host: %s\r\n"
+		"Cookie: Y=%s; T=%s\r\n\r\n",
+		yrl->host, yrl->path, yrl->host, yd->cookie_y,
+		yd->cookie_t);
+
+
+	yrl->inpa = gaim_input_add(yrl->fd, GAIM_INPUT_WRITE,
+							   yahoo_roomlist_send_cb, yrl);
+	yahoo_roomlist_send_cb(yrl, yrl->fd, GAIM_INPUT_WRITE);
+}
+
 GaimRoomlist *yahoo_roomlist_get_list(GaimConnection *gc)
 {
 	struct yahoo_roomlist *yrl;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.