Merge branch 'master' into forapi

# Conflicts:
#	.github/workflows/build.yaml
#	debian/changelog

.github/workflows/build.yaml

@@ -35,7 +35,7 @@ jobs:
           - { name: "arm64v8", target: "aarch64-unknown-linux-musl" }
           - { name: "armv7",   target: "armv7-unknown-linux-musleabihf" }
           - { name: "i386",    target: "i686-unknown-linux-musl" }
-          - { name: "amd64fb",    target: "x86_64-unknown-freebsd" }
+          #- { name: "amd64fb",    target: "x86_64-unknown-freebsd" }
 
     steps:
       
@@ -181,7 +181,7 @@ jobs:
           - { os: "linux", name: "arm64v8", suffix: "" }
           - { os: "linux", name: "armv7", suffix: "" }
           - { os: "linux", name: "i386", suffix: "" }
-          - { os: "linux", name: "amd64fb", suffix: "" }
+          #- { os: "linux", name: "amd64fb", suffix: "" }
           - { os: "windows", name: "x86_64", suffix: "-unsigned" }
           
     steps:

Cargo.lock

@@ -558,7 +558,7 @@ dependencies = [
 [[package]]
 name = "default_net"
 version = "0.1.0"
-source = "git+https://github.com/rustdesk-org/default_net#a831d47bcacb4615b394968287697924a8f62be1"
+source = "git+https://github.com/rustdesk-org/default_net#c400b0bbf49a987129796221fbc41a8a385b812e"
 dependencies = [
  "anyhow",
  "regex",
@@ -1068,7 +1068,7 @@ dependencies = [
 
 [[package]]
 name = "hbbs"
-version = "1.1.12"
+version = "1.1.13"
 dependencies = [
  "async-speed-limit",
  "async-trait",

debian/changelog

@@ -1,8 +1,11 @@
-rustdesk-server (1.1.13) UNRELEASED; urgency=medium
+rustdesk-server (1.1.14) UNRELEASED; urgency=medium
   * add KeyExchange
   * fix ws query online
   * add Must Login
 
+rustdesk-server (1.1.13) UNRELEASED; urgency=medium
+  * Version check and refactor hbb_common to share with rustdesk client
+
 rustdesk-server (1.1.12) UNRELEASED; urgency=medium
   * WS real ip
   * Bump s6-overlay to v3.2.0.0 and fix env warnings

ui/setup.nsi

@@ -15,7 +15,7 @@
 !define PRODUCT_NAME "rustdesk_server"
 !define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}"
 !define COPYRIGHT "Copyright © 2021"
-!define VERSION "1.1.12"
+!define VERSION "1.1.13"
 
 VIProductVersion "${VERSION}.0"
 VIAddVersionKey "ProductName" "${PRODUCT_NAME}"