Skip to content
Permalink
Browse files

Drop RDP backend

Users interested in remote access to wlroots compositors should use
wayvnc:

https://github.com/any1/wayvnc
  • Loading branch information
ddevault authored and emersion committed Jan 10, 2020
1 parent 802ef9d commit ebdbe177d62d3c8bab04f77b86326804ff185bef
@@ -1,7 +1,6 @@
image: alpine/edge
packages:
- eudev-dev
- freerdp-dev
- ffmpeg-dev
- libcap-dev
- libinput-dev
@@ -1,7 +1,6 @@
image: archlinux
packages:
- clang
- freerdp
- ffmpeg
- libcap
- libinput
@@ -11,7 +11,6 @@ packages:
- graphics/wayland
- graphics/wayland-protocols
- multimedia/ffmpeg
- net/freerdp
- x11/libX11
- x11/libinput
- x11/libxcb
@@ -21,9 +21,6 @@
#if WLR_HAS_X11_BACKEND
#include <wlr/backend/x11.h>
#endif
#if WLR_HAS_RDP_BACKEND
#include <wlr/backend/rdp.h>
#endif

void wlr_backend_init(struct wlr_backend *backend,
const struct wlr_backend_impl *impl) {
@@ -137,38 +134,6 @@ static struct wlr_backend *attempt_headless_backend(
return backend;
}

#if WLR_HAS_RDP_BACKEND
static struct wlr_backend *attempt_rdp_backend(struct wl_display *display,
wlr_renderer_create_func_t create_renderer_func) {
const char *cert_path = getenv("WLR_RDP_TLS_CERT_PATH");
const char *key_path = getenv("WLR_RDP_TLS_KEY_PATH");
if (!cert_path || !key_path) {
wlr_log(WLR_ERROR, "The RDP backend requires WLR_RDP_TLS_CERT_PATH "
"and WLR_RDP_TLS_KEY_PATH to be set.");
return NULL;
}
struct wlr_backend *backend = wlr_rdp_backend_create(
display, create_renderer_func, cert_path, key_path);
const char *address = getenv("WLR_RDP_ADDRESS");
if (address) {
wlr_rdp_backend_set_address(backend, address);
}
const char *_port = getenv("WLR_RDP_PORT");
if (_port) {
char *endptr;
int port = strtol(_port, &endptr, 10);
if (*endptr || port <= 0 || port > 65535) {
wlr_log(WLR_ERROR, "Expected WLR_RDP_PORT to be a "
"positive integer less or equal to 65535");
wlr_backend_destroy(backend);
return NULL;
}
wlr_rdp_backend_set_port(backend, port);
}
return backend;
}
#endif

static struct wlr_backend *attempt_noop_backend(struct wl_display *display) {
struct wlr_backend *backend = wlr_noop_backend_create(display);
if (backend == NULL) {
@@ -220,10 +185,6 @@ static struct wlr_backend *attempt_backend_by_name(struct wl_display *display,
#endif
} else if (strcmp(name, "headless") == 0) {
return attempt_headless_backend(display, create_renderer_func);
#if WLR_HAS_RDP_BACKEND
} else if (strcmp(name, "rdp") == 0) {
return attempt_rdp_backend(display, create_renderer_func);
#endif
} else if (strcmp(name, "noop") == 0) {
return attempt_noop_backend(display);
} else if (strcmp(name, "drm") == 0 || strcmp(name, "libinput") == 0) {
@@ -5,7 +5,6 @@ subdir('headless')
subdir('libinput')
subdir('multi')
subdir('noop')
subdir('rdp')
subdir('wayland')
subdir('x11')

This file was deleted.

0 comments on commit ebdbe17

Please sign in to comment.
You can’t perform that action at this time.