mirror of
https://git.freebsd.org/ports.git
synced 2025-04-30 10:36:38 -04:00
146 lines
6.6 KiB
C++
146 lines
6.6 KiB
C++
--- remoting/host/remoting_me2me_host.cc.orig 2025-04-16 18:18:42 UTC
|
|
+++ remoting/host/remoting_me2me_host.cc
|
|
@@ -138,7 +138,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)
|
|
#include <gtk/gtk.h>
|
|
|
|
@@ -148,7 +148,7 @@
|
|
#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/linux/audio_capturer_linux.h"
|
|
#include "remoting/host/linux/certificate_watcher.h"
|
|
@@ -163,7 +163,7 @@
|
|
#include "remoting/host/pairing_registry_delegate_win.h"
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "remoting/host/host_utmp_logger.h"
|
|
#endif // BUILDFLAG(IS_LINUX)
|
|
|
|
@@ -196,7 +196,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";
|
|
@@ -440,7 +440,7 @@ class HostProcess : public ConfigWatcher::Delegate,
|
|
std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_;
|
|
#endif
|
|
|
|
-#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)
|
|
@@ -505,7 +505,7 @@ class HostProcess : public ConfigWatcher::Delegate,
|
|
std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_;
|
|
|
|
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_;
|
|
@@ -824,7 +824,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)
|
|
}
|
|
@@ -901,7 +901,7 @@ void HostProcess::CreateAuthenticatorFactory() {
|
|
context_->create_client_cert_store_callback(),
|
|
service_account_email_, oauth_refresh_token_));
|
|
|
|
-#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,
|
|
@@ -1043,7 +1043,7 @@ void HostProcess::StartOnUiThread() {
|
|
base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
|
|
base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
|
|
|
|
-#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 =
|
|
@@ -1122,7 +1122,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.
|
|
@@ -1130,7 +1130,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(); }));
|
|
@@ -1864,7 +1864,7 @@ void HostProcess::StartHost() {
|
|
corp_host_status_logger_->StartObserving(*session_manager);
|
|
}
|
|
|
|
-#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_corp_host_);
|
|
#endif
|
|
#if BUILDFLAG(IS_WIN)
|
|
@@ -1891,7 +1891,7 @@ void HostProcess::StartHost() {
|
|
|
|
host_->AddExtension(std::make_unique<TestEchoExtension>());
|
|
|
|
-#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_ =
|
|
@@ -1927,7 +1927,7 @@ void HostProcess::StartHost() {
|
|
// addresses.
|
|
host_->Start(*host_owner_emails_.begin());
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
// For Windows, ChromotingHostServices connections are handled by the daemon
|
|
// process, then the message pipe is forwarded to the network process.
|
|
host_->StartChromotingHostServices();
|
|
@@ -2072,7 +2072,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 ...)
|
|
@@ -2135,7 +2135,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 =
|