Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update ports

This commit is contained in:
Zack Scholl 2019-05-01 13:48:09 -06:00
parent 77b11e3c3f
commit 868051bc2a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cli/cli.go
View File

@ -42,6 +42,7 @@ func Run() (err error) {
ArgsUsage: "[filename]", ArgsUsage: "[filename]",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{Name: "code, c", Usage: "codephrase used to connect to relay"}, cli.StringFlag{Name: "code, c", Usage: "codephrase used to connect to relay"},
cli.StringFlag{Name: "ports", Value: "9009,9010,9011,9012,9013", Usage: "ports of the local relay (optional)"},
}, },
HelpName: "croc send", HelpName: "croc send",
Action: func(c *cli.Context) error { Action: func(c *cli.Context) error {
@ -55,6 +56,9 @@ func Run() (err error) {
Action: func(c *cli.Context) error { Action: func(c *cli.Context) error {
return relay(c) return relay(c)
}, },
Flags: []cli.Flag{
cli.StringFlag{Name: "ports", Value: "9009,9010,9011,9012,9013", Usage: "ports of the relay"},
},
}, },
} }
app.Flags = []cli.Flag{ app.Flags = []cli.Flag{
@ -63,7 +67,6 @@ func Run() (err error) {
cli.BoolFlag{Name: "stdout", Usage: "redirect file to stdout"}, cli.BoolFlag{Name: "stdout", Usage: "redirect file to stdout"},
cli.StringFlag{Name: "relay", Value: "198.199.67.130:9009", Usage: "address of the relay"}, cli.StringFlag{Name: "relay", Value: "198.199.67.130:9009", Usage: "address of the relay"},
cli.StringFlag{Name: "out", Value: ".", Usage: "specify an output folder to receive the file"}, cli.StringFlag{Name: "out", Value: ".", Usage: "specify an output folder to receive the file"},
cli.StringFlag{Name: "ports", Value: "9009,9010,9011,9012,9013", Usage: "ports of the relay"},
} }
app.EnableBashCompletion = true app.EnableBashCompletion = true
app.HideHelp = false app.HideHelp = false
@ -164,7 +167,7 @@ func send(c *cli.Context) (err error) {
NoPrompt: c.GlobalBool("yes"), NoPrompt: c.GlobalBool("yes"),
RelayAddress: c.GlobalString("relay"), RelayAddress: c.GlobalString("relay"),
Stdout: c.GlobalBool("stdout"), Stdout: c.GlobalBool("stdout"),
RelayPorts: strings.Split(c.GlobalString("ports"), ","), RelayPorts: strings.Split(c.String("ports"), ","),
}) })
if err != nil { if err != nil {
return return
@ -194,12 +197,13 @@ func receive(c *cli.Context) (err error) {
} }
cr, err := croc.New(croc.Options{ cr, err := croc.New(croc.Options{
SharedSecret: sharedSecret, SharedSecret: sharedSecret,
IsSender: false, IsSender: false,
Debug: c.GlobalBool("debug"), Debug: c.GlobalBool("debug"),
NoPrompt: c.GlobalBool("yes"), NoPrompt: c.GlobalBool("yes"),
RelayAddress: c.GlobalString("relay"), RelayAddress: c.GlobalString("relay"),
Stdout: c.GlobalBool("stdout"), Stdout: c.GlobalBool("stdout"),
PathToReceive: c.GlobalString("out"),
}) })
if err != nil { if err != nil {
return return
@ -213,7 +217,7 @@ func relay(c *cli.Context) (err error) {
if c.GlobalBool("debug") { if c.GlobalBool("debug") {
debugString = "debug" debugString = "debug"
} }
ports := strings.Split(c.GlobalString("ports"), ",") ports := strings.Split(c.String("ports"), ",")
tcpPorts := strings.Join(ports[1:], ",") tcpPorts := strings.Join(ports[1:], ",")
for i, port := range ports { for i, port := range ports {
if i == 0 { if i == 0 {