From 74481c3ed1529133b6f85ee625d0f68361d091aa Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Sun, 11 Nov 2018 16:27:38 +0800
Subject: [PATCH] luci ssr plus :fix udp relay mode when using the same server
 witch tcp

---
 package/lean/luci-app-ssr-plus/Makefile           |  2 +-
 .../root/etc/init.d/shadowsocksr                  | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index b960af512..66f1d4270 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:=41
+PKG_RELEASE:=42
 
 PO2LMO:=$(BUILD_DIR)/luci-base/po2lmo
 
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 80717c293..6bdef8861 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
@@ -307,8 +307,7 @@ start_redir() {
     $sscmd -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 &
 	fi
 	
-	if [ "$ARG_UDP" = "-U" ]; then
-   if [ "$utype" == "ss" -o "$utype" == "ssr" ] ;then
+  if [ "$utype" == "ss" -o "$utype" == "ssr" ] ;then
 		case "$(uci_get_by_name $UDP_RELAY_SERVER auth_enable)" in
 			1|on|true|yes|enabled) ARG_OTA="-A";;
 			*) ARG_OTA="";;
@@ -319,15 +318,13 @@ start_redir() {
 		redir_udp=1
 		$ucmd \
 		-c $last_config_file $ARG_OTA $ARG_UDP \
-		-f $pid_file   
-   fi
-	fi
-	
-	if [ "$utype" == "v2ray" ] ; then
-    lua /usr/share/shadowsocksr/genv2config.lua $UDP_RELAY_SERVER udp > /var/etc/v2-ssr-reudp.json
-    $ucmd -config /var/etc/v2-ssr-reudp.json >/dev/null 2>&1 &
+		-f $pid_file
+		elif [ "$utype" == "v2ray" ] ; then
+      lua /usr/share/shadowsocksr/genv2config.lua $UDP_RELAY_SERVER udp > /var/etc/v2-ssr-reudp.json
+      $ucmd -config /var/etc/v2-ssr-reudp.json >/dev/null 2>&1 &   
   fi
 
+
 	#deal with dns
   
   if [ "$(uci_get_by_type global pdnsd_enable)" = "1" ] ;then