Revert "luci: modify the field name of protocol in ssr"

This reverts commit 146eb66.

Author: lwb1978

luci-app-passwall/luasrc/model/cbi/passwall/client/type/ssr.lua

@@ -54,7 +54,7 @@ o.password = true
 o = s:option(ListValue, _n("method"), translate("Encrypt Method"))
 for a, t in ipairs(ssr_encrypt_method_list) do o:value(t) end
 
-o = s:option(ListValue, _n("ssr_protocol"), translate("Protocol"))
+o = s:option(ListValue, _n("protocol"), translate("Protocol"))
 for a, t in ipairs(ssr_protocol_list) do o:value(t) end
 
 o = s:option(Value, _n("protocol_param"), translate("Protocol_param"))

luci-app-passwall/luasrc/model/cbi/passwall/server/type/ssr.lua

@@ -51,7 +51,7 @@ o = s:option(ListValue, _n("method"), translate("Encrypt Method"))
 for a, t in ipairs(ssr_encrypt_method_list) do o:value(t) end
 o:depends({ [_n("custom")] = false })
 
-o = s:option(ListValue, _n("ssr_protocol"), translate("Protocol"))
+o = s:option(ListValue, _n("protocol"), translate("Protocol"))
 for a, t in ipairs(ssr_protocol_list) do o:value(t) end
 o:depends({ [_n("custom")] = false })
 

luci-app-passwall/luasrc/passwall/util_shadowsocks.lua

@@ -19,7 +19,7 @@ function gen_config_server(node)
 	end
 
 	if node.type == "SSR" then
-		config.protocol = node.ssr_protocol
+		config.protocol = node.protocol
 		config.protocol_param = node.protocol_param
 		config.obfs = node.obfs
 		config.obfs_param = node.obfs_param
@@ -85,7 +85,7 @@ function gen_config(var)
 		config.plugin_opts = (plugin_file) and node.plugin_opts or nil
 		config.mode = mode
 	elseif node.type == "SSR" then
-		config.protocol = node.ssr_protocol
+		config.protocol = node.protocol
 		config.protocol_param = node.protocol_param
 		config.obfs = node.obfs
 		config.obfs_param = node.obfs_param

luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm

@@ -358,7 +358,7 @@
 			url += params;
 		} else if (v_type === "SSR") {
 			var v_port = opt.get(dom_prefix + "port");
-			var v_protocol = opt.get(dom_prefix + "ssr_protocol");
+			var v_protocol = opt.get(dom_prefix + "protocol");
 			var v_method = opt.get(dom_prefix + "method");
 			var v_obfs = opt.get(dom_prefix + "obfs");
 			var v_password = opt.get(dom_prefix + "password");
@@ -875,7 +875,7 @@
 			opt.set('type', "SSR");
 			opt.set(dom_prefix + 'address', unbracketIP(ssm[1]));
 			opt.set(dom_prefix + 'port', ssm[2]);
-			opt.set(dom_prefix + 'ssr_protocol', ssm[3]);
+			opt.set(dom_prefix + 'protocol', ssm[3]);
 			opt.set(dom_prefix + 'method', ssm[4]);
 			opt.set(dom_prefix + 'obfs', ssm[5]);
 			opt.set(dom_prefix + 'password', b64decsafe(ssm[6]));

luci-app-passwall/root/usr/share/passwall/subscribe.lua

@@ -490,7 +490,7 @@ local function processData(szType, content, add_mode, group)
 			result.address = hostInfo[#hostInfo-5]
 		end
 		result.port = hostInfo[#hostInfo-4]
-		result.ssr_protocol = hostInfo[#hostInfo-3]
+		result.protocol = hostInfo[#hostInfo-3]
 		result.method = hostInfo[#hostInfo-2]
 		result.obfs = hostInfo[#hostInfo-1]
 		result.password = base64Decode(hostInfo[#hostInfo])