pidgin: libpurple/ft.c comparison

comparison libpurple/ft.c @ 27878:b7b25f580637

ft: Add infrastructure to allow a prpl to moderate when to send packets. The file transfer subsystem should now allow a prpl to serialize packets (the way XMPP IBB does, where we wait for an ACK before sending the next packet.) I think this will also be usable for msn and any other prpls that currently try to open the local file manually.

author	Paul Aurich <paul@darkrain42.org>
date	Wed, 12 Aug 2009 04:31:17 +0000
parents	7754717d574c
children	dad4cb8f81df

comparison

equal deleted inserted replaced

-:e502112a03e7
+:b7b25f580637
 #define FT_MAX_BUFFER_SIZE     65535
 static PurpleXferUiOps *xfer_ui_ops = NULL;
 static GList *xfers;
+/*
+* A hack to store more data since we can't extend the size of PurpleXfer
+* easily.
+*/
+static GHashTable *xfers_data = NULL;
+typedef struct _PurpleXferPrivData {
+	/*
+	 * Used to moderate the file transfer when either the read/write ui_ops are
+	 * set or fd is not set. In those cases, the UI/prpl call the respective
+	 * function, which is somewhat akin to a fd watch being triggered.
+	 */
+	enum {
+		PURPLE_XFER_READY_NONE = 0x0,
+		PURPLE_XFER_READY_UI   = 0x1,
+		PURPLE_XFER_READY_PRPL = 0x2,
+	} ready;
+} PurpleXferPrivData;
 static int purple_xfer_choose_file(PurpleXfer *xfer);
+static void
+purple_xfer_priv_data_destroy(gpointer data)
+{
+	PurpleXferPrivData *priv = data;
+	g_free(priv);
+}
 GList *
 purple_xfers_get_all()
 {
 	return xfers;
 PurpleXfer *
 purple_xfer_new(PurpleAccount *account, PurpleXferType type, const char *who)
 {
 	PurpleXfer *xfer;
 	PurpleXferUiOps *ui_ops;
+	PurpleXferPrivData *priv;
 	g_return_val_if_fail(type    != PURPLE_XFER_UNKNOWN, NULL);
 	g_return_val_if_fail(account != NULL,              NULL);
 	g_return_val_if_fail(who     != NULL,              NULL);
 	xfer->ui_ops  = purple_xfers_get_ui_ops();
 	xfer->message = NULL;
 	xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	xfer->fd = -1;
+	priv = g_new0(PurpleXferPrivData, 1);
+	priv->ready = PURPLE_XFER_READY_NONE;
+	g_hash_table_insert(xfers_data, xfer, priv);
 	ui_ops = purple_xfer_get_ui_ops(xfer);
 	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
 		ui_ops->new_xfer(xfer);
 	g_free(xfer->who);
 	g_free(xfer->filename);
 	g_free(xfer->remote_ip);
 	g_free(xfer->local_filename);
+	g_hash_table_remove(xfers_data, xfer);
 	PURPLE_DBUS_UNREGISTER_POINTER(xfer);
+	xfers = g_list_remove(xfers, xfer);
 	g_free(xfer);
-	xfers = g_list_remove(xfers, xfer);
 }
 void
 purple_xfer_ref(PurpleXfer *xfer)
 {
 	return r;
 }
 static void
-transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+do_transfer(PurpleXfer *xfer)
 {
 	PurpleXferUiOps *ui_ops;
-	PurpleXfer *xfer = (PurpleXfer *)data;
 	guchar *buffer = NULL;
 	gssize r = 0;
 	ui_ops = purple_xfer_get_ui_ops(xfer);
-	if (condition & PURPLE_INPUT_READ) {
+	if (xfer->type == PURPLE_XFER_RECEIVE) {
 		r = purple_xfer_read(xfer, &buffer);
 		if (r > 0) {
 			size_t wc;
 			if (ui_ops && ui_ops->write)
 				wc = ui_ops->write(xfer, buffer, r);
 		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
 		}
-	} else if (condition & PURPLE_INPUT_WRITE) {
+	} else if (xfer->type == PURPLE_XFER_SEND) {
 		size_t result;
 		size_t s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);
 		/* this is so the prpl can keep the connection open
 		   if it needs to for some odd reason. */
 	if (purple_xfer_is_completed(xfer))
 		purple_xfer_end(xfer);
 }
 static void
+transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+{
+	PurpleXfer *xfer = data;
+	if (xfer->dest_fp == NULL) {
+		/* The UI is moderating its side manually */
+		PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+		if (0 == (priv->ready & PURPLE_XFER_READY_UI)) {
+			priv->ready |= PURPLE_XFER_READY_PRPL;
+			purple_input_remove(xfer->watcher);
+			xfer->watcher = 0;
+			return;
+		}
+	}
+	do_transfer(xfer);
+}
+static void
 begin_transfer(PurpleXfer *xfer, PurpleInputCondition cond)
 {
 	PurpleXferType type = purple_xfer_get_type(xfer);
 	PurpleXferUiOps *ui_ops = purple_xfer_get_ui_ops(xfer);
 void
 purple_xfer_ui_ready(PurpleXfer *xfer)
 {
 	PurpleInputCondition cond;
 	PurpleXferType type;
+	PurpleXferPrivData *priv;
-	g_return_if_fail(xfer != NULL);
+	g_return_if_fail(xfer != NULL);
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_UI;
+	if (0 == (priv->ready & PURPLE_XFER_READY_PRPL))
+		return;
 	type = purple_xfer_get_type(xfer);
 	if (type == PURPLE_XFER_SEND)
 		cond = PURPLE_INPUT_WRITE;
 	else /* if (type == PURPLE_XFER_RECEIVE) */
 		cond = PURPLE_INPUT_READ;
 	if (xfer->watcher == 0 && xfer->fd != -1)
 		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
-	transfer_cb(xfer, 0, cond);
+	priv->ready = PURPLE_XFER_READY_NONE;
+	do_transfer(xfer);
+}
+void
+purple_xfer_prpl_ready(PurpleXfer *xfer)
+{
+	PurpleXferPrivData *priv;
+	g_return_if_fail(xfer != NULL);
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_PRPL;
+	/* I don't think fwrite/fread are ever *not* ready */
+	if (xfer->dest_fp == NULL && 0 == (priv->ready & PURPLE_XFER_READY_UI))
+		return;
+	priv->ready = PURPLE_XFER_READY_NONE;
+	do_transfer(xfer);
 }
 void
 purple_xfer_start(PurpleXfer *xfer, int fd, const char *ip,
 				unsigned int port)
 }
 void
 purple_xfers_init(void) {
 	void *handle = purple_xfers_get_handle();
+	xfers_data = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+	                                   NULL, purple_xfer_priv_data_destroy);
 	/* register signals */
 	purple_signal_register(handle, "file-recv-accept",
 	                     purple_marshal_VOID__POINTER, NULL, 1,
 	                     purple_value_new(PURPLE_TYPE_SUBTYPE,
 {
 	void *handle = purple_xfers_get_handle();
 	purple_signals_disconnect_by_handle(handle);
 	purple_signals_unregister_by_instance(handle);
+	g_hash_table_destroy(xfers_data);
+	xfers_data = NULL;
 }
 void
 purple_xfers_set_ui_ops(PurpleXferUiOps *ops) {
 	xfer_ui_ops = ops;

Mercurial > pidgin

comparison libpurple/ft.c @ 27878:b7b25f580637