packages/gnome-remote-desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to 0.1.9

Browse Source
This commit is contained in:
weijin-deng 2021-07-06 18:05:51 +08:00
parent 53d55dbda1
commit 4da9c8463e
7 changed files with 91 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-meson.build-Bump-pipewire-requirement-to-0.2.2.patch
View File

@ -1,25 +0,0 @@
From 8f760d73df6011330cd09da7ca7b8a3f40c9a3ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 7 Aug 2018 13:35:43 +0200
Subject: [PATCH] meson.build: Bump pipewire requirement to 0.2.2
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 6951b89..34ec5ea 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ gnome = import('gnome')
glib_dep = dependency('glib-2.0')
gio_dep = dependency('gio-2.0')
gio_unix_dep = dependency('gio-unix-2.0')
-pipewire_dep = dependency('libpipewire-0.1')
+pipewire_dep = dependency('libpipewire-0.2', version: '>= 0.2.2')
systemd_dep = dependency('systemd')
libvncserver_dep = dependency('libvncserver')
libsecret_dep = dependency('libsecret-1')
--
2.17.1

84
0001-session-vnc-Don-t-requeue-close-session-idle.patch
View File

@ -1,84 +0,0 @@
From add0ea34fd1d6835c99aebeb4e56b805b38e53ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 1 Oct 2018 18:02:39 +0200
Subject: [PATCH 1/2] session/vnc: Don't requeue close session idle
If being closed due to a PipeWire error, RFB will still process state
and invoke callbacks when cleaning up the RFB screen, meaning we'd
requeue the close session idle handler. Avoid this by avoiding
requeueing if there is already one queued, and don't mark is as unqueued
until after actually stopping the session.
---
src/grd-session-vnc.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index ce4dd29..3c98eeb 100644
--- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c
@@ -165,6 +165,16 @@ grd_session_vnc_draw_buffer (GrdSessionVnc *session_vnc,
rfbProcessEvents (session_vnc->rfb_screen, 0);
}
+static void
+maybe_queue_close_session_idle (GrdSessionVnc *session_vnc)
+{
+ if (session_vnc->close_session_idle_id)
+ return;
+
+ session_vnc->close_session_idle_id =
+ g_idle_add (close_session_idle, session_vnc);
+}
+
static void
handle_client_gone (rfbClientPtr rfb_client)
{
@@ -172,8 +182,7 @@ handle_client_gone (rfbClientPtr rfb_client)
g_debug ("VNC client gone");
- session_vnc->close_session_idle_id =
- g_idle_add (close_session_idle, session_vnc);
+ maybe_queue_close_session_idle (session_vnc);
}
static void
@@ -670,12 +679,6 @@ grd_session_vnc_stop (GrdSession *session)
g_debug ("Stopping VNC session");
- if (session_vnc->close_session_idle_id)
- {
- g_source_remove (session_vnc->close_session_idle_id);
- session_vnc->close_session_idle_id = 0;
- }
-
g_clear_object (&session_vnc->pipewire_stream);
grd_session_vnc_detach_source (session_vnc);
@@ -683,6 +686,12 @@ grd_session_vnc_stop (GrdSession *session)
g_clear_object (&session_vnc->connection);
g_clear_pointer (&session_vnc->rfb_screen->frameBuffer, g_free);
g_clear_pointer (&session_vnc->rfb_screen, (GDestroyNotify) rfbScreenCleanup);
+
+ if (session_vnc->close_session_idle_id)
+ {
+ g_source_remove (session_vnc->close_session_idle_id);
+ session_vnc->close_session_idle_id = 0;
+ }
}
static gboolean
@@ -703,8 +712,7 @@ on_pipwire_stream_closed (GrdVncPipeWireStream *stream,
{
g_warning ("PipeWire stream closed, closing client");
- session_vnc->close_session_idle_id =
- g_idle_add (close_session_idle, session_vnc);
+ maybe_queue_close_session_idle (session_vnc);
}
static void
--
2.17.1

191
0001-vnc-Add-anonymous-TLS-encryption-support.patch
View File

@ -25,15 +25,15 @@ VNC connection.
create mode 100644 src/grd-vnc-tls.h create mode 100644 src/grd-vnc-tls.h
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index d8e20d2..f8c8cee 100644 index af423a4..813c97f 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -15,6 +15,7 @@ systemd_dep = dependency('systemd') @@ -20,6 +20,7 @@ libvncclient_dep = dependency('libvncclient')
libvncserver_dep = dependency('libvncserver')
libsecret_dep = dependency('libsecret-1') libsecret_dep = dependency('libsecret-1')
libnotify_dep = dependency('libnotify') libnotify_dep = dependency('libnotify')
winpr_dep = dependency('winpr2', version: freerdp_req)
+gnutls_dep = dependency('gnutls') +gnutls_dep = dependency('gnutls')
cdata = configuration_data() cdata = configuration_data()
cdata.set_quoted('GETTEXT_PACKAGE', 'gnome-remote-desktop') cdata.set_quoted('GETTEXT_PACKAGE', 'gnome-remote-desktop')
diff --git a/src/grd-enums.h b/src/grd-enums.h diff --git a/src/grd-enums.h b/src/grd-enums.h
@ -43,7 +43,7 @@ index ffab821..4333863 100644
@@ -27,4 +27,10 @@ typedef enum @@ -27,4 +27,10 @@ typedef enum
GRD_VNC_AUTH_METHOD_PASSWORD GRD_VNC_AUTH_METHOD_PASSWORD
} GrdVncAuthMethod; } GrdVncAuthMethod;
+typedef enum +typedef enum
+{ +{
+ GRD_VNC_ENCRYPTION_NONE = 1 << 0, + GRD_VNC_ENCRYPTION_NONE = 1 << 0,
@ -52,23 +52,23 @@ index ffab821..4333863 100644
+ +
#endif /* GRD_ENUMS_H */ #endif /* GRD_ENUMS_H */
diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
index 5d40971..ce4dd29 100644 index 813838a..4bfb46e 100644
--- a/src/grd-session-vnc.c --- a/src/grd-session-vnc.c
+++ b/src/grd-session-vnc.c +++ b/src/grd-session-vnc.c
@@ -44,7 +44,9 @@ struct _GrdSessionVnc @@ -44,7 +44,9 @@ struct _GrdSessionVnc
{ {
GrdSession parent; GrdSession parent;
+ GrdVncServer *vnc_server; + GrdVncServer *vnc_server;
GSocketConnection *connection; GSocketConnection *connection;
+ GList *socket_grabs; + GList *socket_grabs;
GSource *source; GSource *source;
rfbScreenInfoPtr rfb_screen; rfbScreenInfoPtr rfb_screen;
rfbClientPtr rfb_client; rfbClientPtr rfb_client;
@@ -465,12 +467,30 @@ check_rfb_password (rfbClientPtr rfb_client, @@ -511,12 +513,30 @@ check_rfb_password (rfbClientPtr rfb_client,
} }
} }
+int +int
+grd_session_vnc_get_fd (GrdSessionVnc *session_vnc) +grd_session_vnc_get_fd (GrdSessionVnc *session_vnc)
+{ +{
@ -80,7 +80,7 @@ index 5d40971..ce4dd29 100644
{ {
return session_vnc->rfb_screen->paddedWidthInBytes; return session_vnc->rfb_screen->paddedWidthInBytes;
} }
+rfbClientPtr +rfbClientPtr
+grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc) +grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc)
+{ +{
@ -96,10 +96,10 @@ index 5d40971..ce4dd29 100644
static void static void
init_vnc_session (GrdSessionVnc *session_vnc) init_vnc_session (GrdSessionVnc *session_vnc)
{ {
@@ -509,33 +529,74 @@ init_vnc_session (GrdSessionVnc *session_vnc) @@ -557,33 +577,74 @@ init_vnc_session (GrdSessionVnc *session_vnc)
rfbProcessEvents (rfb_screen, 0); rfbProcessEvents (rfb_screen, 0);
} }
+void +void
+grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc, +grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc,
+ GrdVncSocketGrabFunc grab_func) + GrdVncSocketGrabFunc grab_func)
@ -145,7 +145,7 @@ index 5d40971..ce4dd29 100644
- GrdSessionVnc *session_vnc = user_data; - GrdSessionVnc *session_vnc = user_data;
+ GrdSessionVnc *session_vnc = GRD_SESSION_VNC (user_data); + GrdSessionVnc *session_vnc = GRD_SESSION_VNC (user_data);
+ GrdSession *session = GRD_SESSION (session_vnc); + GrdSession *session = GRD_SESSION (session_vnc);
- if (condition & G_IO_IN) - if (condition & G_IO_IN)
+ if (condition & (G_IO_ERR | G_IO_HUP)) + if (condition & (G_IO_ERR | G_IO_HUP))
+ { + {
@ -164,7 +164,7 @@ index 5d40971..ce4dd29 100644
{ {
- rfbProcessEvents (session_vnc->rfb_screen, 0); - rfbProcessEvents (session_vnc->rfb_screen, 0);
+ g_warning ("Error when reading socket: %s", error->message); + g_warning ("Error when reading socket: %s", error->message);
- if (session_vnc->pending_framebuffer_resize && - if (session_vnc->pending_framebuffer_resize &&
- session_vnc->rfb_client->preferredEncoding != -1) - session_vnc->rfb_client->preferredEncoding != -1)
- { - {
@ -173,7 +173,7 @@ index 5d40971..ce4dd29 100644
- session_vnc->pending_framebuffer_height); - session_vnc->pending_framebuffer_height);
- session_vnc->pending_framebuffer_resize = FALSE; - session_vnc->pending_framebuffer_resize = FALSE;
- } - }
+ grd_session_stop (session); + grd_session_stop (session);
} }
} }
else else
@ -183,10 +183,10 @@ index 5d40971..ce4dd29 100644
+ g_warning ("Unhandled socket condition %d\n", condition); + g_warning ("Unhandled socket condition %d\n", condition);
+ g_assert_not_reached (); + g_assert_not_reached ();
} }
return G_SOURCE_CONTINUE; return G_SOURCE_CONTINUE;
@@ -548,7 +609,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc) @@ -596,7 +657,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc)
socket = g_socket_connection_get_socket (session_vnc->connection); socket = g_socket_connection_get_socket (session_vnc->connection);
session_vnc->source = g_socket_create_source (socket, session_vnc->source = g_socket_create_source (socket,
- G_IO_IN | G_IO_PRI, - G_IO_IN | G_IO_PRI,
@ -197,56 +197,48 @@ index 5d40971..ce4dd29 100644
NULL); NULL);
g_source_set_callback (session_vnc->source, g_source_set_callback (session_vnc->source,
(GSourceFunc) handle_socket_data, (GSourceFunc) handle_socket_data,
@@ -574,8 +638,10 @@ grd_session_vnc_new (GrdVncServer *vnc_server, @@ -622,8 +686,10 @@ grd_session_vnc_new (GrdVncServer *vnc_server,
"context", context, "context", context,
NULL); NULL);
+ session_vnc->vnc_server = vnc_server; + session_vnc->vnc_server = vnc_server;
session_vnc->connection = g_object_ref (connection); session_vnc->connection = g_object_ref (connection);
+ grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func); + grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func);
grd_session_vnc_attach_source (session_vnc); grd_session_vnc_attach_source (session_vnc);
init_vnc_session (session_vnc); init_vnc_session (session_vnc);
@@ -590,6 +656,8 @@ grd_session_vnc_dispose (GObject *object) @@ -638,6 +704,8 @@ grd_session_vnc_dispose (GObject *object)
g_assert (!session_vnc->rfb_screen); g_assert (!session_vnc->rfb_screen);
+ g_clear_pointer (&session_vnc->socket_grabs, g_list_free); + g_clear_pointer (&session_vnc->socket_grabs, g_list_free);
+ +
g_clear_pointer (&session_vnc->pressed_keys, g_hash_table_unref); g_clear_pointer (&session_vnc->pressed_keys, g_hash_table_unref);
G_OBJECT_CLASS (grd_session_vnc_parent_class)->dispose (object); G_OBJECT_CLASS (grd_session_vnc_parent_class)->dispose (object);
diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
index 6bd067a..33245bc 100644 index 579a12a..912dfef 100644
--- a/src/grd-session-vnc.h --- a/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.h +++ b/src/grd-session-vnc.h
@@ -25,6 +25,7 @@ @@ -36,6 +36,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc,
#include <gio/gio.h>
#include <glib-object.h>
+#include <rfb/rfb.h>
#include "grd-session.h"
#include "grd-types.h"
@@ -35,6 +36,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc,
GRD, SESSION_VNC, GRD, SESSION_VNC,
GrdSession); GrdSession);
+typedef gboolean (* GrdVncSocketGrabFunc) (GrdSessionVnc *session_vnc, +typedef gboolean (* GrdVncSocketGrabFunc) (GrdSessionVnc *session_vnc,
+ GError **error); + GError **error);
+ +
GrdSessionVnc *grd_session_vnc_new (GrdVncServer *vnc_server, GrdSessionVnc *grd_session_vnc_new (GrdVncServer *vnc_server,
GSocketConnection *connection); GSocketConnection *connection);
@@ -45,6 +49,18 @@ void grd_session_vnc_queue_resize_framebuffer (GrdSessionVnc *session_vnc, @@ -55,6 +58,18 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
void grd_session_vnc_draw_buffer (GrdSessionVnc *session_vnc, int x,
void *data); int y);
+int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc); +int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc);
+ +
int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc); int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+rfbClientPtr grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc); +rfbClientPtr grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc);
+ +
+void grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc, +void grd_session_vnc_grab_socket (GrdSessionVnc *session_vnc,
@ -259,21 +251,21 @@ index 6bd067a..33245bc 100644
+ +
#endif /* GRD_SESSION_VNC_H */ #endif /* GRD_SESSION_VNC_H */
diff --git a/src/grd-settings.c b/src/grd-settings.c diff --git a/src/grd-settings.c b/src/grd-settings.c
index a3a2afa..c886b7e 100644 index 3af87be..1c7dc4b 100644
--- a/src/grd-settings.c --- a/src/grd-settings.c
+++ b/src/grd-settings.c +++ b/src/grd-settings.c
@@ -46,6 +46,7 @@ struct _GrdSettings @@ -59,6 +59,7 @@ struct _GrdSettings
GSettings *settings; GSettings *settings;
gboolean view_only; gboolean view_only;
GrdVncAuthMethod auth_method; GrdVncAuthMethod auth_method;
+ GrdVncEncryption encryption; + GrdVncEncryption encryption;
int port;
} vnc; } vnc;
}; };
@@ -253,6 +254,12 @@ update_rdp_view_only (GrdSettings *settings)
@@ -87,6 +88,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings) "view-only");
return settings->vnc.auth_method;
} }
+GrdVncEncryption +GrdVncEncryption
+grd_settings_get_vnc_encryption (GrdSettings *settings) +grd_settings_get_vnc_encryption (GrdSettings *settings)
+{ +{
@ -283,10 +275,10 @@ index a3a2afa..c886b7e 100644
static void static void
update_vnc_view_only (GrdSettings *settings) update_vnc_view_only (GrdSettings *settings)
{ {
@@ -101,6 +108,13 @@ update_vnc_auth_method (GrdSettings *settings) @@ -289,6 +296,13 @@ on_rdp_settings_changed (GSettings *rdp_settings,
"auth-method"); }
} }
+static void +static void
+update_vnc_encryption (GrdSettings *settings) +update_vnc_encryption (GrdSettings *settings)
+{ +{
@ -297,7 +289,7 @@ index a3a2afa..c886b7e 100644
static void static void
on_vnc_settings_changed (GSettings *vnc_settings, on_vnc_settings_changed (GSettings *vnc_settings,
const char *key, const char *key,
@@ -116,6 +130,11 @@ on_vnc_settings_changed (GSettings *vnc_settings, @@ -304,6 +318,11 @@ on_vnc_settings_changed (GSettings *vnc_settings,
update_vnc_auth_method (settings); update_vnc_auth_method (settings);
g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0); g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0);
} }
@ -307,17 +299,17 @@ index a3a2afa..c886b7e 100644
+ g_signal_emit (settings, signals[VNC_ENCRYPTION_CHANGED], 0); + g_signal_emit (settings, signals[VNC_ENCRYPTION_CHANGED], 0);
+ } + }
} }
static void static void
@@ -137,6 +156,7 @@ grd_settings_init (GrdSettings *settings) @@ -332,6 +351,7 @@ grd_settings_init (GrdSettings *settings)
update_rdp_view_only (settings);
update_vnc_view_only (settings); update_vnc_view_only (settings);
update_vnc_auth_method (settings); update_vnc_auth_method (settings);
+ update_vnc_encryption (settings); + update_vnc_encryption (settings);
}
settings->rdp.port = GRD_RDP_SERVER_PORT;
static void settings->vnc.port = GRD_VNC_SERVER_PORT;
@@ -160,4 +180,11 @@ grd_settings_class_init (GrdSettingsClass *klass) @@ -379,4 +399,11 @@ grd_settings_class_init (GrdSettingsClass *klass)
0, 0,
NULL, NULL, NULL, NULL, NULL, NULL,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
@ -330,38 +322,32 @@ index a3a2afa..c886b7e 100644
+ G_TYPE_NONE, 0); + G_TYPE_NONE, 0);
} }
diff --git a/src/grd-settings.h b/src/grd-settings.h diff --git a/src/grd-settings.h b/src/grd-settings.h
index 9b23b09..4bca403 100644 index e12e47e..b940fdb 100644
--- a/src/grd-settings.h --- a/src/grd-settings.h
+++ b/src/grd-settings.h +++ b/src/grd-settings.h
@@ -40,4 +40,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings); @@ -64,4 +64,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings);
GrdVncAuthMethod grd_settings_get_vnc_auth_method (GrdSettings *settings); GrdVncAuthMethod grd_settings_get_vnc_auth_method (GrdSettings *settings);
+GrdVncEncryption grd_settings_get_vnc_encryption (GrdSettings *settings); +GrdVncEncryption grd_settings_get_vnc_encryption (GrdSettings *settings);
+ +
#endif /* GRD_SETTINGS_H */ #endif /* GRD_SETTINGS_H */
diff --git a/src/grd-vnc-server.c b/src/grd-vnc-server.c diff --git a/src/grd-vnc-server.c b/src/grd-vnc-server.c
index a8fed02..769b7ec 100644 index a6d95cb..98b23c9 100644
--- a/src/grd-vnc-server.c --- a/src/grd-vnc-server.c
+++ b/src/grd-vnc-server.c +++ b/src/grd-vnc-server.c
@@ -24,11 +24,13 @@ @@ -29,6 +29,7 @@
#include "grd-vnc-server.h"
+#include <rfb/rfb.h>
#include <gio/gio.h>
#include <rfb/rfb.h>
#include "grd-context.h" #include "grd-context.h"
#include "grd-session-vnc.h" #include "grd-session-vnc.h"
+#include "grd-vnc-tls.h" +#include "grd-vnc-tls.h"
#define GRD_VNC_SERVER_PORT 5900
enum
@@ -131,6 +133,43 @@ on_incoming (GSocketService *service, @@ -130,6 +131,43 @@ on_incoming (GSocketService *service,
return TRUE; return TRUE;
} }
+static void +static void
+sync_encryption_settings (GrdVncServer *vnc_server) +sync_encryption_settings (GrdVncServer *vnc_server)
+{ +{
@ -402,17 +388,17 @@ index a8fed02..769b7ec 100644
gboolean gboolean
grd_vnc_server_start (GrdVncServer *vnc_server, grd_vnc_server_start (GrdVncServer *vnc_server,
GError **error) GError **error)
@@ -219,12 +258,18 @@ static void @@ -220,12 +258,18 @@ static void
grd_vnc_server_constructed (GObject *object) grd_vnc_server_constructed (GObject *object)
{ {
GrdVncServer *vnc_server = GRD_VNC_SERVER (object); GrdVncServer *vnc_server = GRD_VNC_SERVER (object);
+ GrdSettings *settings = grd_context_get_settings (vnc_server->context); + GrdSettings *settings = grd_context_get_settings (vnc_server->context);
if (grd_context_get_debug_flags (vnc_server->context) & GRD_DEBUG_VNC) if (grd_context_get_debug_flags (vnc_server->context) & GRD_DEBUG_VNC)
rfbLogEnable (1); rfbLogEnable (1);
else else
rfbLogEnable (0); rfbLogEnable (0);
+ g_signal_connect (settings, "vnc-encryption-changed", + g_signal_connect (settings, "vnc-encryption-changed",
+ G_CALLBACK (on_vnc_encryption_changed), + G_CALLBACK (on_vnc_encryption_changed),
+ vnc_server); + vnc_server);
@ -420,13 +406,13 @@ index a8fed02..769b7ec 100644
+ +
G_OBJECT_CLASS (grd_vnc_server_parent_class)->constructed (object); G_OBJECT_CLASS (grd_vnc_server_parent_class)->constructed (object);
} }
diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c
new file mode 100644 new file mode 100644
index 0000000..8fc0fc2 index 0000000..a77b91f
--- /dev/null --- /dev/null
+++ b/src/grd-vnc-tls.c +++ b/src/grd-vnc-tls.c
@@ -0,0 +1,444 @@ @@ -0,0 +1,445 @@
+/* +/*
+ * Copyright (C) 2018 Red Hat Inc. + * Copyright (C) 2018 Red Hat Inc.
+ * + *
@ -871,6 +857,7 @@ index 0000000..8fc0fc2
+{ +{
+ return &anon_tls_security_handler; + return &anon_tls_security_handler;
+} +}
+
diff --git a/src/grd-vnc-tls.h b/src/grd-vnc-tls.h diff --git a/src/grd-vnc-tls.h b/src/grd-vnc-tls.h
new file mode 100644 new file mode 100644
index 0000000..135ef8c index 0000000..135ef8c
@ -906,48 +893,28 @@ index 0000000..135ef8c
+ +
+#endif /* GRD_VNC_TLS_H */ +#endif /* GRD_VNC_TLS_H */
diff --git a/src/meson.build b/src/meson.build diff --git a/src/meson.build b/src/meson.build
index 70e2102..b633ad7 100644 index 1b6425d..2b8aeea 100644
--- a/src/meson.build --- a/src/meson.build
+++ b/src/meson.build +++ b/src/meson.build
@@ -19,6 +19,8 @@ daemon_sources = files([ @@ -33,6 +33,8 @@ daemon_sources = files([
'grd-vnc-pipewire-stream.h', 'grd-vnc-pipewire-stream.h',
'grd-vnc-server.c', 'grd-vnc-server.c',
'grd-vnc-server.h', 'grd-vnc-server.h',
+ 'grd-vnc-tls.c', + 'grd-vnc-tls.c',
+ 'grd-vnc-tls.h', + 'grd-vnc-tls.h',
]) ])
gen_daemon_sources = [] gen_daemon_sources = []
@@ -49,7 +51,8 @@ executable('gnome-remote-desktop-daemon', @@ -65,7 +67,8 @@ executable('gnome-remote-desktop-daemon',
pipewire_dep, pipewire_dep,
libvncserver_dep, libvncserver_dep,
libsecret_dep, libsecret_dep,
- libnotify_dep], - libnotify_dep,
+ libnotify_dep, + libnotify_dep,
+ gnutls_dep], + gnutls_dep,
winpr_dep],
include_directories: [configinc], include_directories: [configinc],
install: true, install: true,
install_dir: libexecdir)
diff --git a/src/org.gnome.desktop.remote-desktop.gschema.xml b/src/org.gnome.desktop.remote-desktop.gschema.xml
index a5c2022..846e65b 100644
--- a/src/org.gnome.desktop.remote-desktop.gschema.xml
+++ b/src/org.gnome.desktop.remote-desktop.gschema.xml
@@ -23,5 +23,15 @@
* password - by requiring the remote client to provide a known password
</description>
</key>
+ <key name='encryption' flags='org.gnome.desktop.remote-desktop.GrdVncEncryption'>
+ <default>['tls-anon']</default>
+ <summary>Allowed encryption method to use</summary>
+ <description>
+ Allowed encryption methods. Includes the following:
+
+ * none - no encryption
+ * tls-anon - anonymous (unauthenticated) TLS
+ </description>
+ </key>
</schema>
</schemalist>
-- --
2.17.1 2.17.1

28
0002-vnc-pipewire-stream-Close-session-when-disconnected.patch
View File

@ -1,28 +0,0 @@
From 59188d81cf8936cd9f5400df040d875427251bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 1 Oct 2018 18:05:07 +0200
Subject: [PATCH 2/2] vnc-pipewire-stream: Close session when disconnected
When there is an active stream, and we're disconnected from PipeWire
(e.g. because it terminated), close the session.
---
src/grd-vnc-pipewire-stream.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
index 66d66a0..d6454b8 100644
--- a/src/grd-vnc-pipewire-stream.c
+++ b/src/grd-vnc-pipewire-stream.c
@@ -392,6 +392,9 @@ on_state_changed (void *user_data,
}
break;
case PW_REMOTE_STATE_UNCONNECTED:
+ if (stream->pipewire_stream)
+ g_signal_emit (stream, signals[CLOSED], 0);
+ break;
case PW_REMOTE_STATE_CONNECTING:
break;
}
--
2.17.1

BIN
gnome-remote-desktop-0.1.6.tar.xz
View File

Binary file not shown.

BIN
gnome-remote-desktop-0.1.9.tar.xz Normal file
View File

Binary file not shown.

22
gnome-remote-desktop.spec
View File

@ -1,21 +1,18 @@
Name: gnome-remote-desktop Name: gnome-remote-desktop
Version: 0.1.6 Version: 0.1.9
Release: 4 Release: 1
Summary: Screen share service of GNOME Remote Desktop Summary: Screen share service of GNOME Remote Desktop
License: GPLv2+ License: GPLv2+
URL: https://gitlab.gnome.org/jadahl/gnome-remote-desktop URL: https://gitlab.gnome.org/jadahl/gnome-remote-desktop
Source0: https://gitlab.gnome.org/jadahl/gnome-remote-desktop/uploads/c6862c12f0b741714d5a27e0693322fe/gnome-remote-desktop-0.1.6.tar.xz Source0: https://download.gnome.org/sources/gnome-remote-desktop/0.1/%{name}-%{version}.tar.xz
Patch00001: 0001-vnc-Add-anonymous-TLS-encryption-support.patch Patch00001: 0001-vnc-Add-anonymous-TLS-encryption-support.patch
Patch00002: 0001-meson.build-Bump-pipewire-requirement-to-0.2.2.patch
Patch00003: 0001-session-vnc-Don-t-requeue-close-session-idle.patch
Patch00004: 0002-vnc-pipewire-stream-Close-session-when-disconnected.patch
BuildRequires: meson >= 0.36.0 pkgconfig pkgconfig(glib-2.0) >= 2.32 pkgconfig(gio-unix-2.0) >= 2.32 BuildRequires: meson >= 0.47.0 pkgconfig pkgconfig(glib-2.0) >= 2.32 pkgconfig(gio-unix-2.0) >= 2.32
BuildRequires: pkgconfig(libpipewire-0.2) >= 0.2.2 pkgconfig(libvncserver) >= 0.9.11-7 pkgconfig(libsecret-1) BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.0 pkgconfig(libvncserver) >= 0.9.11-7 pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libnotify) pkgconfig(gnutls) systemd BuildRequires: pkgconfig(libnotify) pkgconfig(gnutls) systemd pkgconfig(freerdp2)
Requires: pipewire >= 0.2.2 Requires: pipewire >= 0.3.0
%description %description
GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire. GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire.
@ -48,6 +45,11 @@ GNOME Remote Desktop is a remote desktop daemon for GNOME using pipewire.
%{_userunitdir}/gnome-remote-desktop.service %{_userunitdir}/gnome-remote-desktop.service
%changelog %changelog
* Wed Jun 30 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 0.1.9-1
- Upgrade to 0.1.9
- Delete patches whose content existed or target patch file not existed in this version 0.1.9
- Modify 0001-vnc-Add-anonymous-TLS-encryption-support.patch
* Wed Dec 11 2019 daiqianwen <daiqianwen@huawei.com> - 0.1.6-3 * Wed Dec 11 2019 daiqianwen <daiqianwen@huawei.com> - 0.1.6-3
- Package init - Package init