ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-09-01 02:54:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

More reasonable cli for access

Browse Source
This commit is contained in:
9seconds
2021-03-13 21:30:57 +03:00
parent 18e3ca77de
commit 37a78bd1c3
6 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/access.go
+8 -5
View File
@@ -36,9 +36,12 @@ type accessResponseURLs struct {
type Access struct {
base `kong:"-"`
ConfigPath string `kong:"arg,required,type='existingfile',help='Path to the configuration file.',name='config-path'"` // nolint: lll
Port uint `kong:"help='Port number. Default port is taken from configuration file, bind-to parameter',type:'uint'"` // nolint: lll
Hex bool `kong:"help='Print secret in hex encoding.'"`
PublicIPv4 net.IP `kong:"help='Public IPv4 address for proxy. By default it is resolved via remote website',name='ipv4',short='i'"` // nolint: lll
PublicIPv6 net.IP `kong:"help='Public IPv6 address for proxy. By default it is resolved via remote website',name='ipv6',short='I'"` // nolint: lll
Port uint `kong:"help='Port number. Default port is taken from configuration file, bind-to parameter',type:'uint',short='p'"` // nolint: lll
Hex bool `kong:"help='Print secret in hex encoding.',short='x'"`
ConfigPath string `kong:"arg,required,type='existingfile',help='Path to the configuration file.',name='config-path'"` // nolint: lll
}
func (c *Access) Run(cli *CLI, version string) error {
@@ -60,7 +63,7 @@ func (c *Access) Execute(cli *CLI) error {
go func() {
defer wg.Done()
ip := c.Config.Network.PublicIP.IPv4.Value(nil)
ip := cli.Access.PublicIPv4
if ip == nil {
ip = c.getIP("tcp4")
}
@@ -75,7 +78,7 @@ func (c *Access) Execute(cli *CLI) error {
go func() {
defer wg.Done()
ip := c.Config.Network.PublicIP.IPv6.Value(nil)
ip := cli.Access.PublicIPv6
if ip == nil {
ip = c.getIP("tcp6")
}