comparison libpurple/protocols/yahoo/yahoo_filexfer.c @ 25065:d96190de653a

Add + in place of spaces in p2p url, fixes transfer of file with name containing spaces

25064:2fb8c39d0494

		return;
	}

	url_head = g_strdup_printf("HEAD %s", xd->xfer_url);
	url_get = g_strdup_printf("GET %s", xd->xfer_url);
	
	if( strncmp(url_head, (char *)buf, strlen(url_head)) == 0 )
		xd->status_15 = P2P_HEAD_REQUESTED;
	else if( strncmp(url_get, (char *)buf, strlen(url_get)) == 0 )
		xd->status_15 = P2P_GET_REQUESTED;
	else	{

	PurpleAccount *account;
	struct yahoo_data *yd;
	gchar *filename;
	const char *local_ip;
	gchar *url_to_send = NULL;

	xfer = data;
	if ( !( (xd = xfer->data) || (listenfd != -1) ) )	{
		purple_debug_warning("yahoo","p2p: error starting server for p2p file transfer\n");
		purple_xfer_cancel_remote(xfer);

		pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_INFO_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
		filename = g_path_get_basename(purple_xfer_get_local_filename(xfer));

		local_ip = purple_network_get_my_ip(listenfd);
		xd->yahoo_local_p2p_ft_server_port = purple_network_get_port_from_fd(listenfd);
		xd->xfer_url = g_strdup_printf("/Messenger.%s.%d000%s?AppID=Messenger&UserID=%s&K=lc9lu2u89gz1llmplwksajkjx", xfer->who, (int)time(NULL), filename, xfer->who);
		url_to_send = g_strdup_printf("http://%s:%d%s", local_ip, xd->yahoo_local_p2p_ft_server_port, xd->xfer_url);
		xd->info_val_249 = 1;	/* 249=1: we are p2p server */

		yahoo_packet_hash(pkt, "ssssis",
			1, purple_normalize(account, purple_account_get_username(account)),

			250, url_to_send);
		yahoo_packet_send_and_free(pkt, yd);

		g_free(filename);
		g_free(url_to_send);
	}

	/* Add an Input Read event to the file descriptor */
	xd->yahoo_local_p2p_ft_server_fd = listenfd;
	xd->yahoo_p2p_ft_server_watcher = purple_input_add(listenfd, PURPLE_INPUT_READ, yahoo_p2p_ft_server_send_connected_cb, data);

25065:d96190de653a

		return;
	}

	url_head = g_strdup_printf("HEAD %s", xd->xfer_url);
	url_get = g_strdup_printf("GET %s", xd->xfer_url);

	if( strncmp(url_head, (char *)buf, strlen(url_head)) == 0 )
		xd->status_15 = P2P_HEAD_REQUESTED;
	else if( strncmp(url_get, (char *)buf, strlen(url_get)) == 0 )
		xd->status_15 = P2P_GET_REQUESTED;
	else	{

	PurpleAccount *account;
	struct yahoo_data *yd;
	gchar *filename;
	const char *local_ip;
	gchar *url_to_send = NULL;
	char **split;
	char *filename_without_spaces = NULL;

	xfer = data;
	if ( !( (xd = xfer->data) || (listenfd != -1) ) )	{
		purple_debug_warning("yahoo","p2p: error starting server for p2p file transfer\n");
		purple_xfer_cancel_remote(xfer);

		pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_INFO_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
		filename = g_path_get_basename(purple_xfer_get_local_filename(xfer));

		local_ip = purple_network_get_my_ip(listenfd);
		xd->yahoo_local_p2p_ft_server_port = purple_network_get_port_from_fd(listenfd);

		split = g_strsplit(filename, " ", 0);
		filename_without_spaces = g_strjoinv("+", split);
		xd->xfer_url = g_strdup_printf("/Messenger.%s.%d000%s?AppID=Messenger&UserID=%s&K=lc9lu2u89gz1llmplwksajkjx", xfer->who, (int)time(NULL), filename_without_spaces, xfer->who);
		url_to_send = g_strdup_printf("http://%s:%d%s", local_ip, xd->yahoo_local_p2p_ft_server_port, xd->xfer_url);
		xd->info_val_249 = 1;	/* 249=1: we are p2p server */

		yahoo_packet_hash(pkt, "ssssis",
			1, purple_normalize(account, purple_account_get_username(account)),

			250, url_to_send);
		yahoo_packet_send_and_free(pkt, yd);

		g_free(filename);
		g_free(url_to_send);
		g_strfreev(split);
		g_free(filename_without_spaces);
	}

	/* Add an Input Read event to the file descriptor */
	xd->yahoo_local_p2p_ft_server_fd = listenfd;
	xd->yahoo_p2p_ft_server_watcher = purple_input_add(listenfd, PURPLE_INPUT_READ, yahoo_p2p_ft_server_send_connected_cb, data);