comparison libpurple/protocols/msn/directconn.c @ 30066:28f774432954

Use msn_dc_fallback_to_p2p where possible.

30065:1efb52ff7ad0

	purple_debug_info("msn", "msn_dc_try_fallback_to_p2p %p\n", dc);

	g_return_if_fail(dc != NULL);

	slpcall = dc->slpcall;
	g_return_if_fail(slpcall != NULL);

	msn_dc_destroy(dc);

	msn_slpcall_session_init(slpcall);
}

static void
msn_dc_parse_binary_header(MsnDirectConn *dc)
{

		close(dc->listenfd);
		dc->listenfd = -1;
	}

	dc->connect_timeout_handle = 0;
	msn_dc_destroy(dc);

	/* Start p2p file transfer, if possible */
	if (slpcall)
		msn_slpcall_session_init(slpcall);

	return FALSE;
}

/*

	} else {
		/*
		 * Both internal and external connection attempts failed.
		 * Fall back to p2p transfer.
		 */
		MsnSlpCall *slpcall = dc->slpcall;

		msn_dc_destroy(dc);
		/* Start p2p file transfer, if possible */
		if (slpcall)
			msn_slpcall_session_init(slpcall);
	}

	return FALSE;
}

30066:28f774432954

	purple_debug_info("msn", "msn_dc_try_fallback_to_p2p %p\n", dc);

	g_return_if_fail(dc != NULL);

	slpcall = dc->slpcall;

	msn_dc_destroy(dc);

	if (slpcall)
		msn_slpcall_session_init(slpcall);
}

static void
msn_dc_parse_binary_header(MsnDirectConn *dc)
{

		close(dc->listenfd);
		dc->listenfd = -1;
	}

	dc->connect_timeout_handle = 0;
	msn_dc_fallback_to_p2p(dc);

	return FALSE;
}

/*

	} else {
		/*
		 * Both internal and external connection attempts failed.
		 * Fall back to p2p transfer.
		 */
		msn_dc_fallback_to_p2p(dc);
	}

	return FALSE;
}