Easy start script: remove obsolete code

This reverts commit b8fd6a28a4.

builder/build-tarball

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 set -e
-set -x
 
 build_www_dir() {
   local webpacked_www=$PWD/builder/www

builder/build.sh

@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-set -x
-
 detect_quilt() {
   if which quilt 1>/dev/null; then
     QUILT_PRESENT=1
@@ -82,9 +80,7 @@ cd /src
 detect_quilt
 if [ -n "$QUILT_PRESENT" ]; then
   quilt push -a
-  echo 'Patches applied!'
 fi
-
 make servertarball
 
 cp kasmvnc*.tar.gz /build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz

builder/dockerfile.centos_core.build

@@ -10,8 +10,7 @@ RUN yum install -y make
 RUN yum group install -y "Development Tools"
 RUN yum install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
 RUN yum install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
-  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel libXrandr-devel pam-devel \
+  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel
-  gnutls-devel libX11-devel libXtst-devel libXcursor-devel
 RUN yum install -y mesa-dri-drivers
 
 # Additions for webp
@@ -23,7 +22,8 @@ RUN cd /tmp/libwebp-1.0.2 && \
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.debian_bullseye.build

@@ -13,7 +13,7 @@ RUN apt-get update && \
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
 RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
 
 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
@@ -24,7 +24,8 @@ RUN cd /tmp/libwebp-1.0.2 && \
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.debian_buster.build

@@ -13,7 +13,7 @@ RUN apt-get update && \
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
 RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
 
 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
@@ -24,7 +24,8 @@ RUN cd /tmp/libwebp-1.0.2 && \
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.debian_buster.deb.test

@@ -34,6 +34,14 @@ RUN apt-get purge -y pm-utils xscreensaver*
 RUN apt-get update && apt-get install -y vim less
 RUN apt-get update && apt-get -y install lsb-release
 
+RUN apt-get update && apt-get install -y task-cinnamon-desktop
+RUN apt-get update && apt-get install -y task-gnome-desktop
+RUN mkdir -p /usr/share/man/man1
+RUN apt-get update && apt-get install -y apt-utils openjdk-11-jre
+RUN apt-get update && apt-get install -y task-lxde-desktop
+RUN apt-get update && apt-get install -y task-mate-desktop
+RUN apt-get update && apt-get install -y task-kde-desktop
+
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
 
 RUN mkdir -p $STARTUPDIR

builder/dockerfile.fedora_thirtythree.build

@@ -18,7 +18,7 @@ RUN dnf install -y make
 RUN dnf group install -y "Development Tools"
 RUN dnf install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
 RUN dnf install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
-  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel libXrandr-devel libXcursor-devel
+  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel
 RUN dnf install -y mesa-dri-drivers
 RUN dnf install -y bzip2 redhat-lsb-core
 
@@ -31,7 +31,8 @@ RUN cd /tmp/libwebp-1.0.2 && \
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.kali_kali-rolling.build

@@ -13,7 +13,7 @@ RUN apt-get update && \
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
 RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
 
 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
@@ -24,7 +24,8 @@ RUN cd /tmp/libwebp-1.0.2 && \
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.ubuntu1604.build

@@ -14,7 +14,8 @@ RUN cd /tmp/libwebp-1.0.2 && ./configure && make && make install
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 
 USER docker

builder/dockerfile.ubuntu_bionic.build

@@ -11,7 +11,7 @@ RUN apt-get update && \
 
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
 RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
 
 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
@@ -28,7 +28,8 @@ RUN cd /tmp/libwebp-1.0.2 && \
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.ubuntu_focal.build

@@ -13,7 +13,7 @@ RUN apt-get update && \
 RUN apt-get update && apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
 RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
 
 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
@@ -24,7 +24,8 @@ RUN cd /tmp/libwebp-1.0.2 && \
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
-COPY --chown=docker:docker . /src/
+COPY . /src
+RUN chown -R docker:docker /src
 
 USER docker
 ENTRYPOINT ["/src/builder/build.sh"]

builder/startup/deb/kasmvncserver-easy-start

@@ -5,25 +5,183 @@ set -e
 display=:10
 interface=0.0.0.0
 cert_group=ssl-cert
-
+xstartup_script=~/.vnc/xstartup
-if [[ "$1" = "--help" ]]; then
+de_was_selected_file="$HOME/.vnc/.kasmvncserver-easy-start-de-was-selected"
-  cat >&2 <<-USAGE
-Usage: `basename $0` [options]
-  -d     Debug output
-  -kill  Kill vncserver
-  --help show this help
-USAGE
-  exit
-fi
-
-if [[ "$1" = "-d" ]]; then
-  log_option="-log *:stderr:100"
-fi
 
 action=start
-if [[ "$1" = "-kill" ]]; then
+
-  action=kill
+manual_xstartup_choice="Manually edit xstartup"
-fi
+declare -A all_desktop_environments=(
+  [Cinnamon]=cinnamon-session
+  [Mate]="XDG_CURRENT_DESKTOP=MATE dbus-launch --exit-with-session mate-session"
+  [LXDE]=lxsession [Lxqt]=startlxqt
+  [KDE]=startkde
+  [Gnome]="XDG_CURRENT_DESKTOP=GNOME dbus-launch --exit-with-session /usr/bin/gnome-session"
+  [XFCE]=xfce4-session)
+
+readarray -t sorted_desktop_environments < <(for de in "${!all_desktop_environments[@]}"; do echo "$de"; done | sort)
+
+all_desktop_environments[$manual_xstartup_choice]=""
+sorted_desktop_environments+=("$manual_xstartup_choice")
+
+detected_desktop_environments=()
+declare -A numbered_desktop_environments
+
+debug() {
+  if [ -z "$debug" ]; then return; fi
+
+  echo "$@"
+}
+
+print_detected_desktop_environments() {
+  declare -i i=1
+
+  echo "Please choose Desktop Environment to run:"
+  for detected_de in "${detected_desktop_environments[@]}"; do
+    echo "[$i] $detected_de"
+    numbered_desktop_environments[$i]=$detected_de
+    i+=1
+  done
+}
+
+detect_desktop_environments() {
+  for de_name in "${sorted_desktop_environments[@]}"; do
+    if [[ "$de_name" = "$manual_xstartup_choice" ]]; then
+      detected_desktop_environments+=("$de_name")
+      continue;
+    fi
+
+    local executable=${all_desktop_environments[$de_name]}
+    executable=($executable)
+    executable=${executable[-1]}
+
+    if detect_desktop_environment "$de_name" "$executable"; then
+      detected_desktop_environments+=("$de_name")
+    fi
+  done
+}
+
+ask_user_to_choose_de() {
+  while : ; do
+    print_detected_desktop_environments
+    read -r de_number_to_run
+    de_name_from_number "$de_number_to_run"
+    if [[ -n "$de_name" ]]; then
+      break;
+    fi
+
+    echo "Incorrect number: $de_number_to_run"
+    echo
+  done
+}
+
+remember_de_choice() {
+  touch "$de_was_selected_file"
+}
+
+de_was_selected_on_previous_run() {
+  [[ -f "$de_was_selected_file" ]]
+}
+
+detect_desktop_environment() {
+  local de_name="$1"
+  local executable="$2"
+
+  if command -v "$executable" &>/dev/null; then
+    return 0
+  fi
+
+  return 1
+}
+
+did_user_forbid_replacing_xstartup() {
+  grep -q -v KasmVNC-safe-to-replace-this-file "$xstartup_script"
+}
+
+de_cmd_from_name() {
+  de_cmd=${all_desktop_environments[$de_name]}
+}
+
+de_name_from_number() {
+  local de_number_to_run="$1"
+
+  de_name=${numbered_desktop_environments[$de_number_to_run]}
+}
+
+warn_xstartup_will_be_overwriten() {
+  echo -n "WARNING: $xstartup_script will be overwritten y/N?"
+  read -r do_overwrite_xstartup
+  if [[ "$do_overwrite_xstartup" = "y" || "$do_overwrite_xstartup" = "Y" ]]; then
+    return 0
+  fi
+
+  return 1
+}
+
+setup_de_to_run_via_xstartup() {
+  warn_xstartup_will_be_overwriten
+  generate_xstartup "$de_name"
+}
+
+generate_xstartup() {
+  local de_name="$1"
+
+  de_cmd_from_name
+
+  cat <<-SCRIPT > "$xstartup_script"
+    #!/bin/sh
+    exec $de_cmd
+SCRIPT
+  chmod +x "$xstartup_script"
+}
+
+enable_debug() {
+  debug=1
+  log_option="-log *:stderr:100"
+}
+
+kill_vnc_server() {
+  vncserver -kill $display
+}
+
+process_cli_options() {
+  for option in "$@"; do
+    case "$option" in
+      --help)
+        show_help
+        exit
+        ;;
+      -d)
+        enable_debug
+        ;;
+      -kill)
+        kill_vnc_server
+        exit
+        ;;
+      -select-de)
+        action=select-de-and-start
+        ;;
+      *)
+        echo >&2 "Unsupported argument: $option"
+        exit 1
+    esac
+  done
+}
+
+user_asked_to_select_de() {
+  [[ "$action" = "select-de-and-start" ]]
+}
+show_help() {
+  cat >&2 <<-USAGE
+Usage: `basename $0` [options]
+  -d          Debug output
+  -kill       Kill vncserver
+  -select-de  Select desktop environent to run
+  --help      show this help
+USAGE
+}
+
+process_cli_options "$@"
 
 if groups | grep -qvw ssl-cert; then
   cat <<-EOF
@@ -33,9 +191,14 @@ EOF
   exit 1
 fi
 
-if [[ "$action" = "kill" ]]; then
+if user_asked_to_select_de || ! de_was_selected_on_previous_run; then
-  vncserver -kill $display
+  detect_desktop_environments
-  exit
+  ask_user_to_choose_de
+  debug "You selected $de_name desktop environment"
+  if [[ "$de_name" != "$manual_xstartup_choice" ]]; then
+    setup_de_to_run_via_xstartup
+  fi
+  remember_de_choice
 fi
 
 vncserver $display -interface $interface

builder/startup/vnc_startup.sh

@@ -61,6 +61,8 @@ kasmvncpasswd -d -u "$VNC_USER-to-delete" $HOME/.kasmpasswd
 chmod 0600 $HOME/.kasmpasswd
 openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout $HOME/.vnc/self.pem -out $HOME/.vnc/self.pem -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=kasm/emailAddress=none@none.none"
 
+exec /bin/bash
+
 vncserver :1 -interface 0.0.0.0
 vncserver -kill :1
 

builder/test-deb

@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
 docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \
   -t kasmvnctester_${os}:$os_codename \
   -f dockerfile.${os}_${os_codename}.deb.test .
-docker run -it -p 443:8443 --rm \
+  docker run -it -v $(realpath ${PWD}/..):/src -p 8443:8443 --rm \
   -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
   -e "VNC_USER=foo" -e "VNC_PW=foobar" \
   kasmvnctester_${os}:$os_codename

centos/kasmvncserver.spec

@@ -62,10 +62,8 @@ cp $SRC/man/man1/Xvnc.1 $DESTDIR/usr/share/man/man1/;
 cp $SRC/share/man/man1/vncserver.1 $DST_MAN;
 cp $SRC/share/man/man1/vncconfig.1 $DST_MAN;
 cp $SRC/share/man/man1/vncpasswd.1 $DST_MAN;
-cp $SRC/share/man/man1/kasmxpoxy.1 $DST_MAN;
 cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 
-
 %files
 /usr/bin/*
 /usr/share/man/man1/*

common/network/GetAPI.h

@@ -24,8 +24,6 @@
 #include <rfb/PixelBuffer.h>
 #include <rfb/PixelFormat.h>
 #include <stdint.h>
-#include <map>
-#include <string>
 #include <vector>
 
 namespace network {
@@ -36,17 +34,6 @@ namespace network {
 
     // from main thread
     void mainUpdateScreen(rfb::PixelBuffer *pb);
-    void mainUpdateBottleneckStats(const char userid[], const char stats[]);
-    void mainClearBottleneckStats(const char userid[]);
-    void mainUpdateServerFrameStats(uint8_t changedPerc, uint32_t all,
-                                    uint32_t jpeg, uint32_t webp, uint32_t analysis,
-                                    uint32_t jpegarea, uint32_t webparea,
-                                    uint16_t njpeg, uint16_t nwebp,
-                                    uint16_t enc, uint16_t scale, uint16_t shot,
-                                    uint16_t w, uint16_t h);
-    void mainUpdateClientFrameStats(const char userid[], uint32_t render, uint32_t all,
-                                    uint32_t ping);
-    void mainUpdateUserInfo(const uint8_t ownerConn, const uint8_t numUsers);
 
     // from network threads
     uint8_t *netGetScreenshot(uint16_t w, uint16_t h,
@@ -55,25 +42,13 @@ namespace network {
     uint8_t netAddUser(const char name[], const char pw[], const bool write);
     uint8_t netRemoveUser(const char name[]);
     uint8_t netGiveControlTo(const char name[]);
-    void netGetBottleneckStats(char *buf, uint32_t len);
-    void netGetFrameStats(char *buf, uint32_t len);
-    uint8_t netServerFrameStatsReady();
 
     enum USER_ACTION {
       //USER_ADD, - handled locally for interactivity
       USER_REMOVE,
       USER_GIVE_CONTROL,
-      WANT_FRAME_STATS_SERVERONLY,
-      WANT_FRAME_STATS_ALL,
-      WANT_FRAME_STATS_OWNER,
-      WANT_FRAME_STATS_SPECIFIC,
     };
 
-    uint8_t netRequestFrameStats(USER_ACTION what, const char *client);
-    uint8_t netOwnerConnected();
-    uint8_t netNumActiveUsers();
-    uint8_t netGetClientFrameStatsNum();
-
     struct action_data {
       enum USER_ACTION action;
       kasmpasswd_entry_t data;
@@ -93,40 +68,6 @@ namespace network {
     std::vector<uint8_t> cachedJpeg;
     uint16_t cachedW, cachedH;
     uint8_t cachedQ;
-
-    std::map<std::string, std::string> bottleneckStats;
-    pthread_mutex_t statMutex;
-
-    struct clientFrameStats_t {
-      uint32_t render;
-      uint32_t all;
-      uint32_t ping;
-    };
-    struct serverFrameStats_t {
-      uint32_t all;
-      uint32_t jpeg;
-      uint32_t webp;
-      uint32_t analysis;
-      uint32_t jpegarea;
-      uint32_t webparea;
-      uint16_t njpeg;
-      uint16_t nwebp;
-      uint16_t enc;
-      uint16_t scale;
-      uint16_t shot;
-      uint16_t w;
-      uint16_t h;
-      uint8_t changedPerc;
-
-      uint8_t inprogress;
-    };
-    std::map<std::string, clientFrameStats_t> clientFrameStats;
-    serverFrameStats_t serverFrameStats;
-    pthread_mutex_t frameStatMutex;
-
-    uint8_t ownerConnected;
-    uint8_t activeUsers;
-    pthread_mutex_t userInfoMutex;
   };
 
 }

common/network/GetAPIMessager.cxx

@@ -56,16 +56,10 @@ static const struct TightJPEGConfiguration conf[10] = {
 
 GetAPIMessager::GetAPIMessager(const char *passwdfile_): passwdfile(passwdfile_),
 					screenW(0), screenH(0), screenHash(0),
-					cachedW(0), cachedH(0), cachedQ(0),
+					cachedW(0), cachedH(0), cachedQ(0) {
-					ownerConnected(0), activeUsers(0) {
 
 	pthread_mutex_init(&screenMutex, NULL);
 	pthread_mutex_init(&userMutex, NULL);
-	pthread_mutex_init(&statMutex, NULL);
-	pthread_mutex_init(&frameStatMutex, NULL);
-	pthread_mutex_init(&userInfoMutex, NULL);
-
-	serverFrameStats.inprogress = 0;
 }
 
 // from main thread
@@ -101,78 +95,6 @@ void GetAPIMessager::mainUpdateScreen(rfb::PixelBuffer *pb) {
 	pthread_mutex_unlock(&screenMutex);
 }
 
-void GetAPIMessager::mainUpdateBottleneckStats(const char userid[], const char stats[]) {
-	if (pthread_mutex_trylock(&statMutex))
-		return;
-
-	bottleneckStats[userid] = stats;
-
-	pthread_mutex_unlock(&statMutex);
-}
-
-void GetAPIMessager::mainClearBottleneckStats(const char userid[]) {
-	if (pthread_mutex_lock(&statMutex))
-		return;
-
-	bottleneckStats.erase(userid);
-
-	pthread_mutex_unlock(&statMutex);
-}
-
-void GetAPIMessager::mainUpdateServerFrameStats(uint8_t changedPerc,
-	uint32_t all, uint32_t jpeg, uint32_t webp, uint32_t analysis,
-	uint32_t jpegarea, uint32_t webparea,
-	uint16_t njpeg, uint16_t nwebp,
-	uint16_t enc, uint16_t scale, uint16_t shot,
-	uint16_t w, uint16_t h) {
-
-	if (pthread_mutex_lock(&frameStatMutex))
-		return;
-
-	serverFrameStats.changedPerc = changedPerc;
-	serverFrameStats.all = all;
-	serverFrameStats.jpeg = jpeg;
-	serverFrameStats.webp = webp;
-	serverFrameStats.analysis = analysis;
-	serverFrameStats.jpegarea = jpegarea;
-	serverFrameStats.webparea = webparea;
-	serverFrameStats.njpeg = njpeg;
-	serverFrameStats.nwebp = nwebp;
-	serverFrameStats.enc = enc;
-	serverFrameStats.scale = scale;
-	serverFrameStats.shot = shot;
-	serverFrameStats.w = w;
-	serverFrameStats.h = h;
-
-	pthread_mutex_unlock(&frameStatMutex);
-}
-
-void GetAPIMessager::mainUpdateClientFrameStats(const char userid[], uint32_t render,
-	uint32_t all, uint32_t ping) {
-
-	if (pthread_mutex_lock(&frameStatMutex))
-		return;
-
-	clientFrameStats_t s;
-	s.render = render;
-	s.all = all;
-	s.ping = ping;
-
-	clientFrameStats[userid] = s;
-
-	pthread_mutex_unlock(&frameStatMutex);
-}
-
-void GetAPIMessager::mainUpdateUserInfo(const uint8_t ownerConn, const uint8_t numUsers) {
-	if (pthread_mutex_lock(&userInfoMutex))
-		return;
-
-	ownerConnected = ownerConn;
-	activeUsers = numUsers;
-
-	pthread_mutex_unlock(&userInfoMutex);
-}
-
 // from network threads
 uint8_t *GetAPIMessager::netGetScreenshot(uint16_t w, uint16_t h,
 	const uint8_t q, const bool dedup,
@@ -364,271 +286,3 @@ uint8_t GetAPIMessager::netGiveControlTo(const char name[]) {
 
 	return 1;
 }
-
-void GetAPIMessager::netGetBottleneckStats(char *buf, uint32_t len) {
-/*
-{
-    "username.1": {
-        "192.168.100.2:14908": [ 100, 100, 100, 100 ],
-        "192.168.100.3:14918": [ 100, 100, 100, 100 ]
-    },
-    "username.2": {
-        "192.168.100.5:14904": [ 100, 100, 100, 100 ]
-    }
-}
-*/
-	std::map<std::string, std::string>::const_iterator it;
-	const char *prev = NULL;
-	FILE *f;
-
-	if (pthread_mutex_lock(&statMutex)) {
-		buf[0] = 0;
-		return;
-	}
-
-	// Conservative estimate
-	if (len < bottleneckStats.size() * 60) {
-		buf[0] = 0;
-		goto out;
-	}
-
-	f = fmemopen(buf, len, "w");
-
-	fprintf(f, "{\n");
-
-	for (it = bottleneckStats.begin(); it != bottleneckStats.end(); it++) {
-		// user@127.0.0.1_1627311208.791752::websocket
-		const char *id = it->first.c_str();
-		const char *data = it->second.c_str();
-
-		const char *at = strchr(id, '@');
-		if (!at)
-			continue;
-
-		const unsigned userlen = at - id;
-		if (prev && !strncmp(prev, id, userlen)) {
-			// Same user
-			fprintf(f, ",\n\t\t\"%s\": %s", at + 1, data);
-		} else {
-			// New one
-			if (prev) {
-				fprintf(f, "\n\t},\n");
-			}
-			fprintf(f, "\t\"%.*s\": {\n", userlen, id);
-			fprintf(f, "\t\t\"%s\": %s", at + 1, data);
-		}
-
-		prev = id;
-	}
-
-	if (!bottleneckStats.size())
-		fprintf(f, "}\n");
-	else
-		fprintf(f, "\n\t}\n}\n");
-
-	fclose(f);
-
-out:
-	pthread_mutex_unlock(&statMutex);
-}
-
-void GetAPIMessager::netGetFrameStats(char *buf, uint32_t len) {
-/*
-{
-	"frame" : {
-		"resx": 1024,
-		"resy": 1280,
-		"changed": 75,
-		"server_time": 23
-	},
-	"server_side" : [
-		{ "process_name": "Analysis", "time": 20 },
-		{ "process_name": "TightWEBPEncoder", "time": 20, "count": 64, "area": 12 },
-		{ "process_name": "TightJPEGEncoder", "time": 20, "count": 64, "area": 12 }
-	],
-	"client_side" : [
-		{
-			"client": "123.1.2.1:1211",
-			"client_time": 20,
-			"ping": 20,
-			"processes" : [
-				{ "process_name": "scanRenderQ", "time": 20 }
-			]
-		}
-	}
-}
-*/
-	std::map<std::string, clientFrameStats_t>::const_iterator it;
-	unsigned i = 0;
-	FILE *f;
-
-	if (pthread_mutex_lock(&frameStatMutex)) {
-		buf[0] = 0;
-		return;
-	}
-
-	const unsigned num = clientFrameStats.size();
-
-	// Conservative estimate
-	if (len < 1024) {
-		buf[0] = 0;
-		goto out;
-	}
-
-	f = fmemopen(buf, len, "w");
-
-	fprintf(f, "{\n");
-
-	fprintf(f, "\t\"frame\" : {\n"
-	           "\t\t\"resx\": %u,\n"
-	           "\t\t\"resy\": %u,\n"
-	           "\t\t\"changed\": %u,\n"
-	           "\t\t\"server_time\": %u\n"
-	           "\t},\n",
-	           serverFrameStats.w,
-	           serverFrameStats.h,
-	           serverFrameStats.changedPerc,
-	           serverFrameStats.all);
-
-	fprintf(f, "\t\"server_side\" : [\n"
-	           "\t\t{ \"process_name\": \"Analysis\", \"time\": %u },\n"
-	           "\t\t{ \"process_name\": \"Screenshot\", \"time\": %u },\n"
-	           "\t\t{ \"process_name\": \"Encoding_total\", \"time\": %u, \"videoscaling\": %u },\n"
-	           "\t\t{ \"process_name\": \"TightJPEGEncoder\", \"time\": %u, \"count\": %u, \"area\": %u },\n"
-	           "\t\t{ \"process_name\": \"TightWEBPEncoder\", \"time\": %u, \"count\": %u, \"area\": %u }\n"
-	           "\t],\n",
-	           serverFrameStats.analysis,
-	           serverFrameStats.shot,
-	           serverFrameStats.enc,
-	           serverFrameStats.scale,
-	           serverFrameStats.jpeg,
-	           serverFrameStats.njpeg,
-	           serverFrameStats.jpegarea,
-	           serverFrameStats.webp,
-	           serverFrameStats.nwebp,
-	           serverFrameStats.webparea);
-
-	fprintf(f, "\t\"client_side\" : [\n");
-
-	for (it = clientFrameStats.begin(); it != clientFrameStats.end(); it++, i++) {
-		const char *id = it->first.c_str();
-		const clientFrameStats_t &s = it->second;
-
-		fprintf(f, "\t\t\{\n"
-		           "\t\t\t\"client\": \"%s\",\n"
-		           "\t\t\t\"client_time\": %u,\n"
-		           "\t\t\t\"ping\": %u,\n"
-		           "\t\t\t\"processes\" : [\n"
-		           "\t\t\t\t{ \"process_name\": \"scanRenderQ\", \"time\": %u }\n"
-		           "\t\t\t]\n"
-		           "\t\t}",
-		           id,
-		           s.all,
-		           s.ping,
-		           s.render);
-
-		if (i == num - 1)
-			fprintf(f, "\n");
-		else
-			fprintf(f, ",\n");
-	}
-
-	fprintf(f, "\t]\n}\n");
-
-	fclose(f);
-
-	serverFrameStats.inprogress = 0;
-
-out:
-	pthread_mutex_unlock(&frameStatMutex);
-}
-
-uint8_t GetAPIMessager::netRequestFrameStats(USER_ACTION what, const char *client) {
-	// Return 1 for success
-	action_data act;
-	act.action = what;
-	if (client) {
-		strncpy(act.data.password, client, PASSWORD_LEN);
-		act.data.password[PASSWORD_LEN - 1] = '\0';
-	}
-
-	// In progress already?
-	bool fail = false;
-	if (pthread_mutex_lock(&frameStatMutex))
-		return 0;
-
-	if (serverFrameStats.inprogress) {
-		fail = true;
-		vlog.error("Frame stats request already in progress, refusing another");
-	} else {
-		clientFrameStats.clear();
-		memset(&serverFrameStats, 0, sizeof(serverFrameStats_t));
-		serverFrameStats.inprogress = 1;
-	}
-
-	pthread_mutex_unlock(&frameStatMutex);
-	if (fail)
-		return 0;
-
-	// Send it in
-	if (pthread_mutex_lock(&userMutex))
-		return 0;
-
-	actionQueue.push_back(act);
-
-	pthread_mutex_unlock(&userMutex);
-
-	return 1;
-}
-
-uint8_t GetAPIMessager::netOwnerConnected() {
-	uint8_t ret;
-
-	if (pthread_mutex_lock(&userInfoMutex))
-		return 0;
-
-	ret = ownerConnected;
-
-	pthread_mutex_unlock(&userInfoMutex);
-
-	return ret;
-}
-
-uint8_t GetAPIMessager::netNumActiveUsers() {
-	uint8_t ret;
-
-	if (pthread_mutex_lock(&userInfoMutex))
-		return 0;
-
-	ret = activeUsers;
-
-	pthread_mutex_unlock(&userInfoMutex);
-
-	return ret;
-}
-
-uint8_t GetAPIMessager::netGetClientFrameStatsNum() {
-	uint8_t ret;
-
-	if (pthread_mutex_lock(&frameStatMutex))
-		return 0;
-
-	ret = clientFrameStats.size();
-
-	pthread_mutex_unlock(&frameStatMutex);
-
-	return ret;
-}
-
-uint8_t GetAPIMessager::netServerFrameStatsReady() {
-	uint8_t ret;
-
-	if (pthread_mutex_lock(&frameStatMutex))
-		return 0;
-
-	ret = serverFrameStats.w != 0;
-
-	pthread_mutex_unlock(&frameStatMutex);
-
-	return ret;
-}

common/network/TcpSocket.cxx

@@ -40,8 +40,6 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <wordexp.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include "websocket.h"
 
 #include <network/GetAPI.h>
@@ -461,67 +459,6 @@ static uint8_t givecontrolCb(void *messager, const char name[])
   return msgr->netGiveControlTo(name);
 }
 
-static void bottleneckStatsCb(void *messager, char *buf, uint32_t len)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  msgr->netGetBottleneckStats(buf, len);
-}
-
-static void frameStatsCb(void *messager, char *buf, uint32_t len)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  msgr->netGetFrameStats(buf, len);
-}
-
-static uint8_t requestFrameStatsNoneCb(void *messager)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netRequestFrameStats(GetAPIMessager::WANT_FRAME_STATS_SERVERONLY, NULL);
-}
-
-static uint8_t requestFrameStatsOwnerCb(void *messager)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netRequestFrameStats(GetAPIMessager::WANT_FRAME_STATS_OWNER, NULL);
-}
-
-static uint8_t requestFrameStatsAllCb(void *messager)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netRequestFrameStats(GetAPIMessager::WANT_FRAME_STATS_ALL, NULL);
-}
-
-static uint8_t requestFrameStatsOneCb(void *messager, const char *client)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netRequestFrameStats(GetAPIMessager::WANT_FRAME_STATS_SPECIFIC, client);
-}
-
-static uint8_t ownerConnectedCb(void *messager)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netOwnerConnected();
-}
-
-static uint8_t numActiveUsersCb(void *messager)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netNumActiveUsers();
-}
-
-static uint8_t getClientFrameStatsNumCb(void *messager)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netGetClientFrameStatsNum();
-}
-
-static uint8_t serverFrameStatsReadyCb(void *messager)
-{
-  GetAPIMessager *msgr = (GetAPIMessager *) messager;
-  return msgr->netServerFrameStatsReady();
-}
-
-
 WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
                          socklen_t listenaddrlen,
                          bool sslonly, const char *cert, const char *certkey,
@@ -566,7 +503,7 @@ WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
   if (bind(sock, &sa.u.sa, listenaddrlen) == -1) {
     int e = errorNumber;
     closesocket(sock);
-    throw SocketException("failed to bind socket, is someone else on our -websocketPort?", e);
+    throw SocketException("failed to bind socket", e);
   }
 
   listen(sock); // sets the internal fd
@@ -576,16 +513,13 @@ WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
   //
   internalSocket = socket(AF_UNIX, SOCK_STREAM, 0);
 
-  char sockname[32];
-  sprintf(sockname, ".KasmVNCSock%u", getpid());
-
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
-  strcpy(addr.sun_path, sockname);
+  strcpy(addr.sun_path, ".KasmVNCSock");
   addr.sun_path[0] = '\0';
 
   if (bind(internalSocket, (struct sockaddr *) &addr,
-           sizeof(sa_family_t) + strlen(sockname))) {
+           sizeof(sa_family_t) + sizeof(".KasmVNCSock"))) {
     throw SocketException("failed to bind socket", errorNumber);
   }
 
@@ -614,18 +548,6 @@ WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
   settings.adduserCb = adduserCb;
   settings.removeCb = removeCb;
   settings.givecontrolCb = givecontrolCb;
-  settings.bottleneckStatsCb = bottleneckStatsCb;
-  settings.frameStatsCb = frameStatsCb;
-
-  settings.requestFrameStatsNoneCb = requestFrameStatsNoneCb;
-  settings.requestFrameStatsOwnerCb = requestFrameStatsOwnerCb;
-  settings.requestFrameStatsAllCb = requestFrameStatsAllCb;
-  settings.requestFrameStatsOneCb = requestFrameStatsOneCb;
-
-  settings.ownerConnectedCb = ownerConnectedCb;
-  settings.numActiveUsersCb = numActiveUsersCb;
-  settings.getClientFrameStatsNumCb = getClientFrameStatsNumCb;
-  settings.serverFrameStatsReadyCb = serverFrameStatsReadyCb;
 
   pthread_t tid;
   pthread_create(&tid, NULL, start_server, NULL);

common/network/websocket.c

@@ -566,7 +566,7 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
     headers->key3[0] = '\0';
 
     if ((strlen(handshake) < 92) || (bcmp(handshake, "GET ", 4) != 0) ||
-        (!strcasestr(handshake, "Upgrade: websocket"))) {
+        (!strstr(handshake, "Upgrade: websocket"))) {
         return 0;
     }
     start = handshake+4;
@@ -583,11 +583,11 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
     headers->host[end-start] = '\0';
 
     headers->origin[0] = '\0';
-    start = strcasestr(handshake, "\r\nOrigin: ");
+    start = strstr(handshake, "\r\nOrigin: ");
     if (start) {
         start += 10;
     } else {
-        start = strcasestr(handshake, "\r\nSec-WebSocket-Origin: ");
+        start = strstr(handshake, "\r\nSec-WebSocket-Origin: ");
         if (!start) { return 0; }
         start += 24;
     }
@@ -595,7 +595,7 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
     strncpy(headers->origin, start, end-start);
     headers->origin[end-start] = '\0';
 
-    start = strcasestr(handshake, "\r\nSec-WebSocket-Version: ");
+    start = strstr(handshake, "\r\nSec-WebSocket-Version: ");
     if (start) {
         // HyBi/RFC 6455
         start += 25;
@@ -605,7 +605,7 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
         ws_ctx->hixie = 0;
         ws_ctx->hybi = strtol(headers->version, NULL, 10);
 
-        start = strcasestr(handshake, "\r\nSec-WebSocket-Key: ");
+        start = strstr(handshake, "\r\nSec-WebSocket-Key: ");
         if (!start) { return 0; }
         start += 21;
         end = strstr(start, "\r\n");
@@ -619,7 +619,7 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
         strncpy(headers->connection, start, end-start);
         headers->connection[end-start] = '\0';
 
-        start = strcasestr(handshake, "\r\nSec-WebSocket-Protocol: ");
+        start = strstr(handshake, "\r\nSec-WebSocket-Protocol: ");
         if (!start) { return 0; }
         start += 26;
         end = strstr(start, "\r\n");
@@ -637,14 +637,14 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
             strncpy(headers->key3, start, 8);
             headers->key3[8] = '\0';
 
-            start = strcasestr(handshake, "\r\nSec-WebSocket-Key1: ");
+            start = strstr(handshake, "\r\nSec-WebSocket-Key1: ");
             if (!start) { return 0; }
             start += 22;
             end = strstr(start, "\r\n");
             strncpy(headers->key1, start, end-start);
             headers->key1[end-start] = '\0';
 
-            start = strcasestr(handshake, "\r\nSec-WebSocket-Key2: ");
+            start = strstr(handshake, "\r\nSec-WebSocket-Key2: ");
             if (!start) { return 0; }
             start += 22;
             end = strstr(start, "\r\n");
@@ -1074,89 +1074,6 @@ static uint8_t ownerapi(ws_ctx_t *ws_ctx, const char *in) {
 
         wserr("Passed give_control request to main thread\n");
         ret = 1;
-    } else entry("/api/get_bottleneck_stats") {
-        char statbuf[4096];
-        settings.bottleneckStatsCb(settings.messager, statbuf, 4096);
-
-        sprintf(buf, "HTTP/1.1 200 OK\r\n"
-                 "Server: KasmVNC/4.0\r\n"
-                 "Connection: close\r\n"
-                 "Content-type: text/plain\r\n"
-                 "Content-length: %lu\r\n"
-                 "\r\n", strlen(statbuf));
-        ws_send(ws_ctx, buf, strlen(buf));
-        ws_send(ws_ctx, statbuf, strlen(statbuf));
-
-        wserr("Sent bottleneck stats to API caller\n");
-        ret = 1;
-    } else entry("/api/get_frame_stats") {
-        char statbuf[4096], decname[1024];
-        unsigned waitfor;
-
-        param = parse_get(args, "client", &len);
-        if (len) {
-            memcpy(buf, param, len);
-            buf[len] = '\0';
-            percent_decode(buf, decname);
-        } else {
-            wserr("client param required\n");
-            goto nope;
-        }
-
-        if (!decname[0])
-            goto nope;
-
-        if (!strcmp(decname, "none")) {
-            waitfor = 0;
-            if (!settings.requestFrameStatsNoneCb(settings.messager))
-                goto nope;
-        } else if (!strcmp(decname, "auto")) {
-            waitfor = settings.ownerConnectedCb(settings.messager);
-            if (!waitfor) {
-                if (!settings.requestFrameStatsNoneCb(settings.messager))
-                    goto nope;
-            } else {
-                if (!settings.requestFrameStatsOwnerCb(settings.messager))
-                    goto nope;
-            }
-        } else if (!strcmp(decname, "all")) {
-            waitfor = settings.numActiveUsersCb(settings.messager);
-            if (!settings.requestFrameStatsAllCb(settings.messager))
-                goto nope;
-        } else {
-            waitfor = 1;
-            if (!settings.requestFrameStatsOneCb(settings.messager, decname))
-                goto nope;
-        }
-
-        while (1) {
-            usleep(10 * 1000);
-            if (settings.serverFrameStatsReadyCb(settings.messager))
-                break;
-        }
-
-        if (waitfor) {
-            unsigned waits;
-            for (waits = 0; waits < 20; waits++) { // wait up to 2s
-                if (settings.getClientFrameStatsNumCb(settings.messager) >= waitfor)
-                    break;
-                usleep(100 * 1000);
-            }
-        }
-
-        settings.frameStatsCb(settings.messager, statbuf, 4096);
-
-        sprintf(buf, "HTTP/1.1 200 OK\r\n"
-                 "Server: KasmVNC/4.0\r\n"
-                 "Connection: close\r\n"
-                 "Content-type: text/plain\r\n"
-                 "Content-length: %lu\r\n"
-                 "\r\n", strlen(statbuf));
-        ws_send(ws_ctx, buf, strlen(buf));
-        ws_send(ws_ctx, statbuf, strlen(statbuf));
-
-        wserr("Sent frame stats to API caller\n");
-        ret = 1;
     }
 
     #undef entry

common/network/websocket.h

@@ -84,18 +84,6 @@ typedef struct {
                           const uint8_t write);
     uint8_t (*removeCb)(void *messager, const char name[]);
     uint8_t (*givecontrolCb)(void *messager, const char name[]);
-    void (*bottleneckStatsCb)(void *messager, char *buf, uint32_t len);
-    void (*frameStatsCb)(void *messager, char *buf, uint32_t len);
-
-    uint8_t (*requestFrameStatsNoneCb)(void *messager);
-    uint8_t (*requestFrameStatsOwnerCb)(void *messager);
-    uint8_t (*requestFrameStatsAllCb)(void *messager);
-    uint8_t (*requestFrameStatsOneCb)(void *messager, const char *client);
-
-    uint8_t (*ownerConnectedCb)(void *messager);
-    uint8_t (*numActiveUsersCb)(void *messager);
-    uint8_t (*getClientFrameStatsNumCb)(void *messager);
-    uint8_t (*serverFrameStatsReadyCb)(void *messager);
 } settings_t;
 
 #ifdef __cplusplus

common/network/websockify.c

@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include "websocket.h"
 
 /*
@@ -224,12 +223,9 @@ static void do_proxy(ws_ctx_t *ws_ctx, int target) {
 
 void proxy_handler(ws_ctx_t *ws_ctx) {
 
-    char sockname[32];
-    sprintf(sockname, ".KasmVNCSock%u", getpid());
-
     struct sockaddr_un addr;
     addr.sun_family = AF_UNIX;
-    strcpy(addr.sun_path, sockname);
+    strcpy(addr.sun_path, ".KasmVNCSock");
     addr.sun_path[0] = '\0';
 
     struct timeval tv;
@@ -247,7 +243,7 @@ void proxy_handler(ws_ctx_t *ws_ctx) {
     handler_msg("connecting to VNC target\n");
 
     if (connect(tsock, (struct sockaddr *) &addr,
-        sizeof(sa_family_t) + strlen(sockname)) < 0) {
+        sizeof(sa_family_t) + sizeof(".KasmVNCSock")) < 0) {
 
         handler_emsg("Could not connect to target: %s\n",
                      strerror(errno));

common/rfb/ComparingUpdateTracker.cxx

@@ -695,8 +695,6 @@ bool ComparingUpdateTracker::compare(bool skipScrollDetection, const Region &ski
   std::vector<Rect> rects;
   std::vector<Rect>::iterator i;
 
-  changedPerc = 100;
-
   if (!enabled)
     return false;
 
@@ -751,13 +749,8 @@ bool ComparingUpdateTracker::compare(bool skipScrollDetection, const Region &ski
   for (i = rects.begin(); i != rects.end(); i++)
     totalPixels += i->area();
   newChanged.get_rects(&rects);
-  unsigned newchangedarea = 0;
+  for (i = rects.begin(); i != rects.end(); i++)
-  for (i = rects.begin(); i != rects.end(); i++) {
     missedPixels += i->area();
-    newchangedarea += i->area();
-  }
-
-  changedPerc = newchangedarea * 100 / fb->area();
 
   if (changed.equals(newChanged))
     return false;

common/rfb/ComparingUpdateTracker.h

@@ -48,8 +48,6 @@ namespace rfb {
     virtual void getUpdateInfo(UpdateInfo* info, const Region& cliprgn);
     virtual void clear();
 
-    rdr::U8 changedPerc;
-
   private:
     void compareRect(const Rect& r, Region* newchanged, const Region &skipCursorArea);
     PixelBuffer* fb;

common/rfb/Congestion.cxx

@@ -298,11 +298,6 @@ size_t Congestion::getBandwidth()
   return congWindow * 1000 / safeBaseRTT;
 }
 
-unsigned Congestion::getPingTime() const
-{
-  return safeBaseRTT;
-}
-
 void Congestion::debugTrace(const char* filename, int fd)
 {
 #ifdef CONGESTION_TRACE

common/rfb/Congestion.h

@@ -51,8 +51,6 @@ namespace rfb {
     // per second.
     size_t getBandwidth();
 
-    unsigned getPingTime() const;
-
     // debugTrace() writes the current congestion window, as well as the
     // congestion window of the underlying TCP layer, to the specified
     // file

common/rfb/ConnParams.cxx

@@ -37,7 +37,6 @@ ConnParams::ConnParams()
     width(0), height(0), useCopyRect(false),
     supportsLocalCursor(false), supportsLocalXCursor(false),
     supportsLocalCursorWithAlpha(false),
-    supportsVMWareCursor(false),
     supportsCursorPosition(false),
     supportsDesktopResize(false), supportsExtendedDesktopSize(false),
     supportsDesktopRename(false), supportsLastRect(false),
@@ -124,7 +123,6 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
   useCopyRect = false;
   supportsLocalCursor = false;
   supportsLocalCursorWithAlpha = false;
-  supportsVMWareCursor = false;
   supportsDesktopResize = false;
   supportsExtendedDesktopSize = false;
   supportsLocalXCursor = false;
@@ -155,9 +153,6 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
     case pseudoEncodingCursorWithAlpha:
       supportsLocalCursorWithAlpha = true;
       break;
-    case pseudoEncodingVMwareCursor:
-      supportsVMWareCursor = true;
-      break;
     case pseudoEncodingDesktopSize:
       supportsDesktopResize = true;
       break;

common/rfb/ConnParams.h

@@ -102,7 +102,6 @@ namespace rfb {
     bool supportsLocalCursor;
     bool supportsLocalXCursor;
     bool supportsLocalCursorWithAlpha;
-    bool supportsVMWareCursor;
     bool supportsCursorPosition;
     bool supportsDesktopResize;
     bool supportsExtendedDesktopSize;

common/rfb/EncodeManager.cxx

@@ -359,8 +359,6 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
     changed = changed_;
 
     gettimeofday(&start, NULL);
-    memset(&jpegstats, 0, sizeof(codecstats_t));
-    memset(&webpstats, 0, sizeof(codecstats_t));
 
     if (allowLossy && activeEncoders[encoderFullColour] == encoderTightWEBP) {
         const unsigned rate = 1024 * 1000 / rfb::Server::frameRate;
@@ -1016,7 +1014,6 @@ void EncodeManager::writeRects(const Region& changed, const PixelBuffer* pb,
   std::vector<uint8_t> isWebp, fromCache;
   std::vector<Palette> palettes;
   std::vector<std::vector<uint8_t> > compresseds;
-  std::vector<uint32_t> ms;
   uint32_t i;
 
   if (rfb::Server::rectThreads > 0)
@@ -1081,13 +1078,9 @@ void EncodeManager::writeRects(const Region& changed, const PixelBuffer* pb,
   palettes.resize(subrects.size());
   compresseds.resize(subrects.size());
   scaledrects.resize(subrects.size());
-  ms.resize(subrects.size());
 
   // In case the current resolution is above the max video res, and video was detected,
   // scale to that res, keeping aspect ratio
-  struct timeval scalestart;
-  gettimeofday(&scalestart, NULL);
-
   const PixelBuffer *scaledpb = NULL;
   if (videoDetected &&
       (maxVideoX < pb->getRect().width() || maxVideoY < pb->getRect().height())) {
@@ -1136,25 +1129,15 @@ void EncodeManager::writeRects(const Region& changed, const PixelBuffer* pb,
       }
     }
   }
-  scalingTime = msSince(&scalestart);
 
   #pragma omp parallel for schedule(dynamic, 1)
   for (i = 0; i < subrects.size(); ++i) {
     encoderTypes[i] = getEncoderType(subrects[i], pb, &palettes[i], compresseds[i],
                                      &isWebp[i], &fromCache[i],
-                                     scaledpb, scaledrects[i], ms[i]);
+                                     scaledpb, scaledrects[i]);
     checkWebpFallback(start);
   }
 
-  for (i = 0; i < subrects.size(); ++i) {
-    if (encoderTypes[i] == encoderFullColour) {
-      if (isWebp[i])
-        webpstats.ms += ms[i];
-      else
-        jpegstats.ms += ms[i];
-    }
-  }
-
   if (start) {
     encodingTime = msSince(start);
 
@@ -1195,8 +1178,7 @@ void EncodeManager::writeRects(const Region& changed, const PixelBuffer* pb,
 uint8_t EncodeManager::getEncoderType(const Rect& rect, const PixelBuffer *pb,
                                       Palette *pal, std::vector<uint8_t> &compressed,
                                       uint8_t *isWebp, uint8_t *fromCache,
-                                      const PixelBuffer *scaledpb, const Rect& scaledrect,
+                                      const PixelBuffer *scaledpb, const Rect& scaledrect) const
-                                      uint32_t &ms) const
 {
   struct RectInfo info;
   unsigned int maxColours = 256;
@@ -1249,12 +1231,9 @@ uint8_t EncodeManager::getEncoderType(const Rect& rect, const PixelBuffer *pb,
 
   *isWebp = 0;
   *fromCache = 0;
-  ms = 0;
   if (type == encoderFullColour) {
     uint32_t len;
     const void *data;
-    struct timeval start;
-    gettimeofday(&start, NULL);
 
     if (encCache->enabled &&
         (data = encCache->get(activeEncoders[encoderFullColour],
@@ -1295,8 +1274,6 @@ uint8_t EncodeManager::getEncoderType(const Rect& rect, const PixelBuffer *pb,
                                                                       compressed,
                                                                       videoDetected);
     }
-
-    ms = msSince(&start);
   }
 
   delete ppb;
@@ -1315,15 +1292,10 @@ void EncodeManager::writeSubRect(const Rect& rect, const PixelBuffer *pb,
   encoder = startRect(rect, type, compressed.size() == 0, isWebp);
 
   if (compressed.size()) {
-    if (isWebp) {
+    if (isWebp)
       ((TightWEBPEncoder *) encoder)->writeOnly(compressed);
-      webpstats.area += rect.area();
+    else
-      webpstats.rects++;
-    } else {
       ((TightJPEGEncoder *) encoder)->writeOnly(compressed);
-      jpegstats.area += rect.area();
-      jpegstats.rects++;
-    }
   } else {
     if (encoder->flags & EncoderUseNativePF) {
       ppb = preparePixelBuffer(rect, pb, false);

common/rfb/EncodeManager.h

@@ -68,24 +68,9 @@ namespace rfb {
                               const RenderedCursor* renderedCursor,
                               size_t maxUpdateSize);
 
-    void clearEncodingTime() {
-        encodingTime = 0;
-    };
-
     unsigned getEncodingTime() const {
         return encodingTime;
     };
-    unsigned getScalingTime() const {
-        return scalingTime;
-    };
-
-    struct codecstats_t {
-      uint32_t ms;
-      uint32_t area;
-      uint32_t rects;
-    };
-
-    codecstats_t jpegstats, webpstats;
 
   protected:
     void doUpdate(bool allowLossy, const Region& changed,
@@ -120,8 +105,7 @@ namespace rfb {
     uint8_t getEncoderType(const Rect& rect, const PixelBuffer *pb, Palette *pal,
                            std::vector<uint8_t> &compressed, uint8_t *isWebp,
                            uint8_t *fromCache,
-                           const PixelBuffer *scaledpb, const Rect& scaledrect,
+                           const PixelBuffer *scaledpb, const Rect& scaledrect) const;
-                           uint32_t &ms) const;
     virtual bool handleTimeout(Timer* t);
 
     bool checkSolidTile(const Rect& r, const rdr::U8* colourValue,
@@ -199,7 +183,6 @@ namespace rfb {
     bool webpTookTooLong;
     unsigned encodingTime;
     unsigned maxEncodingTime, framesSinceEncPrint;
-    unsigned scalingTime;
 
     EncCache *encCache;
 

common/rfb/SMsgHandler.h

@@ -63,8 +63,7 @@ namespace rfb {
                                         const size_t* lengths,
                                         const rdr::U8* const* data);
 
-    virtual void sendStats(const bool toClient = true) = 0;
+    virtual void sendStats() = 0;
-    virtual void handleFrameStats(rdr::U32 all, rdr::U32 render) = 0;
 
     virtual bool canChangeKasmSettings() const = 0;
 

common/rfb/SMsgReader.cxx

@@ -80,9 +80,6 @@ void SMsgReader::readMsg()
   case msgTypeRequestStats:
     readRequestStats();
     break;
-  case msgTypeFrameStats:
-    readFrameStats();
-    break;
   case msgTypeKeyEvent:
     readKeyEvent();
     break;
@@ -349,14 +346,6 @@ void SMsgReader::readRequestStats()
   handler->sendStats();
 }
 
-void SMsgReader::readFrameStats()
-{
-  is->skip(3);
-  rdr::U32 all = is->readU32();
-  rdr::U32 render = is->readU32();
-  handler->handleFrameStats(all, render);
-}
-
 void SMsgReader::readQEMUMessage()
 {
   int subType = is->readU8();

common/rfb/SMsgReader.h

@@ -57,7 +57,6 @@ namespace rfb {
     void readClientCutText();
     void readExtendedClipboard(rdr::S32 len);
     void readRequestStats();
-    void readFrameStats();
 
     void readQEMUMessage();
     void readQEMUKeyEvent();

common/rfb/SMsgWriter.cxx

@@ -43,7 +43,6 @@ SMsgWriter::SMsgWriter(ConnParams* cp_, rdr::OutStream* os_)
     needSetDesktopSize(false), needExtendedDesktopSize(false),
     needSetDesktopName(false), needSetCursor(false),
     needSetXCursor(false), needSetCursorWithAlpha(false),
-    needSetVMWareCursor(false),
     needCursorPos(false),
     needLEDState(false), needQEMUKeyEvent(false)
 {
@@ -209,12 +208,6 @@ void SMsgWriter::writeStats(const char* str, int len)
   endMsg();
 }
 
-void SMsgWriter::writeRequestFrameStats()
-{
-  startMsg(msgTypeRequestFrameStats);
-  endMsg();
-}
-
 void SMsgWriter::writeFence(rdr::U32 flags, unsigned len, const char data[])
 {
   if (!cp->supportsFence)
@@ -322,16 +315,6 @@ bool SMsgWriter::writeSetCursorWithAlpha()
   return true;
 }
 
-bool SMsgWriter::writeSetVMwareCursor()
-{
-  if (!cp->supportsVMWareCursor)
-    return false;
-
-  needSetVMWareCursor = true;
-
-  return true;
-}
-
 void SMsgWriter::writeCursorPos()
 {
   if (!cp->supportsEncoding(pseudoEncodingVMwareCursorPosition))
@@ -366,7 +349,7 @@ bool SMsgWriter::needFakeUpdate()
 {
   if (needSetDesktopName)
     return true;
-  if (needSetCursor || needSetXCursor || needSetCursorWithAlpha || needSetVMWareCursor)
+  if (needSetCursor || needSetXCursor || needSetCursorWithAlpha)
     return true;
   if (needCursorPos)
     return true;
@@ -422,8 +405,6 @@ void SMsgWriter::writeFramebufferUpdateStart(int nRects)
       nRects++;
     if (needSetCursorWithAlpha)
       nRects++;
-    if (needSetVMWareCursor)
-      nRects++;
     if (needCursorPos)
       nRects++;
     if (needLEDState)
@@ -541,15 +522,6 @@ void SMsgWriter::writePseudoRects()
     needSetCursorWithAlpha = false;
   }
 
-  if (needSetVMWareCursor) {
-    const Cursor& cursor = cp->cursor();
-
-    writeSetVMwareCursorRect(cursor.width(), cursor.height(),
-                                cursor.hotspot().x, cursor.hotspot().y,
-                                cursor.getBuffer());
-    needSetVMWareCursor = false;
-  }
-
   if (needCursorPos) {
     const Point& cursorPos = cp->cursorPos();
 
@@ -740,28 +712,6 @@ void SMsgWriter::writeSetCursorWithAlphaRect(int width, int height,
   }
 }
 
-void SMsgWriter::writeSetVMwareCursorRect(int width, int height,
-                                          int hotspotX, int hotspotY,
-                                          const rdr::U8* data)
-{
-  if (!cp->supportsVMWareCursor)
-    throw Exception("Client does not support local cursors");
-  if (++nRectsInUpdate > nRectsInHeader && nRectsInHeader)
-    throw Exception("SMsgWriter::writeSetVMwareCursorRect: nRects out of sync");
-
-  os->writeS16(hotspotX);
-  os->writeS16(hotspotY);
-  os->writeU16(width);
-  os->writeU16(height);
-  os->writeU32(pseudoEncodingVMwareCursor);
-
-  os->writeU8(1); // Alpha cursor
-  os->pad(1);
-
-  // FIXME: Should alpha be premultiplied?
-  os->writeBytes(data, width*height*4);
-}
-
 void SMsgWriter::writeSetVMwareCursorPositionRect(int hotspotX, int hotspotY)
 {
   if (!cp->supportsEncoding(pseudoEncodingVMwareCursorPosition))

common/rfb/SMsgWriter.h

@@ -65,8 +65,6 @@ namespace rfb {
 
     void writeStats(const char* str, int len);
 
-    void writeRequestFrameStats();
-
     // writeFence() sends a new fence request or response to the client.
     void writeFence(rdr::U32 flags, unsigned len, const char data[]);
 
@@ -92,7 +90,6 @@ namespace rfb {
     bool writeSetCursor();
     bool writeSetXCursor();
     bool writeSetCursorWithAlpha();
-    bool writeSetVMwareCursor();
 
     // Notifies the client that the cursor pointer was moved by the server.
     void writeCursorPos();
@@ -152,9 +149,6 @@ namespace rfb {
     void writeSetCursorWithAlphaRect(int width, int height,
                                      int hotspotX, int hotspotY,
                                      const rdr::U8* data);
-    void writeSetVMwareCursorRect(int width, int height,
-                                  int hotspotX, int hotspotY,
-                                  const rdr::U8* data);
     void writeSetVMwareCursorPositionRect(int hotspotX, int hotspotY);
     void writeLEDStateRect(rdr::U8 state);
     void writeQEMUKeyEventRect();
@@ -171,7 +165,6 @@ namespace rfb {
     bool needSetCursor;
     bool needSetXCursor;
     bool needSetCursorWithAlpha;
-    bool needSetVMWareCursor;
     bool needCursorPos;
     bool needLEDState;
     bool needQEMUKeyEvent;

common/rfb/VNCSConnectionST.cxx

@@ -17,7 +17,6 @@
  * USA.
  */
 
-#include <network/GetAPI.h>
 #include <network/TcpSocket.h>
 
 #include <rfb/ComparingUpdateTracker.h>
@@ -62,7 +61,7 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
     continuousUpdates(false), encodeManager(this, &server_->encCache),
     needsPermCheck(false), pointerEventTime(0),
     clientHasCursor(false),
-    accessRights(AccessDefault), startTime(time(0)), frameTracking(false)
+    accessRights(AccessDefault), startTime(time(0))
 {
   setStreams(&sock->inStream(), &sock->outStream());
   peerEndpoint.buf = sock->getPeerEndpoint();
@@ -99,9 +98,6 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
   gettimeofday(&lastKeyEvent, NULL);
 
   server->clients.push_front(this);
-
-  if (server->apimessager)
-    server->apimessager->mainUpdateUserInfo(checkOwnerConn(), server->clients.size());
 }
 
 
@@ -132,11 +128,6 @@ VNCSConnectionST::~VNCSConnectionST()
   server->clients.remove(this);
 
   delete [] fenceData;
-
-  if (server->apimessager) {
-    server->apimessager->mainUpdateUserInfo(checkOwnerConn(), server->clients.size());
-    server->apimessager->mainClearBottleneckStats(peerEndpoint.buf);
-  }
 }
 
 
@@ -576,7 +567,6 @@ bool VNCSConnectionST::needRenderedCursor()
     return false;
 
   if (!cp.supportsLocalCursorWithAlpha &&
-      !cp.supportsVMWareCursor &&
       !cp.supportsLocalCursor && !cp.supportsLocalXCursor)
     return true;
   if (!server->cursorPos.equals(pointerEventPos) &&
@@ -1194,7 +1184,6 @@ bool VNCSConnectionST::isCongested()
 void VNCSConnectionST::writeFramebufferUpdate()
 {
   congestion.updatePosition(sock->outStream().length());
-  encodeManager.clearEncodingTime();
 
   // We're in the middle of processing a command that's supposed to be
   // synchronised. Allowing an update to slip out right now might violate
@@ -1240,9 +1229,6 @@ void VNCSConnectionST::writeFramebufferUpdate()
   // window.
   sock->cork(true);
 
-  if (frameTracking)
-    writer()->writeRequestFrameStats();
-
   // First take care of any updates that cannot contain framebuffer data
   // changes.
   writeNoDataUpdate();
@@ -1473,7 +1459,7 @@ static void pruneStatList(std::list<struct timeval> &list, const struct timeval
   }
 }
 
-void VNCSConnectionST::sendStats(const bool toClient) {
+void VNCSConnectionST::sendStats() {
   char buf[1024];
   struct timeval now;
 
@@ -1512,28 +1498,8 @@ void VNCSConnectionST::sendStats(const bool toClient) {
 
   #undef ten
 
-  if (toClient) {
+  vlog.info("Sending client stats:\n%s\n", buf);
-    vlog.info("Sending client stats:\n%s\n", buf);
+  writer()->writeStats(buf, strlen(buf));
-    writer()->writeStats(buf, strlen(buf));
-  } else if (server->apimessager) {
-    server->apimessager->mainUpdateBottleneckStats(peerEndpoint.buf, buf);
-  }
-}
-
-void VNCSConnectionST::handleFrameStats(rdr::U32 all, rdr::U32 render)
-{
-  if (server->apimessager) {
-    const char *at = strchr(peerEndpoint.buf, '@');
-    if (!at)
-      at = peerEndpoint.buf;
-    else
-      at++;
-
-    server->apimessager->mainUpdateClientFrameStats(at, render, all,
-                                                    congestion.getPingTime());
-  }
-
-  frameTracking = false;
 }
 
 // setCursor() is called whenever the cursor has changed shape or pixel format.
@@ -1554,13 +1520,11 @@ void VNCSConnectionST::setCursor()
     clientHasCursor = true;
   }
 
-  if (!writer()->writeSetVMwareCursor()) {
+  if (!writer()->writeSetCursorWithAlpha()) {
-    if (!writer()->writeSetCursorWithAlpha()) {
+    if (!writer()->writeSetCursor()) {
-      if (!writer()->writeSetCursor()) {
+      if (!writer()->writeSetXCursor()) {
-        if (!writer()->writeSetXCursor()) {
+        // No client support
-          // No client support
+        return;
-          return;
-        }
       }
     }
   }
@@ -1647,15 +1611,3 @@ int VNCSConnectionST::getStatus()
   return 4;
 }
 
-bool VNCSConnectionST::checkOwnerConn() const
-{
-  std::list<VNCSConnectionST*>::const_iterator it;
-
-  for (it = server->clients.begin(); it != server->clients.end(); it++) {
-    bool write, owner;
-    if ((*it)->getPerms(write, owner) && owner)
-      return true;
-  }
-
-  return false;
-}

common/rfb/VNCSConnectionST.h

@@ -164,35 +164,6 @@ namespace rfb {
     void setStatus(int status);
     int getStatus();
 
-    virtual void sendStats(const bool toClient = true);
-    virtual void handleFrameStats(rdr::U32 all, rdr::U32 render);
-
-    bool is_owner() const {
-      bool write, owner;
-      if (getPerms(write, owner) && owner)
-        return true;
-      return false;
-    }
-
-    void setFrameTracking() {
-      frameTracking = true;
-    }
-
-    EncodeManager::codecstats_t getJpegStats() const {
-      return encodeManager.jpegstats;
-    }
-
-    EncodeManager::codecstats_t getWebpStats() const {
-      return encodeManager.webpstats;
-    }
-
-    unsigned getEncodingTime() const {
-      return encodeManager.getEncodingTime();
-    }
-    unsigned getScalingTime() const {
-      return encodeManager.getScalingTime();
-    }
-
   private:
     // SConnection callbacks
 
@@ -220,6 +191,7 @@ namespace rfb {
     virtual void supportsContinuousUpdates();
     virtual void supportsLEDState();
 
+    virtual void sendStats();
     virtual bool canChangeKasmSettings() const {
         return (accessRights & (AccessPtrEvents | AccessKeyEvents)) ==
                (AccessPtrEvents | AccessKeyEvents);
@@ -247,8 +219,6 @@ namespace rfb {
 
     bool getPerms(bool &write, bool &owner) const;
 
-    bool checkOwnerConn() const;
-
     // Congestion control
     void writeRTTPing();
     bool isCongested();
@@ -324,8 +294,6 @@ namespace rfb {
     time_t startTime;
 
     std::vector<CopyPassRect> copypassed;
-
-    bool frameTracking;
   };
 }
 #endif

common/rfb/VNCServerST.cxx

@@ -128,7 +128,7 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)
     renderedCursorInvalid(false),
     queryConnectionHandler(0), keyRemapper(&KeyRemapper::defInstance),
     lastConnectionTime(0), disableclients(false),
-    frameTimer(this), apimessager(NULL), trackingFrameStats(0)
+    frameTimer(this), apimessager(NULL)
 {
   lastUserInputTime = lastDisconnectTime = time(0);
   slog.debug("creating single-threaded server %s", name.buf);
@@ -210,8 +210,6 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)
     if (inotify_add_watch(inotifyfd, kasmpasswdpath, IN_CLOSE_WRITE | IN_DELETE_SELF) < 0)
       slog.error("Failed to set watch");
   }
-
-  trackingClient[0] = 0;
 }
 
 VNCServerST::~VNCServerST()
@@ -273,11 +271,6 @@ void VNCServerST::removeSocket(network::Socket* sock) {
   std::list<VNCSConnectionST*>::iterator ci;
   for (ci = clients.begin(); ci != clients.end(); ci++) {
     if ((*ci)->getSock() == sock) {
-
-      if (clipboardClient == *ci)
-        handleClipboardAnnounce(*ci, false);
-      clipboardRequestors.remove(*ci);
-
       // - Delete the per-Socket resources
       delete *ci;
 
@@ -781,8 +774,7 @@ int VNCServerST::msToNextUpdate()
     return frameTimer.getRemainingMs();
 }
 
-static void checkAPIMessages(network::GetAPIMessager *apimessager,
+static void checkAPIMessages(network::GetAPIMessager *apimessager)
-                             rdr::U8 &trackingFrameStats, char trackingClient[])
 {
   if (pthread_mutex_lock(&apimessager->userMutex))
     return;
@@ -835,20 +827,6 @@ static void checkAPIMessages(network::GetAPIMessager *apimessager,
           slog.error("Tried to give control to nonexistent user %s", act.data.user);
         }
       break;
-
-      case network::GetAPIMessager::WANT_FRAME_STATS_SERVERONLY:
-        trackingFrameStats = act.action;
-      break;
-      case network::GetAPIMessager::WANT_FRAME_STATS_ALL:
-        trackingFrameStats = act.action;
-      break;
-      case network::GetAPIMessager::WANT_FRAME_STATS_OWNER:
-        trackingFrameStats = act.action;
-      break;
-      case network::GetAPIMessager::WANT_FRAME_STATS_SPECIFIC:
-        trackingFrameStats = act.action;
-        memcpy(trackingClient, act.data.password, 128);
-      break;
     }
 
     if (set) {
@@ -945,9 +923,6 @@ void VNCServerST::writeUpdate()
   assert(blockCounter == 0);
   assert(desktopStarted);
 
-  struct timeval start;
-  gettimeofday(&start, NULL);
-
   if (DLPRegion.enabled) {
     comparer->enable_copyrect(false);
     blackOut();
@@ -974,9 +949,6 @@ void VNCServerST::writeUpdate()
   else
     comparer->disable();
 
-  struct timeval beforeAnalysis;
-  gettimeofday(&beforeAnalysis, NULL);
-
   // Skip scroll detection if the client is slow, and didn't get the previous one yet
   if (comparer->compare(clients.size() == 1 && (*clients.begin())->has_copypassed(),
                         cursorReg))
@@ -984,8 +956,6 @@ void VNCServerST::writeUpdate()
 
   comparer->clear();
 
-  const unsigned analysisMs = msSince(&beforeAnalysis);
-
   encCache.clear();
   encCache.enabled = clients.size() > 1;
 
@@ -1011,22 +981,11 @@ void VNCServerST::writeUpdate()
     }
   }
 
-  unsigned shottime = 0;
   if (apimessager) {
-    struct timeval shotstart;
-    gettimeofday(&shotstart, NULL);
     apimessager->mainUpdateScreen(pb);
-    shottime = msSince(&shotstart);
 
-    trackingFrameStats = 0;
+    checkAPIMessages(apimessager);
-    checkAPIMessages(apimessager, trackingFrameStats, trackingClient);
   }
-  const rdr::U8 origtrackingFrameStats = trackingFrameStats;
-
-  EncodeManager::codecstats_t jpegstats, webpstats;
-  unsigned enctime = 0, scaletime = 0;
-  memset(&jpegstats, 0, sizeof(EncodeManager::codecstats_t));
-  memset(&webpstats, 0, sizeof(EncodeManager::codecstats_t));
 
   for (ci = clients.begin(); ci != clients.end(); ci = ci_next) {
     ci_next = ci; ci_next++;
@@ -1034,68 +993,10 @@ void VNCServerST::writeUpdate()
     if (permcheck)
       (*ci)->recheckPerms();
 
-    if (trackingFrameStats == network::GetAPIMessager::WANT_FRAME_STATS_ALL ||
-        (trackingFrameStats == network::GetAPIMessager::WANT_FRAME_STATS_OWNER &&
-         (*ci)->is_owner()) ||
-        (trackingFrameStats == network::GetAPIMessager::WANT_FRAME_STATS_SPECIFIC &&
-         strstr((*ci)->getPeerEndpoint(), trackingClient))) {
-
-      (*ci)->setFrameTracking();
-
-      // Only one owner
-      if (trackingFrameStats == network::GetAPIMessager::WANT_FRAME_STATS_OWNER)
-        trackingFrameStats = network::GetAPIMessager::WANT_FRAME_STATS_SERVERONLY;
-    }
-
     (*ci)->add_copied(ui.copied, ui.copy_delta);
     (*ci)->add_copypassed(ui.copypassed);
     (*ci)->add_changed(ui.changed);
     (*ci)->writeFramebufferUpdateOrClose();
-
-    if (apimessager) {
-      (*ci)->sendStats(false);
-      const EncodeManager::codecstats_t subjpeg = (*ci)->getJpegStats();
-      const EncodeManager::codecstats_t subwebp = (*ci)->getWebpStats();
-
-      jpegstats.ms += subjpeg.ms;
-      jpegstats.area += subjpeg.area;
-      jpegstats.rects += subjpeg.rects;
-
-      webpstats.ms += subwebp.ms;
-      webpstats.area += subwebp.area;
-      webpstats.rects += subwebp.rects;
-
-      enctime += (*ci)->getEncodingTime();
-      scaletime += (*ci)->getScalingTime();
-    }
-  }
-
-  if (trackingFrameStats) {
-    if (enctime) {
-      const unsigned totalMs = msSince(&start);
-
-      if (apimessager)
-        apimessager->mainUpdateServerFrameStats(comparer->changedPerc, totalMs,
-                                                jpegstats.ms, webpstats.ms,
-                                                analysisMs,
-                                                jpegstats.area, webpstats.area,
-                                                jpegstats.rects, webpstats.rects,
-                                                enctime, scaletime, shottime,
-                                                pb->getRect().width(),
-                                                pb->getRect().height());
-    } else {
-      // Zero encoding time means this was a no-data frame; restore the stats request
-      if (apimessager && pthread_mutex_lock(&apimessager->userMutex) == 0) {
-
-        network::GetAPIMessager::action_data act;
-        act.action = (network::GetAPIMessager::USER_ACTION) origtrackingFrameStats;
-        memcpy(act.data.password, trackingClient, 128);
-
-        apimessager->actionQueue.push_back(act);
-
-        pthread_mutex_unlock(&apimessager->userMutex);
-      }
-    }
   }
 }
 

common/rfb/VNCServerST.h

@@ -267,9 +267,6 @@ namespace rfb {
 
     network::GetAPIMessager *apimessager;
 
-    rdr::U8 trackingFrameStats;
-    char trackingClient[128];
-
     struct {
         bool enabled;
         int x1, y1, x2, y2;

common/rfb/encodings.h

@@ -86,7 +86,6 @@ namespace rfb {
   const int pseudoEncodingVideoOutTimeLevel100 = -1887;
 
   // VMware-specific
-  const int pseudoEncodingVMwareCursor = 0x574d5664;
   const int pseudoEncodingVMwareCursorPosition = 0x574d5666;
 
   // UltraVNC-specific

common/rfb/msgTypes.h

@@ -30,7 +30,6 @@ namespace rfb {
 
   // kasm
   const int msgTypeStats = 178;
-  const int msgTypeRequestFrameStats = 179;
 
   const int msgTypeServerFence = 248;
 
@@ -48,7 +47,6 @@ namespace rfb {
 
   // kasm
   const int msgTypeRequestStats = 178;
-  const int msgTypeFrameStats = 179;
 
   const int msgTypeClientFence = 248;
 

debian/Makefile.to_fakebuild_tar_package

@@ -16,7 +16,6 @@ install: unpack_tarball
 	cp $(SRC_BIN)/vncserver $(DESTDIR)/usr/bin/kasmvncserver
 	cp $(SRC_BIN)/vncconfig $(DESTDIR)/usr/bin/kasmvncconfig
 	cp $(SRC_BIN)/kasmvncpasswd $(DESTDIR)/usr/bin/
-	cp $(SRC_BIN)/kasmxproxy $(DESTDIR)/usr/bin/
 	cp -r $(SRC)/share/doc/kasmvnc*/* $(DESTDIR)/usr/share/doc/kasmvncserver/
 	rsync -r --exclude '.git*' --exclude po2js --exclude xgettext-html \
 	  --exclude www/utils/ --exclude .eslintrc \

debian/control

@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Kasm Technologies LLC <info@kasmweb.com>
 Build-Depends: debhelper (>= 11), rsync, libjpeg-dev, libjpeg-dev, libpng-dev,
-  libtiff-dev, libgif-dev, libavcodec-dev, libssl-dev, libgl1, libxfont2, libsm6, libxext-dev, libxrandr-dev, libxtst-dev, libxcursor-dev
+  libtiff-dev, libgif-dev, libavcodec-dev, libssl-dev, libgl1, libxfont2, libsm6
 Standards-Version: 4.1.3
 Homepage: https://github.com/kasmtech/KasmVNC
 #Vcs-Browser: https://salsa.debian.org/debian/kasmvnc

debian/postinst

@@ -21,7 +21,7 @@ case "$1" in
     configure)
       bindir=/usr/bin
       mandir=/usr/share/man
-      commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc kasmxproxy"
+      commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc"
 
       for kasm_command in $commands; do
         generic_command=`echo "$kasm_command" | sed -e 's/kasm//'`;

debian/prerm

@@ -21,7 +21,7 @@ case "$1" in
     remove)
       bindir=/usr/bin
       mandir=/usr/share/man
-      commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc kasmxproxy"
+      commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc"
 
       for kasm_command in $commands; do
         generic_command=`echo "$kasm_command" | sed -e 's/kasm//'`;

release/maketarball.in

@@ -45,7 +45,6 @@ mkdir -p $OUTDIR/man/man1
 
 make DESTDIR=$TMPDIR/inst install
 if [ $SERVER = 1 ]; then
-	install -m 755 ./unix/kasmxproxy/kasmxproxy $OUTDIR/bin/
 	install -m 755 ./xorg.build/bin/Xvnc $OUTDIR/bin/
 	install -m 644 ./xorg.build/man/man1/Xvnc.1 $OUTDIR/man/man1/Xvnc.1
 	install -m 644 ./xorg.build/man/man1/Xserver.1 $OUTDIR/man/man1/Xserver.1

unix/CMakeLists.txt

@@ -3,7 +3,6 @@ add_subdirectory(common)
 add_subdirectory(vncconfig)
 add_subdirectory(vncpasswd)
 add_subdirectory(kasmvncpasswd)
-add_subdirectory(kasmxproxy)
 
 install(PROGRAMS vncserver DESTINATION ${BIN_DIR})
 install(FILES vncserver.man DESTINATION ${MAN_DIR}/man1 RENAME vncserver.1)

unix/kasmxproxy/.gitignore

@@ -1 +0,0 @@
-kasmxproxy

unix/kasmxproxy/CMakeLists.txt

@@ -1,11 +0,0 @@
-include_directories(${X11_INCLUDE_DIR})
-
-add_executable(kasmxproxy
-  xxhash.c
-  kasmxproxy.c)
-
-target_link_libraries(kasmxproxy ${X11_LIBRARIES} ${X11_XTest_LIB} ${X11_Xrandr_LIB}
-                                 ${X11_Xcursor_LIB} ${X11_Xfixes_LIB})
-
-install(TARGETS kasmxproxy DESTINATION ${BIN_DIR})
-install(FILES kasmxproxy.man DESTINATION ${MAN_DIR}/man1 RENAME kasmxproxy.1)

unix/kasmxproxy/kasmxproxy.c

@@ -1,530 +0,0 @@
-/* Copyright (C) 2021 Kasm.  All Rights Reserved.
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- */
-
-#include <getopt.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <unistd.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xcursor/Xcursor.h>
-#include <X11/extensions/Xfixes.h>
-#include <X11/extensions/Xrandr.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/XTest.h>
-
-#include "xxhash.h"
-
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
-static void help(const char name[]) {
-	printf("Usage: %s [opts]\n\n"
-		"-a --app-display disp	App display, default :0\n"
-		"-v --vnc-display disp	VNC display, default :1\n"
-		"\n"
-		"-f --fps fps		FPS, default 30\n"
-		"-r --resize		Enable resize, default disabled.\n"
-		"			Do not enable this if there's a physical screen\n"
-		"			connected to the app display.\n",
-		name);
-	exit(1);
-}
-
-#define CUT_MAX (16 * 1024)
-static uint8_t cutbuf[CUT_MAX];
-
-static void supplyselection(Display *disp, const XEvent * const ev, const Atom xa_targets) {
-	XSelectionEvent sev;
-
-	sev.type = SelectionNotify;
-	sev.display = disp;
-	sev.requestor = ev->xselectionrequest.requestor;
-	sev.selection = ev->xselectionrequest.selection;
-	sev.target = ev->xselectionrequest.target;
-	sev.time = ev->xselectionrequest.time;
-	/*printf("someone wants our clipboard, sel %lu, tgt %lu, prop %lu\n",
-		sev.selection, sev.target,
-		ev.xselectionrequest.property);*/
-
-	if (ev->xselectionrequest.property == None)
-		sev.property = sev.target;
-	else
-		sev.property = ev->xselectionrequest.property;
-
-	const uint32_t len = strlen((char *) cutbuf);
-
-	if (xa_targets != None &&
-			sev.target == xa_targets) {
-		// Which formats can we do
-		Atom tgt[2] = {
-			xa_targets,
-			XA_STRING
-		};
-
-		XChangeProperty(disp, sev.requestor,
-				ev->xselectionrequest.property,
-				XA_ATOM, 32,
-				PropModeReplace,
-				(unsigned char *) tgt,
-				2);
-		//puts("sent targets");
-	} else {
-		// Data
-		XChangeProperty(disp, sev.requestor,
-				ev->xselectionrequest.property,
-				sev.target, 8,
-				PropModeReplace,
-				cutbuf, len);
-		//printf("sent data, of len %u\n", len);
-	}
-
-	// Send the notify event
-	XSendEvent(disp, sev.requestor, False, 0,
-			(XEvent *) &sev);
-}
-
-int main(int argc, char **argv) {
-
-	const char *appstr = ":0";
-	const char *vncstr = ":1";
-	uint8_t resize = 0;
-	uint8_t fps = 30;
-
-	const struct option longargs[] = {
-		{"app-display", 1, NULL, 'a'},
-		{"vnc-display", 1, NULL, 'v'},
-		{"resize", 0, NULL, 'r'},
-		{"fps", 1, NULL, 'f'},
-
-		{NULL, 0, NULL, 0},
-	};
-
-	while (1) {
-		int c = getopt_long(argc, argv, "a:v:rf:", longargs, NULL);
-		if (c == -1)
-			break;
-		switch (c) {
-			case 'a':
-				appstr = strdup(optarg);
-			break;
-			case 'v':
-				vncstr = strdup(optarg);
-			break;
-			case 'r':
-				resize = 1;
-			break;
-			case 'f':
-				fps = atoi(optarg);
-				if (fps < 1 || fps > 120) {
-					printf("Invalid fps\n");
-					return 1;
-				}
-			break;
-			default:
-				help(argv[0]);
-			break;
-		}
-	}
-
-	Display *appdisp = XOpenDisplay(appstr);
-	if (!appdisp) {
-		printf("Cannot open display %s\n", appstr);
-		return 1;
-	}
-	if (!XShmQueryExtension(appdisp)) {
-		printf("Display %s lacks SHM extension\n", appstr);
-		return 1;
-	}
-
-	Display *vncdisp = XOpenDisplay(vncstr);
-	if (!vncdisp) {
-		printf("Cannot open display %s\n", vncstr);
-		return 1;
-	}
-	if (!XShmQueryExtension(vncdisp)) {
-		printf("Display %s lacks SHM extension\n", vncstr);
-		return 1;
-	}
-
-	const int appscreen = DefaultScreen(appdisp);
-	const int vncscreen = DefaultScreen(vncdisp);
-	Visual *appvis = DefaultVisual(appdisp, appscreen);
-	//Visual *vncvis = DefaultVisual(vncdisp, vncscreen);
-	const int appdepth = DefaultDepth(appdisp, appscreen);
-	const int vncdepth = DefaultDepth(vncdisp, vncscreen);
-	if (appdepth != vncdepth) {
-		printf("Depths don't match, app %u vnc %u\n", appdepth, vncdepth);
-		return 1;
-	}
-
-	Window approot = DefaultRootWindow(appdisp);
-	Window vncroot = DefaultRootWindow(vncdisp);
-	XWindowAttributes appattr, vncattr;
-
-	XGCValues gcval;
-	gcval.plane_mask = AllPlanes;
-	gcval.function = GXcopy;
-	GC gc = XCreateGC(vncdisp, vncroot, GCFunction | GCPlaneMask, &gcval);
-
-	XImage *img = NULL;
-	XShmSegmentInfo shminfo;
-	unsigned imgw = 0, imgh = 0;
-
-	if (XGrabPointer(vncdisp, vncroot, False,
-				ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-				GrabModeAsync, GrabModeAsync, None, None,
-				CurrentTime) != Success)
-		return 1;
-	if (XGrabKeyboard(vncdisp, vncroot, False, GrabModeAsync, GrabModeAsync,
-				CurrentTime) != Success)
-		return 1;
-
-	int xfixesbase, xfixeserrbase;
-	XFixesQueryExtension(appdisp, &xfixesbase, &xfixeserrbase);
-	XFixesSelectSelectionInput(appdisp, approot, XA_PRIMARY,
-					XFixesSetSelectionOwnerNotifyMask);
-
-	int xfixesbasevnc, xfixeserrbasevnc;
-	XFixesQueryExtension(vncdisp, &xfixesbasevnc, &xfixeserrbasevnc);
-	XFixesSelectSelectionInput(vncdisp, vncroot, XA_PRIMARY,
-					XFixesSetSelectionOwnerNotifyMask);
-
-	Atom xa_targets_vnc = XInternAtom(vncdisp, "TARGETS", False);
-	Atom xa_targets_app = XInternAtom(appdisp, "TARGETS", False);
-	Window selwin = XCreateSimpleWindow(appdisp, approot, 3, 2, 1, 1, 0, 0, 0);
-	Window vncselwin = XCreateSimpleWindow(vncdisp, vncroot, 3, 2, 1, 1, 0, 0, 0);
-
-	XFixesCursorImage *cursor = NULL;
-	uint64_t cursorhash = 0;
-	Cursor xcursor = None;
-
-	const unsigned sleeptime = 1000 * 1000 / fps;
-
-	while (1) {
-		if (!XGetWindowAttributes(appdisp, approot, &appattr))
-			break;
-		if (!XGetWindowAttributes(vncdisp, vncroot, &vncattr))
-			break;
-		if (resize && (appattr.width != vncattr.width ||
-				appattr.height != vncattr.height)) {
-			// resize app display to VNC display size
-			XRRScreenConfiguration *config = XRRGetScreenInfo(appdisp, approot);
-
-			int nsizes, i, match = -1;
-			XRRScreenSize *sizes = XRRConfigSizes(config, &nsizes);
-			//printf("%u sizes\n", nsizes);
-			for (i = 0; i < nsizes; i++) {
-				if (sizes[i].width == vncattr.width &&
-					sizes[i].height == vncattr.height) {
-					//printf("match %u\n", i);
-					match = i;
-					break;
-				}
-			}
-
-			if (match >= 0) {
-				XRRSetScreenConfig(appdisp, config, approot, match,
-							RR_Rotate_0, CurrentTime);
-			} else {
-				/*XRRSetScreenSize(appdisp, approot,
-						vncattr.width, vncattr.height,
-						sizes[0].mwidth, sizes[0].mheight);*/
-				XRRScreenResources *res = XRRGetScreenResources(appdisp, approot);
-				//printf("%u outputs, %u crtcs\n", res->noutput, res->ncrtc);
-				// Nvidia crap uses a *different* list for 1.0 and 1.2!
-				unsigned oldmode = 0xffff;
-				//printf("1.2 modes %u\n", res->nmode);
-				for (i = 0; i < res->nmode; i++) {
-					if (res->modes[i].width == vncattr.width &&
-						res->modes[i].height == vncattr.height) {
-						oldmode = i;
-						//printf("old mode %u matched\n", i);
-						break;
-					}
-				}
-
-				unsigned tgt = 0;
-				if (res->noutput > 1) {
-					for (i = 0; i < res->noutput; i++) {
-						XRROutputInfo *info = XRRGetOutputInfo(appdisp, res, res->outputs[i]);
-						if (info->connection == RR_Connected)
-							tgt = i;
-						//printf("%u %s %u\n", i, info->name, info->connection);
-						XRRFreeOutputInfo(info);
-					}
-				}
-
-				if (oldmode < 0xffff) {
-					Status s;
-					// nvidia needs this weird dance
-					s = XRRSetCrtcConfig(appdisp, res, res->crtcs[tgt],
-							CurrentTime,
-							0, 0,
-							None, RR_Rotate_0,
-							NULL, 0);
-					//printf("disable %u\n", s);
-					XRRSetScreenSize(appdisp, approot,
-							vncattr.width, vncattr.height,
-							sizes[0].mwidth, sizes[0].mheight);
-					s = XRRSetCrtcConfig(appdisp, res, res->crtcs[tgt],
-							CurrentTime,
-							0, 0,
-							res->modes[oldmode].id, RR_Rotate_0,
-							&res->outputs[tgt], 1);
-					//printf("set %u\n", s);
-				} else {
-					char name[32];
-					sprintf(name, "%ux%u_60", vncattr.width, vncattr.height);
-					printf("Creating new Mode %s\n", name);
-					XRRModeInfo *mode = XRRAllocModeInfo(name, strlen(name));
-
-					mode->width = vncattr.width;
-					mode->height = vncattr.height;
-
-					RRMode rmode = XRRCreateMode(appdisp, approot, mode);
-					XRRAddOutputMode(appdisp,
-								res->outputs[tgt],
-								rmode);
-					XRRFreeModeInfo(mode);
-				}
-
-				XRRFreeScreenResources(res);
-			}
-
-			XRRFreeScreenConfigInfo(config);
-		}
-
-		const unsigned w = min(appattr.width, vncattr.width);
-		const unsigned h = min(appattr.height, vncattr.height);
-
-		if (w != imgw || h != imgh) {
-			if (img) {
-				XShmDetach(appdisp, &shminfo);
-				XDestroyImage(img);
-				shmdt(shminfo.shmaddr);
-				shmctl(shminfo.shmid, IPC_RMID, NULL);
-			}
-			img = XShmCreateImage(appdisp, appvis, appdepth, ZPixmap,
-						NULL, &shminfo, w, h);
-			if (!img)
-				break;
-
-			shminfo.shmid = shmget(IPC_PRIVATE,
-						img->bytes_per_line * img->height,
-						IPC_CREAT | 0666);
-			if (shminfo.shmid == -1)
-				break;
-			shminfo.shmaddr = img->data = shmat(shminfo.shmid, 0, 0);
-			shminfo.readOnly = False;
-			if (!XShmAttach(appdisp, &shminfo))
-				break;
-
-			imgw = w;
-			imgh = h;
-		}
-
-		XShmGetImage(appdisp, approot, img, 0, 0, 0xffffffff);
-		XPutImage(vncdisp, vncroot, gc, img, 0, 0, 0, 0, w, h);
-
-		// Handle events
-		while (XPending(vncdisp)) {
-			XEvent ev;
-			XNextEvent(vncdisp, &ev);
-
-			if (ev.type == xfixesbasevnc + XFixesSelectionNotify) {
-				XFixesSelectionNotifyEvent *xfe =
-					(XFixesSelectionNotifyEvent *) &ev;
-//				printf("vnc disp did a copy, owner %lu, root %lu\n",
-//					xfe->owner, vncroot);
-				if (xfe->owner == None || xfe->owner == vncroot)
-					continue;
-
-				XConvertSelection(vncdisp, XA_PRIMARY, XA_STRING, XA_STRING,
-							vncselwin, CurrentTime);
-			} else switch (ev.type) {
-				case KeyPress:
-				case KeyRelease:
-					XTestFakeKeyEvent(appdisp, ev.xkey.keycode,
-								ev.type == KeyPress,
-								CurrentTime);
-				break;
-				case ButtonPress:
-				case ButtonRelease:
-					XTestFakeButtonEvent(appdisp, ev.xbutton.button,
-								ev.type == ButtonPress,
-								CurrentTime);
-				break;
-				case MotionNotify:
-					XTestFakeMotionEvent(appdisp, appscreen,
-								ev.xmotion.x,
-								ev.xmotion.y,
-								CurrentTime);
-				break;
-				case SelectionRequest:
-					supplyselection(vncdisp, &ev, xa_targets_vnc);
-				break;
-				case SelectionNotify:
-				{
-					Atom realtype;
-					int fmt;
-					unsigned long nitems, bytes_rem;
-					unsigned char *data;
-					if (XGetWindowProperty(vncdisp, vncselwin,
-								XA_STRING,
-								0, CUT_MAX / 4,
-								False, AnyPropertyType,
-								&realtype, &fmt,
-								&nitems, &bytes_rem,
-								&data) == Success) {
-
-						if (bytes_rem) {
-							printf("Clipboard too large, ignoring\n");
-						} else {
-							const uint32_t len = nitems * (fmt / 8);
-							//printf("realtype %lu, fmt %u, nitems %lu\n",
-							//	realtype, fmt, nitems);
-							memcpy(cutbuf, data, len);
-							if (len < CUT_MAX)
-								cutbuf[len] = 0;
-							else
-								cutbuf[CUT_MAX - 1] = 0;
-
-							// Send it to the app screen
-							XSetSelectionOwner(appdisp, XA_PRIMARY,
-										approot,
-										CurrentTime);
-						}
-
-						XFree(data);
-					} else {
-						printf("Failed to fetch vnc clipboard\n");
-					}
-				}
-				break;
-				case SelectionClear:
-					cutbuf[0] = '\0';
-					XSetSelectionOwner(appdisp, XA_PRIMARY, None,
-								CurrentTime);
-				break;
-				default:
-					printf("Unexpected event type %u\n", ev.type);
-				break;
-			}
-		}
-
-		// App-side events
-		while (XPending(appdisp)) {
-			XEvent ev;
-			XNextEvent(appdisp, &ev);
-
-			if (ev.type == xfixesbase + XFixesSelectionNotify) {
-				XFixesSelectionNotifyEvent *xfe =
-					(XFixesSelectionNotifyEvent *) &ev;
-				//printf("app disp did a copy, owner %lu\n", xfe->owner);
-				if (xfe->owner == None || xfe->owner == approot)
-					continue;
-
-				XConvertSelection(appdisp, XA_PRIMARY, XA_STRING, XA_STRING,
-							selwin, CurrentTime);
-			} else switch (ev.type) {
-				case SelectionNotify:
-				{
-					Atom realtype;
-					int fmt;
-					unsigned long nitems, bytes_rem;
-					unsigned char *data;
-					if (XGetWindowProperty(appdisp, selwin,
-								XA_STRING,
-								0, CUT_MAX / 4,
-								False, AnyPropertyType,
-								&realtype, &fmt,
-								&nitems, &bytes_rem,
-								&data) == Success) {
-
-						if (bytes_rem) {
-							printf("Clipboard too large, ignoring\n");
-						} else {
-							const uint32_t len = nitems * (fmt / 8);
-							//printf("realtype %lu, fmt %u, nitems %lu\n",
-							//	realtype, fmt, nitems);
-							memcpy(cutbuf, data, len);
-							if (len < CUT_MAX)
-								cutbuf[len] = 0;
-							else
-								cutbuf[CUT_MAX - 1] = 0;
-
-							// Send it to the VNC screen
-							XSetSelectionOwner(vncdisp, XA_PRIMARY,
-										vncroot,
-										CurrentTime);
-						}
-
-						XFree(data);
-					} else {
-						printf("Failed to fetch app clipboard\n");
-					}
-				}
-				break;
-				case SelectionRequest:
-					supplyselection(appdisp, &ev, xa_targets_app);
-				break;
-				default:
-					printf("Unexpected app event type %u\n", ev.type);
-				break;
-			}
-		}
-
-		// Cursors
-		cursor = XFixesGetCursorImage(appdisp);
-		uint64_t newhash = XXH64(cursor->pixels,
-						cursor->width * cursor->height * sizeof(unsigned long),
-						0);
-		if (cursorhash != newhash) {
-			if (cursorhash)
-				XFreeCursor(vncdisp, xcursor);
-
-			XcursorImage *converted = XcursorImageCreate(cursor->width, cursor->height);
-
-			converted->xhot = cursor->xhot;
-			converted->yhot = cursor->yhot;
-			unsigned i;
-			for (i = 0; i < cursor->width * cursor->height; i++) {
-				converted->pixels[i] = cursor->pixels[i];
-			}
-
-			xcursor = XcursorImageLoadCursor(vncdisp, converted);
-			XDefineCursor(vncdisp, vncroot, xcursor);
-
-			XcursorImageDestroy(converted);
-
-			cursorhash = newhash;
-		}
-
-		usleep(sleeptime);
-	}
-
-	XCloseDisplay(appdisp);
-	XCloseDisplay(vncdisp);
-
-	return 0;
-}

unix/kasmxproxy/kasmxproxy.man

@@ -1,18 +0,0 @@
-.TH kasmxproxy 1 "" "KasmVNC" "Virtual Network Computing"
-.SH NAME
-kasmxproxy \- proxy an existing X11 display to a KasmVNC display
-.SH SYNOPSIS
-.B kasmxproxy
-.RB [ \-a \-\-app\-display
-.IR source display, default :0 ]
-.RB [ \-v \-\-vnc\-display
-.IR destination display, default :1 ]
-.RB [ \-f \-\-fps
-.IR FPS, default 30 ]
-.RB [ \-r \-\-resize
-.IR Enable resizing, default disabled. WARNING: DO NOT ENABLE IF PHYSICAL DISPLAY IS ATTACHED ]
-.br
-.BI "kasmxproxy -a :1 -v :10 -r"
-.SH DESCRIPTION
-.B kasmxproxy
-is used to proxy an x display, usually attached to a physical GPU, to KasmVNC display. This is usually used in the context of providing GPU acceleration to a KasmVNC session.

unix/kasmxproxy/xxhash.c

@@ -1 +0,0 @@
-../../common/rfb/xxhash.c

unix/kasmxproxy/xxhash.h

@@ -1 +0,0 @@
-../../common/rfb/xxhash.h