From 804f2910fd7612729af14e75c3558fe2d3765fa4 Mon Sep 17 00:00:00 2001 From: 0x7fff <4812302+blizard863@users.noreply.github.com> Date: Thu, 22 Dec 2022 17:55:06 +0800 Subject: [PATCH] refactor: ifelse (#3224) --- cmd/frpc/sub/stcp.go | 7 ++++--- cmd/frpc/sub/sudp.go | 7 ++++--- cmd/frpc/sub/xtcp.go | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cmd/frpc/sub/stcp.go b/cmd/frpc/sub/stcp.go index 989387b..d84b23b 100644 --- a/cmd/frpc/sub/stcp.go +++ b/cmd/frpc/sub/stcp.go @@ -59,7 +59,8 @@ var stcpCmd = &cobra.Command{ prefix = user + "." } - if role == "server" { + switch role { + case "server": cfg := &config.STCPProxyConf{} cfg.ProxyName = prefix + proxyName cfg.ProxyType = consts.STCPProxy @@ -75,7 +76,7 @@ var stcpCmd = &cobra.Command{ os.Exit(1) } proxyConfs[cfg.ProxyName] = cfg - } else if role == "visitor" { + case "visitor": cfg := &config.STCPVisitorConf{} cfg.ProxyName = prefix + proxyName cfg.ProxyType = consts.STCPProxy @@ -92,7 +93,7 @@ var stcpCmd = &cobra.Command{ os.Exit(1) } visitorConfs[cfg.ProxyName] = cfg - } else { + default: fmt.Println("invalid role") os.Exit(1) } diff --git a/cmd/frpc/sub/sudp.go b/cmd/frpc/sub/sudp.go index c781223..f96a12e 100644 --- a/cmd/frpc/sub/sudp.go +++ b/cmd/frpc/sub/sudp.go @@ -59,7 +59,8 @@ var sudpCmd = &cobra.Command{ prefix = user + "." } - if role == "server" { + switch role { + case "server": cfg := &config.SUDPProxyConf{} cfg.ProxyName = prefix + proxyName cfg.ProxyType = consts.SUDPProxy @@ -75,7 +76,7 @@ var sudpCmd = &cobra.Command{ os.Exit(1) } proxyConfs[cfg.ProxyName] = cfg - } else if role == "visitor" { + case "visitor": cfg := &config.SUDPVisitorConf{} cfg.ProxyName = prefix + proxyName cfg.ProxyType = consts.SUDPProxy @@ -92,7 +93,7 @@ var sudpCmd = &cobra.Command{ os.Exit(1) } visitorConfs[cfg.ProxyName] = cfg - } else { + default: fmt.Println("invalid role") os.Exit(1) } diff --git a/cmd/frpc/sub/xtcp.go b/cmd/frpc/sub/xtcp.go index 069cce7..b842698 100644 --- a/cmd/frpc/sub/xtcp.go +++ b/cmd/frpc/sub/xtcp.go @@ -59,7 +59,8 @@ var xtcpCmd = &cobra.Command{ prefix = user + "." } - if role == "server" { + switch role { + case "server": cfg := &config.XTCPProxyConf{} cfg.ProxyName = prefix + proxyName cfg.ProxyType = consts.XTCPProxy @@ -75,7 +76,7 @@ var xtcpCmd = &cobra.Command{ os.Exit(1) } proxyConfs[cfg.ProxyName] = cfg - } else if role == "visitor" { + case "visitor": cfg := &config.XTCPVisitorConf{} cfg.ProxyName = prefix + proxyName cfg.ProxyType = consts.XTCPProxy @@ -92,7 +93,7 @@ var xtcpCmd = &cobra.Command{ os.Exit(1) } visitorConfs[cfg.ProxyName] = cfg - } else { + default: fmt.Println("invalid role") os.Exit(1) }