yakumo.izuru/yukari
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] read cli flags properly - fixes #96 fixes #101

Browse Source 
git-svn-id: file:///srv/svn/repo/yukari/trunk@137 f3bd38d9-da89-464d-a02a-eb04e43141b5
This commit is contained in:
asciimoo 2021-03-28 00:28:03 +00:00
parent a1870b708b
commit 3a64e52304
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
morty.go
View File

@ -1054,18 +1054,25 @@ func (p *Proxy) serveMainPage(ctx *fasthttp.RequestCtx, statusCode int, err erro
} }
func main() { func main() {
cfg.ListenAddress = *flag.String("listen", cfg.ListenAddress, "Listen address") listenAddress := flag.String("listen", cfg.ListenAddress, "Listen address")
cfg.Key = *flag.String("key", cfg.Key, "HMAC url validation key (base64 encoded) - leave blank to disable validation") key := flag.String("key", cfg.Key, "HMAC url validation key (base64 encoded) - leave blank to disable validation")
cfg.Debug = *flag.Bool("debug", cfg.Debug, "Debug mode") IPV6 := flag.Bool("ipv6", cfg.IPV6, "Allow IPv6 HTTP requests")
cfg.RequestTimeout = *flag.Uint("timeout", cfg.RequestTimeout, "Request timeout") debug := flag.Bool("debug", cfg.Debug, "Debug mode")
cfg.FollowRedirect = *flag.Bool("followredirect", cfg.FollowRedirect, "Follow HTTP GET redirect") requestTimeout := flag.Uint("timeout", cfg.RequestTimeout, "Request timeout")
followRedirect := flag.Bool("followredirect", cfg.FollowRedirect, "Follow HTTP GET redirect")
proxyenv := flag.Bool("proxyenv", false, "Use a HTTP proxy as set in the environment (HTTP_PROXY, HTTPS_PROXY and NO_PROXY). Overrides -proxy, -socks5, -ipv6.") proxyenv := flag.Bool("proxyenv", false, "Use a HTTP proxy as set in the environment (HTTP_PROXY, HTTPS_PROXY and NO_PROXY). Overrides -proxy, -socks5, -ipv6.")
proxy := flag.String("proxy", "", "Use the specified HTTP proxy (ie: '[user:pass@]hostname:port'). Overrides -socks5, -ipv6.") proxy := flag.String("proxy", "", "Use the specified HTTP proxy (ie: '[user:pass@]hostname:port'). Overrides -socks5, -ipv6.")
socks5 := flag.String("socks5", "", "Use a SOCKS5 proxy (ie: 'hostname:port'). Overrides -ipv6.") socks5 := flag.String("socks5", "", "Use a SOCKS5 proxy (ie: 'hostname:port'). Overrides -ipv6.")
cfg.IPV6 = *flag.Bool("ipv6", cfg.IPV6, "Use IPv6 and IPv4 to send HTTP requests.")
version := flag.Bool("version", false, "Show version") version := flag.Bool("version", false, "Show version")
flag.Parse() flag.Parse()
cfg.ListenAddress = *listenAddress
cfg.Key = *key
cfg.IPV6 = *IPV6
cfg.Debug = *debug
cfg.RequestTimeout = *requestTimeout
cfg.FollowRedirect = *followRedirect
if *version { if *version {
fmt.Println(VERSION) fmt.Println(VERSION)
return return