comparison libpurple/protocols/msn/slplink.c @ 30870:d9ca3798faa5

Get rid of the Flags field in the SlpMessage in favor of the one in the Header.

30869:320c6eb04e11

	/* Maybe we will want to create a new msg for this slpmsg instead of
	 * reusing the same one all the time. */
	part = msn_slpmsgpart_new(slpmsg->header, slpmsg->footer);
	part->ack_data = slpmsg;

	real_size = (slpmsg->flags == P2P_ACK) ? 0 : slpmsg->size;

	if (slpmsg->header->offset < real_size)
	{
		if (slpmsg->slpcall && slpmsg->slpcall->xfer && purple_xfer_get_type(slpmsg->slpcall->xfer) == PURPLE_XFER_SEND &&
				purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)

	slpmsg->parts = g_list_append(slpmsg->parts, part);
	msn_slplink_send_part(slplink, part);


	if (msn_p2p_msg_is_data(slpmsg->flags) &&
		(slpmsg->slpcall != NULL))
	{
		slpmsg->slpcall->progress = TRUE;

		if (slpmsg->slpcall->progress_cb != NULL)

msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
{
	slpmsg = slpmsg;
	slpmsg->footer = g_new0(MsnP2PFooter, 1);

	if (slpmsg->flags == P2P_NO_FLAG)
	{
		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
	}
	else if (msn_p2p_msg_is_data(slpmsg->flags))
	{
		MsnSlpCall *slpcall;
		slpcall = slpmsg->slpcall;

		g_return_if_fail(slpcall != NULL);

		slpmsg->footer->value = slpcall->app_id;
		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
	}

	slpmsg->header->id = slpmsg->id;
	slpmsg->header->flags = (guint32)slpmsg->flags;

	slpmsg->header->total_size = slpmsg->size;

	msn_slplink_send_msgpart(slplink, slpmsg);
}

	slpmsg = msn_slpmsg_new(slplink);
	slpmsg->id = header->id;
	slpmsg->header->session_id = header->session_id;
	slpmsg->size = header->total_size;
	slpmsg->flags = header->flags;

	if (slpmsg->header->session_id)
	{
		slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id);
		if (slpmsg->slpcall != NULL)
		{
			if (msn_p2p_msg_is_data(slpmsg->flags))
			{
				PurpleXfer *xfer = slpmsg->slpcall->xfer;
				if (xfer != NULL)
				{
					slpmsg->ft = TRUE;

		return;
	}

	purple_debug_info("msn", "msn_slplink_process_msg: slpmsg complete\n");

	if (/* !slpcall->wasted && */ slpmsg->flags == 0x100)
	{
#if 0
		MsnDirectConn *directconn;

		directconn = slplink->directconn;
		if (!directconn->acked)
			msn_directconn_send_handshake(directconn);
#endif
	}
	else if (slpmsg->flags == P2P_NO_FLAG || slpmsg->flags == P2P_WML2009_COMP ||
			msn_p2p_msg_is_data(slpmsg->flags))
	{
		/* Release all the messages and send the ACK */

		if (slpcall->wait_for_socket) {
			/*

	}

	slpmsg_add_part(slpmsg, part);


	if (msn_p2p_msg_is_data(slpmsg->flags) &&
		(slpmsg->slpcall != NULL))
	{
		slpmsg->slpcall->progress = TRUE;

		if (slpmsg->slpcall->progress_cb != NULL)

30870:d9ca3798faa5

	/* Maybe we will want to create a new msg for this slpmsg instead of
	 * reusing the same one all the time. */
	part = msn_slpmsgpart_new(slpmsg->header, slpmsg->footer);
	part->ack_data = slpmsg;

	real_size = (slpmsg->header->flags == P2P_ACK) ? 0 : slpmsg->size;

	if (slpmsg->header->offset < real_size)
	{
		if (slpmsg->slpcall && slpmsg->slpcall->xfer && purple_xfer_get_type(slpmsg->slpcall->xfer) == PURPLE_XFER_SEND &&
				purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)

	slpmsg->parts = g_list_append(slpmsg->parts, part);
	msn_slplink_send_part(slplink, part);


	if (msn_p2p_msg_is_data(slpmsg->header->flags) &&
		(slpmsg->slpcall != NULL))
	{
		slpmsg->slpcall->progress = TRUE;

		if (slpmsg->slpcall->progress_cb != NULL)

msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
{
	slpmsg = slpmsg;
	slpmsg->footer = g_new0(MsnP2PFooter, 1);

	if (slpmsg->header->flags == P2P_NO_FLAG)
	{
		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
	}
	else if (msn_p2p_msg_is_data(slpmsg->header->flags))
	{
		MsnSlpCall *slpcall;
		slpcall = slpmsg->slpcall;

		g_return_if_fail(slpcall != NULL);

		slpmsg->footer->value = slpcall->app_id;
		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
	}

	slpmsg->header->id = slpmsg->id;

	slpmsg->header->total_size = slpmsg->size;

	msn_slplink_send_msgpart(slplink, slpmsg);
}

	slpmsg = msn_slpmsg_new(slplink);
	slpmsg->id = header->id;
	slpmsg->header->session_id = header->session_id;
	slpmsg->size = header->total_size;
	slpmsg->header->flags = header->flags;

	if (slpmsg->header->session_id)
	{
		slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id);
		if (slpmsg->slpcall != NULL)
		{
			if (msn_p2p_msg_is_data(header->flags))
			{
				PurpleXfer *xfer = slpmsg->slpcall->xfer;
				if (xfer != NULL)
				{
					slpmsg->ft = TRUE;

		return;
	}

	purple_debug_info("msn", "msn_slplink_process_msg: slpmsg complete\n");

	if (/* !slpcall->wasted && */ slpmsg->header->flags == 0x100)
	{
#if 0
		MsnDirectConn *directconn;

		directconn = slplink->directconn;
		if (!directconn->acked)
			msn_directconn_send_handshake(directconn);
#endif
	}
	else if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP ||
			msn_p2p_msg_is_data(slpmsg->header->flags))
	{
		/* Release all the messages and send the ACK */

		if (slpcall->wait_for_socket) {
			/*

	}

	slpmsg_add_part(slpmsg, part);


	if (msn_p2p_msg_is_data(slpmsg->header->flags) &&
		(slpmsg->slpcall != NULL))
	{
		slpmsg->slpcall->progress = TRUE;

		if (slpmsg->slpcall->progress_cb != NULL)