up：1.4.1

everstu · Aug 28, 2023 · cbaf064 · cbaf064
1 parent a6ef672
commit cbaf064
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 17 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,8 +1,12 @@
 KoolCenter RustDesk Server Changelog
 ===========================================
+1.4
+   - fix	NAT重启后无法正常防火墙端口未开放的问题
+   - update	rustdesk_server二进制v1.1.8-2版本
+
 1.4
    - add	新增开启插件检测端口占用功能
-   - update	rustdesk_server二进制v1.1.8版本（armv7版本，采用upx --lzma --best压缩）
+   - update	rustdesk_server二进制v1.1.8版本
 
 1.3
    - add	新增强制使用中继服务器选项

diff --git a/build.py b/build.py
@@ -2,10 +2,15 @@
 # _*_ coding:utf-8 _*_
 
 import os
+import sys
 import json
 import codecs
 import hashlib
-from string import Template 
+from string import Template
+
+if sys.getdefaultencoding() != 'gbk':
+    reload(sys)
+    sys.setdefaultencoding('gbk')
 
 parent_path = os.path.dirname(os.path.realpath(__file__))
 

diff --git a/config.json.js b/config.json.js
@@ -3,9 +3,9 @@
     "description": "RustDesk是一款优秀的免费开源的远程控制软件，此插件提供RustDesk自建服务器功能。", 
     "home_url": "Module_rustdesk.asp", 
     "link": "https://github.com/everstu/Koolcenter_rustdesk", 
-    "md5": "45cb54e8b694468379f96e8f2756b817", 
+    "md5": "4b4f6993cb7dadf375d1950ef5e79ce5", 
     "module": "rustdesk", 
     "tags": "穿透", 
     "title": "RustDesk Server", 
-    "version": "1.4"
+    "version": "1.4.1"
 }
diff --git a/rustdesk/bin/hbbr b/rustdesk/bin/hbbr
diff --git a/rustdesk/bin/hbbs b/rustdesk/bin/hbbs
diff --git a/rustdesk/bin/rustdesk-utils b/rustdesk/bin/rustdesk-utils
diff --git a/rustdesk/scripts/rustdesk_config.sh b/rustdesk/scripts/rustdesk_config.sh
@@ -114,17 +114,7 @@ stop_plugin() {
   echo_date "❌️插件已停止运行！"
 }
 
-configServerEnv() {
-  if [ "$rustdesk_is_encrypted" == "1" ]; then
-    connect_key=$rustdesk_key_pub
-    hbbsCMD="${hbbsCMD} -k _"
-    hbbrCMD="${hbbrCMD} -k _"
-  fi
-
-  if [ "$rustdesk_always_use_relay" == "1" ]; then
-    ALWAYS_USE_RELAY="Y"
-  fi
-
+configServerPort(){
   if [ $(number_test ${rustdesk_hbbs_port}) != "0" ]; then
     dbus set rustdesk_hbbs_port="21116"
     dbus set rustdesk_hbbr_port="21117"
@@ -137,6 +127,19 @@ configServerEnv() {
   hbbr_used_port1=$(($hbbr_used_port + 2))
 }
 
+configServerEnv() {
+  if [ "$rustdesk_is_encrypted" == "1" ]; then
+    connect_key=$rustdesk_key_pub
+    hbbsCMD="${hbbsCMD} -k _"
+    hbbrCMD="${hbbrCMD} -k _"
+  fi
+
+  if [ "$rustdesk_always_use_relay" == "1" ]; then
+    ALWAYS_USE_RELAY="Y"
+  fi
+  configServerPort
+}
+
 start_process() {
   start_hbbs
   start_hbbr
@@ -244,13 +247,16 @@ kill_process() {
 }
 
 open_port() {
+  # 1.math port
+  configServerPort
+  # 2.load xt_comment.ko
   local CM=$(lsmod | grep xt_comment)
   local OS=$(uname -r)
   if [ -z "${CM}" -a -f "/lib/modules/${OS}/kernel/net/netfilter/xt_comment.ko" ]; then
     echo_date "ℹ️加载xt_comment.ko内核模块！"
     insmod /lib/modules/${OS}/kernel/net/netfilter/xt_comment.ko
   fi
-
+  # 3.open port
   local HBBSMATCH=$(iptables -t filter -S INPUT | grep "rustdesk_rule")
   if [ -z "${HBBSMATCH}" ]; then
     echo_date "🧱添加防火墙入站规则..."

diff --git a/rustdesk/version b/rustdesk/version
@@ -1 +1 @@
-1.4
+1.4.1