From b9a34151caa283024ac2255c99b21203c86021e3 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Sun, 11 Nov 2018 15:13:55 +0800
Subject: [PATCH] add Mux option support in v2ray

---
 package/lean/luci-app-ssr-plus/Makefile                      | 4 +---
 .../luasrc/model/cbi/shadowsocksr/client-config.lua          | 5 +++++
 package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr  | 2 +-
 .../root/usr/share/shadowsocksr/genv2config.lua              | 5 ++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 07d184da3..b960af512 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=1
-PKG_RELEASE:=39
+PKG_RELEASE:=41
 
 PO2LMO:=$(BUILD_DIR)/luci-base/po2lmo
 
@@ -57,8 +57,6 @@ define Package/luci-app-ssr-plus/install
 	cp -pR ./root/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
 	$(PO2LMO) ./po/zh-cn/ssr-plus.po $(1)/usr/lib/lua/luci/i18n/ssr-plus.zh-cn.lmo
-
-	find $(1) -name *.lua -exec luac -s -o {} {} \;
 endef
 
 define Package/luci-app-ssr-plus/postinst
diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index 971744e91..41fc9ac43 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -309,6 +309,11 @@ o = s:option(Flag, "tls", translate("TLS"))
 o.rmempty = false
 o:depends("type", "v2ray")
 
+-- [[ Mux ]]--
+o = s:option(Flag, "mux", translate("Mux"))
+o.rmempty = false
+o:depends("type", "v2ray")
+
 o = s:option(Flag, "fast_open", translate("TCP Fast Open"))
 o.rmempty = false
 o.default = "0"
diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index 24e3df258..80717c293 100755
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -83,7 +83,7 @@ gen_config_file() {
          else
          config_file=$CONFIG_SOCK5_FILE
          fi
-         if [ $(uci_get_by_name $1 fast_open) = "1" ] ;then
+         if [ $(uci_get_by_name $1 fast_open 0) = "1" ] ;then
          fastopen="true";
          else
          fastopen="false";
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
index 8196ae091..f3c66e667 100644
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
@@ -63,7 +63,10 @@ local v2ray = {
                 path = server.h2_path,
                 host = server.h2_host,
             } or nil
-        }
+        },
+        mux = {
+            enabled = (server.mux == "1") and true or false
+      }
     },
 
     -- 额外传出连接