soc.2008.yahoo: c66a4da9: Support for P2P file transfer (SEND), wh...

sulabh at soc.pidgin.im sulabh at soc.pidgin.im
Sat Jun 21 10:40:54 EDT 2008


-----------------------------------------------------------------
Revision: c66a4da969b9f9098f0cc8acda643bd53310f2a1
Ancestor: 4c8722ba3c06aafb7c469a8d00a1c7fb4f3953e5
Author: sulabh at soc.pidgin.im
Date: 2008-06-21T14:34:38
Branch: im.pidgin.soc.2008.yahoo
URL: http://d.pidgin.im/viewmtn/revision/info/c66a4da969b9f9098f0cc8acda643bd53310f2a1

Modified files:
        libpurple/protocols/yahoo/yahoo_filexfer.c

ChangeLog: 

Support for P2P file transfer (SEND), when we are client to the peer 

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo_filexfer.c	6214ac4aa72ea278f83992a7c4f71dcc14cf0110
+++ libpurple/protocols/yahoo/yahoo_filexfer.c	e14a3b0c06f1109f3ddf78872ef5571eb90a832a
@@ -1203,22 +1203,36 @@ static void yahoo_xfer_connected_15(gpoi
 		cookies = yahoo_get_cookies(xd->gc);
 		if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == ACCEPTED)
 		{
-			xd->txbuf = g_strdup_printf("POST /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\nCookie:%s\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost: %s\r\nContent-Length: %ld\r\nCache-Control: no-cache\r\n\r\n",
+			if(xd->info_val_249 == 2)
+				{
+				/*sending file via p2p, we are connected as client*/
+				xd->txbuf = g_strdup_printf("POST /%s HTTP/1.1\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost: %s\r\nContent-Length: %ld\r\nCache-Control: no-cache\r\n\r\n",
+										xd->path,
+										xd->host,
+										(long int)xfer->size);	/*to do, add Referer*/
+				}
+			else
+				{
+				/*sending file via relaying*/
+				xd->txbuf = g_strdup_printf("POST /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\nCookie:%s\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost: %s\r\nContent-Length: %ld\r\nCache-Control: no-cache\r\n\r\n",
 										purple_url_encode(xd->xfer_idstring_for_relay),
 										purple_normalize(account, purple_account_get_username(account)),
 										xfer->who,
 										cookies,
 										xd->host,
 										(long int)xfer->size);
+				}
 		}
 		else if(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE && xd->status_15 == STARTED)
 		{	
-			if(xd->info_val_249 == 1)	/*receiving file via p2p, if xd->info_val_249 is 1*/
+			if(xd->info_val_249 == 1)
 				{
+				/*receiving file via p2p, connected as client*/
 				xd->txbuf = g_strdup_printf("HEAD /%s HTTP/1.1\r\nAccept:*/*\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost: %s\r\nContent-Length: 0\r\nCache-Control: no-cache\r\n\r\n",xd->path,xd->host);
 			}
-			else	/*receiving file via relaying*/
+			else
 				{
+				/*receiving file via relaying*/
 				xd->txbuf = g_strdup_printf("HEAD /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\nAccept:*/*\r\nCookie:%s\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost:%s\r\nContent-Length: 0\r\nCache-Control: no-cache\r\n\r\n",
 										purple_url_encode(xd->xfer_idstring_for_relay),
 										purple_normalize(account, purple_account_get_username(account)),
@@ -1229,12 +1243,14 @@ static void yahoo_xfer_connected_15(gpoi
 		}
 		else if(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE && xd->status_15 == HEAD_REPLY_RECEIVED)
 		{
-			if(xd->info_val_249 == 1)	/*receiving file via p2p*/
+			if(xd->info_val_249 == 1)
 				{
+				/*receiving file via p2p, connected as client*/
 				xd->txbuf = g_strdup_printf("GET /%s HTTP/1.1\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost: %s\r\nConnection: Keep-Alive\r\n\r\n",xd->path,xd->host);
 			}
-			else		/*receiving file via relaying*/
+			else
 				{
+				/*receiving file via relaying*/
 				xd->txbuf = g_strdup_printf("GET /relay?token=%s&sender=%s&recver=%s HTTP/1.1\r\nCookie:%s\r\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\nHost:%s\r\nConnection: Keep-Alive\r\n\r\n",
 										purple_url_encode(xd->xfer_idstring_for_relay),
 										purple_normalize(account, purple_account_get_username(account)),
@@ -1262,6 +1278,36 @@ static void yahoo_xfer_connected_15(gpoi
 	}
 }
 
+/*send (p2p) file transfer information when we are connected as client*/
+static void yahoo_p2p_client_send_ft_info(PurpleConnection *gc, PurpleXfer *xfer)
+{
+	struct yahoo_xfer_data *xd;
+	struct yahoo_packet *pkt;
+	PurpleAccount *account;
+	struct yahoo_data *yd;
+	gchar *filename;
+
+	if (!(xd = xfer->data))
+		return;
+
+	account = purple_connection_get_account(gc);
+	yd = gc->proto_data;
+
+	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));
+
+	yahoo_packet_hash(pkt, "ssssi",
+		1, purple_normalize(account, purple_account_get_username(account)),
+		5, xfer->who,
+		265, xd->xfer_peer_idstring,
+		27,  filename,
+		249, 2);	/*249= 2:we are connected as p2p client, and sending file*/
+	xd->info_val_249 = 2;
+
+	g_free(filename);
+	yahoo_packet_send_and_free(pkt, yd);
+}
+
 void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	char *from = NULL;
@@ -1342,6 +1388,14 @@ void yahoo_process_filetrans_15(PurpleCo
 		*	so, purple dnsquery is used... but retries, trying with next ip
 		*	address etc. is not implemented..TODO
 		*/
+		
+		/*p2p connection exists, we being p2p client*/
+		if( g_hash_table_lookup(yd->peers, from) )	{
+			/*send p2p file transfer information when we are connected as client*/
+			yahoo_p2p_client_send_ft_info(gc, xfer);
+			return;
+		}
+
 		if (yd->jp)
 		{
 			purple_dnsquery_a(YAHOOJP_XFER_RELAY_HOST, YAHOOJP_XFER_RELAY_PORT,
@@ -1470,7 +1524,7 @@ void yahoo_process_filetrans_info_15(Pur
 			break;
 		case 249:
 			val_249 = strtol(pair->value, NULL, 10);
-			/* 249 has value 1 when doing p2p transfer and value 3 when relaying through yahoo server */
+			/* 249 has value 1 or 2 when doing p2p transfer and value 3 when relaying through yahoo server */
 			break;
 		case 250:
 			url = pair->value;
@@ -1537,6 +1591,8 @@ void yahoo_process_filetrans_acc_15(Purp
 	GSList *l;
 	PurpleAccount *account;
 	long val_66 = 0;
+	gchar *url = NULL;
+	int val_249;
 
 	yd = gc->proto_data;
 	for (l = pkt->hash; l; l = l->next) {
@@ -1551,19 +1607,35 @@ void yahoo_process_filetrans_acc_15(Purp
 			break;
 		case 66:
 			val_66 = atol(pair->value);
+			break;
+		case 249:
+			val_249 = atol(pair->value);
+			break;
+		case 250:
+			url = pair->value;	/*we get a p2p url here when sending file, connected as client*/
+			break;
 		}
 	}
 
 	xfer = g_hash_table_lookup(yd->xfer_peer_idstring_map, xfer_peer_idstring);
 	if(!xfer) return;
 
-	if(val_66 == -1 || !(xfer_idstring_for_relay))
+	if(val_66 == -1 || ( (!(xfer_idstring_for_relay)) && (val_249 != 2) ))
 	{
 		purple_xfer_cancel_remote(xfer);
 		return;
 	}
 
+	if( (val_249 == 2) && (!(url)) )
+	{
+		purple_xfer_cancel_remote(xfer);
+		return;
+	}
+
 	xfer_data = xfer->data;
+	if(url)
+		purple_url_parse(url, &(xfer_data->host), &(xfer_data->port), &(xfer_data->path), NULL, NULL);
+		
 	xfer_data->xfer_idstring_for_relay = g_strdup(xfer_idstring_for_relay);
 	xfer_data->status_15 = ACCEPTED;
 	account = purple_connection_get_account(gc);


More information about the Commits mailing list