pidgin3: comparison src/protocols/irc/irc.c

-:4d210254a6c8
+:40e3588a280f
 	int fd;
 	int inpa;
 	char nick[80];
 };
-struct irc_file_transfer {
+struct irc_xfer_data
-	enum { IFT_SENDFILE_IN, IFT_SENDFILE_OUT } type;
+{
-	struct file_transfer *xfer;
+	char *ip;
-	char *sn;
-	char *name;
-	int len;
-	int watcher;
-	int awatcher;
-	char ip[12];
 	int port;
-	int fd;
-	int cur;
+	struct irc_data *idata;
-	struct gaim_connection *gc;
 };
 struct irc_data {
 	int fd;
 	gboolean online;
 								time(NULL));
 		dcc_chat_cancel (chat);
 	}
 }
-static void
-irc_file_transfer_do(struct gaim_connection *gc, struct irc_file_transfer *ift) {
-	/* Ok, we better be receiving some crap here boyeee */
-	if (transfer_in_do(ift->xfer, ift->fd, ift->name, ift->len)) {
-		gaim_input_remove(ift->watcher);
-		ift->watcher = 0;
-	}
-}
 void
 irc_read_dcc_ack (gpointer data, gint source, GaimInputCondition condition) {
 	/* Read ACK Here */
 }
 void
 dcc_send_callback (gpointer data, gint source, GaimInputCondition condition) {
+#if 0
 	struct irc_file_transfer *ift = data;
 	struct sockaddr_in addr;
 	int len = sizeof(addr);
 	addr.sin_family = AF_INET;
 	if (transfer_out_do(ift->xfer, ift->fd, 0)) {
 		gaim_input_remove(ift->watcher);
 		ift->watcher = 0;
 	}
-}
+#endif
-void
-dcc_recv_callback (gpointer data, gint source, GaimInputCondition condition) {
-	struct irc_file_transfer *ift = data;
-	ift->fd = source;
-	irc_file_transfer_do(ift->gc, ift);
 }
 void
 dcc_chat_callback (gpointer data, gint source, GaimInputCondition condition) {
 	struct dcc_chat *chat = data;
 		return;
 	dcc_chat_cancel(dchat);
 }
+static void
+irc_xfer_init(struct gaim_xfer *xfer)
+{
+	struct irc_xfer_data *data = (struct irc_xfer_data *)xfer->data;
+	gaim_xfer_start(xfer, -1, data->ip, data->port);
+}
+static void
+irc_xfer_end(struct gaim_xfer *xfer)
+{
+	struct irc_xfer_data *data = (struct irc_xfer_data *)xfer->data;
+	data->idata->file_transfers = g_slist_remove(data->idata->file_transfers,
+												 xfer);
+	g_free(data);
+	xfer->data = NULL;
+}
+static void
+irc_xfer_cancel(struct gaim_xfer *xfer)
+{
+	struct irc_xfer_data *data = (struct irc_xfer_data *)xfer->data;
+	data->idata->file_transfers = g_slist_remove(data->idata->file_transfers,
+												 xfer);
+	g_free(data);
+	xfer->data = NULL;
+}
+static void
+irc_xfer_ack(struct gaim_xfer *xfer)
+{
+	guint32 pos;
+	pos = htonl(gaim_xfer_get_bytes_sent(xfer));
+	gaim_xfer_write(xfer, (char *)&pos, 4);
+}
 static void
 handle_ctcp(struct gaim_connection *gc, char *to, char *nick,
 			char *msg, char *word[], char *word_eol[])
 {
 	struct irc_data *id = gc->proto_data;
 		do_ask_dialog(ask, _("This requires a direct connection to be established between the two computers.  Messages sent will not pass through the IRC server"), dccchat, _("Connect"), dcc_chat_init, _("Cancel"), dcc_chat_cancel, my_protocol->plug ? my_protocol->plug->handle : NULL, FALSE);
 	}
 	if (!g_strncasecmp(msg, "DCC SEND", 8)) {
-		struct irc_file_transfer *ift = g_new0(struct irc_file_transfer, 1);
+		struct gaim_xfer *xfer;
-		char **send_args = g_strsplit(msg, " ", 6);
+		char **send_args;
+		char *ip, *filename;
+		struct irc_xfer_data *xfer_data;
+		size_t size;
+		int port;
+		send_args = g_strsplit(msg, " ", 6);
 		send_args[5][strlen(send_args[5])-1] = 0;
-		ift->type = IFT_SENDFILE_IN;
+		/* Give these better names. */
-		ift->sn = g_strdup(nick);
+		ip       = send_args[3];
-		ift->gc = gc;
+		filename = send_args[2];
-		g_snprintf(ift->ip, sizeof(ift->ip), send_args[3]);
+		size     = atoi(send_args[5]);
-		ift->port = atoi(send_args[4]);
+		port     = atoi(send_args[4]);
-		ift->len = atoi(send_args[5]);
-		ift->name = g_strdup(send_args[2]);
+		/* Setup the IRC-specific transfer data. */
-		ift->cur = 0;
+		xfer_data = g_malloc0(sizeof(struct irc_xfer_data));
+		xfer_data->ip    = ip;
-		id->file_transfers = g_slist_append(id->file_transfers, ift);
+		xfer_data->port  = port;
+		xfer_data->idata = id;
-		ift->xfer = transfer_in_add(gc, nick, ift->name, ift->len, 1, NULL);
+		/* Build the file transfer handle. */
+		xfer = gaim_xfer_new(gc->account, GAIM_XFER_RECEIVE, nick);
+		xfer->data = xfer_data;
+		/* Set the info about the incoming file. */
+		gaim_xfer_set_filename(xfer, filename);
+		gaim_xfer_set_size(xfer, size);
+		g_free(filename);
+		/* Setup our I/O op functions. */
+		gaim_xfer_set_init_fnc(xfer,   irc_xfer_init);
+		gaim_xfer_set_end_fnc(xfer,    irc_xfer_end);
+		gaim_xfer_set_cancel_fnc(xfer, irc_xfer_cancel);
+		gaim_xfer_set_ack_fnc(xfer,    irc_xfer_ack);
+		/* Keep track of this transfer for later. */
+		id->file_transfers = g_slist_append(id->file_transfers, xfer);
+		/* Now perform the request! */
+		gaim_xfer_request(xfer);
+#if 0
+		if (xfer != NULL) {
+			struct irc_file_transfer *ift;
+			gaim_xfer_set_read_fnc(xfer,   irc_xfer_read);
+			gaim_xfer_set_cancel_fnc(xfer, irc_xfer_cancel);
+			gaim_xfer_set_ack_fnc(xfer, irc_xfer_ack);
+			ift = g_new0(struct irc_file_transfer, 1);
+			strncpy(ift->ip, send_args[3], sizeof(ift->ip));
+			ift->type = IFT_SENDFILE_IN;
+			ift->sn   = g_strdup(nick);
+			ift->gc   = gc;
+			ift->port = atoi(send_args[4]);
+			ift->len  = atoi(send_args[5]);
+			ift->name = g_strdup(send_args[2]);
+			ift->cur  = 0;
+			ift->xfer = xfer;
+			xfer->data = ift;
+			gaim_xfer_start(xfer, -1, send_args[3], atoi(send_args[4]));
+		}
+#endif
 	}
 	/*write_to_conv(c, out, WFLAG_SYSTEM, NULL, time(NULL), -1);*/
 }
 	idata->rxqueue = NULL;
 	idata->rxlen = 0;
 	/* Kill any existing transfers */
 	while (idata->file_transfers) {
-		struct irc_file_transfer *ift = (struct irc_file_transfer *)idata->file_transfers->data;
+		struct gaim_xfer *xfer;
-		g_free(ift->sn);
+		xfer = (struct gaim_xfer *)idata->file_transfers->data;
-		g_free(ift->name);
-		gaim_input_remove(ift->watcher);
+		gaim_xfer_end(xfer);
+		gaim_xfer_destroy(xfer);
-		close(ift->fd);
 		idata->file_transfers = idata->file_transfers->next;
 	}
 	idata->file_transfers = NULL;
 	snprintf(ift->ip, sizeof(ift->ip), "%s", localip);
 	id->file_transfers = g_slist_append(id->file_transfers, ift);
 	ift->xfer = transfer_out_add(gc, ift->sn);
 }
-#endif
 static struct
 irc_file_transfer *find_ift_by_xfer(struct gaim_connection *gc,
-						  struct file_transfer *xfer) {
+									struct file_transfer *xfer) {
 	GSList *g = ((struct irc_data *)gc->proto_data)->file_transfers;
 	struct irc_file_transfer *f = NULL;
 	while (g) {
 	struct irc_file_transfer *ift = find_ift_by_xfer(gc, xfer);
 	ift->xfer = xfer;
 	proxy_connect(ift->ip, ift->port, dcc_recv_callback, ift);
 }
+#endif
 static void
 irc_ctcp_clientinfo(struct gaim_connection *gc, char *who)
 {
 	char buf[IRC_BUF_LEN];
 	ret->set_away = irc_set_away;
 	ret->get_info = irc_get_info;
 	ret->buddy_menu = irc_buddy_menu;
 	ret->chat_invite = irc_chat_invite;
 	ret->convo_closed = irc_convo_closed;
+#if 0
 	ret->file_transfer_out = irc_file_transfer_out;
 	ret->file_transfer_in = irc_file_transfer_in;
 	ret->file_transfer_data_chunk = irc_file_transfer_data_chunk;
 	ret->file_transfer_done = irc_file_transfer_done;
 	ret->file_transfer_cancel =irc_file_transfer_cancel;
+#endif
 	puo = g_new0(struct proto_user_opt, 1);
 	puo->label = g_strdup(_("Server:"));
 	puo->def = g_strdup("irc.freenode.net");
 	puo->pos = USEROPT_SERV;

Mercurial > pidgin3 / file comparison

comparison: src/protocols/irc/irc.c

src/protocols/irc/irc.c