comparison libpurple/protocols/yahoo/yahoo.c @ 25069:262ae5f56a9a

Better naming convention, prefix YAHOO_P2PSTATUS_ to values in the enum YahooP2PStatus

25068:7bd420b3edb7

					purple_blist_add_buddy(b, NULL, g, NULL);
				}
				yahoo_do_group_check(account, ht, norm_bud, yd->current_list15_grp);
				
				/*set p2p status not connected and no p2p packet sent*/
				yahoo_friend_set_p2p_status(f, NOT_CONNECTED);
				f->p2p_packet_sent = 0;

			} else {
				/* This buddy is on the ignore list (and therefore in no group) */
				purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n",

					export = TRUE;
				}

				yahoo_do_group_check(account, ht, norm_bud, grp);
				/*set p2p status not connected and no p2p packet sent*/
				yahoo_friend_set_p2p_status(f, NOT_CONNECTED);
				f->p2p_packet_sent = 0;

				g_free(norm_bud);
			}
			g_strfreev(buddies);

		f = yahoo_friend_find_or_new(gc, who);
		yahoo_update_status(gc, who, f);
		
		if( !g_hash_table_lookup(yd->peers, who) )	{
			/*we are not connected as client, so set friend to not connected*/
			yahoo_friend_set_p2p_status(f, NOT_CONNECTED);
			f->p2p_packet_sent = 0;
		}
		else	/*we are already connected. set friend to CONNECTED_AS_CLIENT*/
			yahoo_friend_set_p2p_status(f, CONNECTED_AS_CLIENT);
		return;
	}

	decoded_group = yahoo_string_decode(gc, group, FALSE);
	buf = g_strdup_printf(_("Could not add buddy %s to group %s to the server list on account %s."),

		return ;

	/*If friend, set him not connected*/
	f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username);
	if (f)
		yahoo_friend_set_p2p_status(f, NOT_CONNECTED);

	if(p2p_data->source >= 0)
		close(p2p_data->source);
	purple_input_remove(p2p_data->input_event);
	g_free(p2p_data->host_ip);

	close(yd->yahoo_local_p2p_server_fd);
	yd->yahoo_local_p2p_server_fd = -1;

	if( (f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username)) )	{
		p2p_data->session_id = f->session_id;
		yahoo_friend_set_p2p_status(f, CONNECTED_AS_SERVER);
	}

	/*Add an Input Read event to the file descriptor*/
	p2p_data->input_event = purple_input_add(acceptfd, PURPLE_INPUT_READ, yahoo_p2p_read_pkt_cb, data);
	p2p_data->source = acceptfd;

	f = yahoo_friend_find(gc, who);
	account = purple_connection_get_account(gc);

	/*send packet to only those friends who arent p2p connected and to whom we havent already sent. Do not send if this condition doesn't hold good*/ 
	if( !( f && (yahoo_friend_get_p2p_status(f) == NOT_CONNECTED) && (f->p2p_packet_sent == 0)) )
		return;

	pkt = yahoo_packet_new(YAHOO_SERVICE_PEERTOPEER, YAHOO_STATUS_AVAILABLE, 0);
	yahoo_packet_hash(pkt, "sssissis",
		1, purple_normalize(account, purple_account_get_username(account)),

	g_hash_table_insert(yd->peers, g_strdup(p2p_data->host_username), p2p_data);
	
	/*If the peer is a friend, set him connected*/
	f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username);
	if (f)
		yahoo_friend_set_p2p_status(f, CONNECTED_AS_CLIENT);

	account = purple_connection_get_account(p2p_data->gc);

	/*Build the yahoo packet*/
	pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, yd->session_id);

25069:262ae5f56a9a

					purple_blist_add_buddy(b, NULL, g, NULL);
				}
				yahoo_do_group_check(account, ht, norm_bud, yd->current_list15_grp);
				
				/*set p2p status not connected and no p2p packet sent*/
				yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);
				f->p2p_packet_sent = 0;

			} else {
				/* This buddy is on the ignore list (and therefore in no group) */
				purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n",

					export = TRUE;
				}

				yahoo_do_group_check(account, ht, norm_bud, grp);
				/*set p2p status not connected and no p2p packet sent*/
				yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);
				f->p2p_packet_sent = 0;

				g_free(norm_bud);
			}
			g_strfreev(buddies);

		f = yahoo_friend_find_or_new(gc, who);
		yahoo_update_status(gc, who, f);
		
		if( !g_hash_table_lookup(yd->peers, who) )	{
			/*we are not connected as client, so set friend to not connected*/
			yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);
			f->p2p_packet_sent = 0;
		}
		else	/*we are already connected. set friend to YAHOO_P2PSTATUS_WE_ARE_CLIENT*/
			yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_WE_ARE_CLIENT);
		return;
	}

	decoded_group = yahoo_string_decode(gc, group, FALSE);
	buf = g_strdup_printf(_("Could not add buddy %s to group %s to the server list on account %s."),

		return ;

	/*If friend, set him not connected*/
	f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username);
	if (f)
		yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_NOT_CONNECTED);

	if(p2p_data->source >= 0)
		close(p2p_data->source);
	purple_input_remove(p2p_data->input_event);
	g_free(p2p_data->host_ip);

	close(yd->yahoo_local_p2p_server_fd);
	yd->yahoo_local_p2p_server_fd = -1;

	if( (f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username)) )	{
		p2p_data->session_id = f->session_id;
		yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_WE_ARE_SERVER);
	}

	/*Add an Input Read event to the file descriptor*/
	p2p_data->input_event = purple_input_add(acceptfd, PURPLE_INPUT_READ, yahoo_p2p_read_pkt_cb, data);
	p2p_data->source = acceptfd;

	f = yahoo_friend_find(gc, who);
	account = purple_connection_get_account(gc);

	/*send packet to only those friends who arent p2p connected and to whom we havent already sent. Do not send if this condition doesn't hold good*/ 
	if( !( f && (yahoo_friend_get_p2p_status(f) == YAHOO_P2PSTATUS_NOT_CONNECTED) && (f->p2p_packet_sent == 0)) )
		return;

	pkt = yahoo_packet_new(YAHOO_SERVICE_PEERTOPEER, YAHOO_STATUS_AVAILABLE, 0);
	yahoo_packet_hash(pkt, "sssissis",
		1, purple_normalize(account, purple_account_get_username(account)),

	g_hash_table_insert(yd->peers, g_strdup(p2p_data->host_username), p2p_data);
	
	/*If the peer is a friend, set him connected*/
	f = yahoo_friend_find(p2p_data->gc, p2p_data->host_username);
	if (f)
		yahoo_friend_set_p2p_status(f, YAHOO_P2PSTATUS_WE_ARE_CLIENT);

	account = purple_connection_get_account(p2p_data->gc);

	/*Build the yahoo packet*/
	pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, yd->session_id);