mirror of
https://git.freebsd.org/ports.git
synced 2025-07-06 20:09:14 -04:00
144 lines
6.8 KiB
C++
144 lines
6.8 KiB
C++
--- remoting/host/remoting_me2me_host.cc.orig 2022-11-30 08:12:58 UTC
|
|
+++ remoting/host/remoting_me2me_host.cc
|
|
@@ -125,7 +125,7 @@
|
|
#include "remoting/host/mac/permission_utils.h"
|
|
#endif // BUILDFLAG(IS_APPLE)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#if defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND)
|
|
#include <gtk/gtk.h>
|
|
#endif // defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND)
|
|
@@ -136,13 +136,13 @@
|
|
#endif // defined(REMOTING_USE_X11)
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#include "base/linux_util.h"
|
|
#include "remoting/host/audio_capturer_linux.h"
|
|
#include "remoting/host/linux/certificate_watcher.h"
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "remoting/host/host_utmp_logger.h"
|
|
#endif
|
|
|
|
@@ -184,7 +184,7 @@ const char kApplicationName[] = "chromoting";
|
|
const char kStdinConfigPath[] = "-";
|
|
#endif // !defined(REMOTING_MULTI_PROCESS)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// The command line switch used to pass name of the pipe to capture audio on
|
|
// linux.
|
|
const char kAudioPipeSwitchName[] = "audio-pipe-name";
|
|
@@ -392,7 +392,7 @@ class HostProcess : public ConfigWatcher::Delegate,
|
|
|
|
std::unique_ptr<ChromotingHostContext> context_;
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// Watch for certificate changes and kill the host when changes occur
|
|
std::unique_ptr<CertificateWatcher> cert_watcher_;
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
@@ -458,7 +458,7 @@ class HostProcess : public ConfigWatcher::Delegate,
|
|
|
|
std::unique_ptr<HostStatusLogger> host_status_logger_;
|
|
std::unique_ptr<HostEventLogger> host_event_logger_;
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
|
|
#endif
|
|
std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
|
|
@@ -767,7 +767,7 @@ void HostProcess::StartOnNetworkThread() {
|
|
void HostProcess::ShutdownOnNetworkThread() {
|
|
DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
config_watcher_.reset();
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
cert_watcher_.reset();
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
}
|
|
@@ -826,7 +826,7 @@ void HostProcess::CreateAuthenticatorFactory() {
|
|
DCHECK(third_party_auth_config_.token_url.is_valid());
|
|
DCHECK(third_party_auth_config_.token_validation_url.is_valid());
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
if (!cert_watcher_) {
|
|
cert_watcher_ = std::make_unique<CertificateWatcher>(
|
|
base::BindRepeating(&HostProcess::ShutdownHost,
|
|
@@ -949,7 +949,7 @@ void HostProcess::StartOnUiThread() {
|
|
WaylandManager::Get()->Init(context_->ui_task_runner());
|
|
#endif // defined(REMOTING_USE_WAYLAND
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// If an audio pipe is specific on the command-line then initialize
|
|
// AudioCapturerLinux to capture from it.
|
|
base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
|
|
@@ -1020,7 +1020,7 @@ void HostProcess::ShutdownOnUiThread() {
|
|
// It is now safe for the HostProcess to be deleted.
|
|
self_ = nullptr;
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// Cause the global AudioPipeReader to be freed, otherwise the audio
|
|
// thread will remain in-use and prevent the process from exiting.
|
|
// TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
|
|
@@ -1028,7 +1028,7 @@ void HostProcess::ShutdownOnUiThread() {
|
|
AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
|
|
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
|
|
context_->input_task_runner()->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
|
|
@@ -1355,7 +1355,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V
|
|
// Returns false: never restart the host after this policy update.
|
|
DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
absl::optional<bool> host_username_match_required =
|
|
policies.FindBool(policy::key::kRemoteAccessHostMatchUsername);
|
|
if (!host_username_match_required.has_value())
|
|
@@ -1741,7 +1741,7 @@ void HostProcess::StartHost() {
|
|
// The feature is enabled for all Googlers using a supported platform.
|
|
desktop_environment_options_.set_enable_remote_open_url(is_googler_);
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
|
desktop_environment_options_.set_enable_remote_webauthn(is_googler_);
|
|
#endif
|
|
|
|
@@ -1774,7 +1774,7 @@ void HostProcess::StartHost() {
|
|
host_status_logger_ = std::make_unique<HostStatusLogger>(
|
|
host_->status_monitor(), log_to_server_.get());
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
|
if (cmd_line->HasSwitch(kEnableUtempter))
|
|
host_utmp_logger_ =
|
|
@@ -1943,7 +1943,7 @@ int HostProcessMain() {
|
|
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
|
|
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#if defined(REMOTING_USE_X11)
|
|
// Initialize Xlib for multi-threaded use, allowing non-Chromium code to
|
|
// use X11 safely (such as the WebRTC capturer, GTK ...)
|
|
@@ -1991,7 +1991,7 @@ int HostProcessMain() {
|
|
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
|
|
net::NetworkChangeNotifier::CreateIfNeeded());
|
|
|
|
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
|
|
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
|
|
// Create an X11EventSource on all UI threads, so the global X11 connection
|
|
// (x11::Connection::Get()) can dispatch X events.
|
|
auto event_source =
|